MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 00:32:35 +01:00
Code Issues Releases Wiki Activity

ircd::db: Consider if column dropped for boolean test.

Browse source
This commit is contained in:
Jason Volk 2019-01-23 16:00:22 -08:00
parent 92154be55d
commit c2521b587b
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/ircd/db/column.h
View file

@ -116,8 +116,8 @@ struct ircd::db::column
explicit operator database &();
explicit operator database::column &();
explicit operator bool() const { return bool(c); }
bool operator!() const { return !c; }
explicit operator bool() const;
bool operator!() const;
// [GET] Iterations
const_iterator begin(gopts = {});
@ -294,6 +294,13 @@ const
return *c;
}
inline bool
ircd::db::column::operator!()
const
{
return !bool(*this);
}
inline ircd::db::column::operator
database::column &()
{

1
include/ircd/db/database/column.h
View file

@ -24,6 +24,7 @@ namespace ircd::db
const std::string &name(const database::column &);
uint32_t id(const database::column &);
bool dropped(const database::column &);
void drop(database::column &); // Request to erase column from db
}

17
ircd/db.cc
View file

@ -1599,6 +1599,14 @@ ircd::db::drop(database::column &c)
};
}
bool
ircd::db::dropped(const database::column &c)
{
return c.descriptor?
c.descriptor->drop:
true;
}
uint32_t
ircd::db::id(const database::column &c)
{
@ -5624,6 +5632,15 @@ const
return { *this, key };
}
ircd::db::column::operator
bool()
const
{
return c?
!dropped(*c):
false;
}
ircd::db::column::operator
const descriptor &()
const