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

Rework of catalog objects. Several of them are now inheriting from common

Browse source 
base classes that implement common functionality.
This commit is contained in:
eelke 2018-11-25 19:45:06 +01:00
parent 840af1e0a9
commit 73c4cf4790
45 changed files with 340 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pglablib/PgDatabaseCatalog.cpp
View file

@ -47,7 +47,7 @@ QString getNamespaceDisplayString(const PgDatabaseCatalog &cat, Oid oid)
auto nss = cat.namespaces();
auto ns = nss->getByKey(oid);
if (ns)
result = ns->name; //QString("ns %1").arg(oid);
result = ns->objectName(); //QString("ns %1").arg(oid);
return result;
}
@ -57,7 +57,7 @@ QString getClassDisplayString(const PgDatabaseCatalog &cat, Oid oid)
auto l = cat.classes();
auto e = l->getByKey(oid);
if (e)
result = e->name;
result = e->objectName();
return result;
}
@ -146,25 +146,29 @@ void PgDatabaseCatalog::loadAll(Pgsql::Connection &conn,
int n = 0;
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_namespaces, conn);
// First load server objects
load2(m_authIds, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_tablespaces, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_databases, conn);
if (progress_callback && !progress_callback(++n, count))
return;
// Load database objects
load2(m_namespaces, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_classes, conn); // needs namespaces
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_attributes, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_authIds, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_constraints, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_databases, conn);
if (progress_callback && !progress_callback(++n, count))
return;
load2(m_indexes, conn);