eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Server window database tab tweaks

Browse source 
- Encoding as string instead of id
- Tablespace name instead of id
- Database list sorting enabled
- Database size
This commit is contained in:
eelke 2021-03-10 20:49:03 +01:00
parent 11459e1e12
commit 2724586f4e
5 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pglablib/catalog/PgDatabase.h
View file

@ -10,12 +10,14 @@ public:
Oid dba; // owner?
int encoding;
QString encodingString;
QString collate;
QString ctype;
bool isTemplate;
bool allowConn;
int connLimit;
Oid tablespace;
int64_t sizeBytes;
using PgServerObject::PgServerObject;

10
pglablib/catalog/PgDatabaseContainer.cpp
View file

@ -3,8 +3,10 @@
std::string PgDatabaseContainer::getLoadQuery() const
{
return "SELECT oid,datname,datdba,encoding,datcollate,datctype,datistemplate,datallowconn,"
"datconnlimit,dattablespace,datacl FROM pg_database";
return "SELECT oid,datname,datdba,encoding,pg_encoding_to_char(encoding),datcollate \n"
",datctype,datistemplate,datallowconn,"
"datconnlimit,dattablespace,pg_database_size(oid),datacl "
"FROM pg_database";
}
PgDatabase PgDatabaseContainer::loadElem(const Pgsql::Row &row)
@ -14,8 +16,8 @@ PgDatabase PgDatabaseContainer::loadElem(const Pgsql::Row &row)
Oid oid = col.nextValue();
QString name = col.nextValue();
PgDatabase v(m_catalog, oid, name);
col >> v.dba >> v.encoding >> v.collate >> v.ctype >> v.isTemplate
>> v.allowConn >> v.connLimit >> v.tablespace;
col >> v.dba >> v.encoding >> v.encodingString >> v.collate >> v.ctype >> v.isTemplate
>> v.allowConn >> v.connLimit >> v.tablespace >> v.sizeBytes;
AclList acl_list;
col >> acl_list;