MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-02 16:58:19 +02:00
Code Issues Releases Wiki Activity

ircd::db: Error reporting and fallbacks for db property queries.

Browse source
This commit is contained in:
Jason Volk 2018-04-12 18:57:03 -07:00
parent dc2bd4f66e
commit 455ff99b93
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ircd/db.cc
View file

@ -227,7 +227,12 @@ ircd::db::property(const database &cd,
uint64_t ret;
database &d(const_cast<database &>(cd));
if(!d.d->GetAggregatedIntProperty(slice(name), &ret))
ret = 0;
throw not_found
{
"property '%s' for all columns in '%s' not found or not an integer.",
name,
db::name(d)
};
return ret;
}
@ -3661,7 +3666,15 @@ ircd::db::property(const column &column,
std::string ret;
database::column &c(const_cast<db::column &>(column));
database &d(const_cast<db::column &>(column));
d.d->GetProperty(c, slice(name), &ret);
if(!d.d->GetProperty(c, slice(name), &ret))
throw not_found
{
"'property '%s' for column '%s' in '%s' not found.",
name,
db::name(column),
db::name(d)
};
return ret;
}
@ -3674,7 +3687,13 @@ ircd::db::property(const column &column,
database::column &c(const_cast<db::column &>(column));
database &d(const_cast<db::column &>(column));
if(!d.d->GetIntProperty(c, slice(name), &ret))
ret = 0;
throw not_found
{
"property '%s' for column '%s' in '%s' not found or not an integer.",
name,
db::name(column),
db::name(d)
};
return ret;
}
@ -3687,7 +3706,9 @@ ircd::db::property(const column &column,
std::map<std::string, std::string> ret;
database::column &c(const_cast<db::column &>(column));
database &d(const_cast<db::column &>(column));
d.d->GetMapProperty(c, slice(name), &ret);
if(!d.d->GetMapProperty(c, slice(name), &ret))
ret.emplace(std::string{name}, property<std::string>(column, name));
return ret;
}