Bezig met crudmodel/tab

This commit is contained in:
eelke 2018-01-08 20:45:52 +01:00
parent ee321b3fb1
commit 14ab400ccb
15 changed files with 308 additions and 33 deletions

View file

@ -121,31 +121,32 @@ void PgDatabaseCatalog::loadAll(Pgsql::Connection &conn,
std::function<bool(int, int)> progress_callback)
{
loadInfo(conn);
if (progress_callback && !progress_callback(1, 9))
return;
load2(m_attributes, conn);
if (progress_callback && !progress_callback(2, 9))
return;
load2(m_authIds, conn);
if (progress_callback && !progress_callback(3, 9))
return;
load2(m_classes, conn);
if (progress_callback && !progress_callback(4, 9))
return;
load2(m_constraints, conn);
if (progress_callback && !progress_callback(5, 9))
return;
load2(m_databases, conn);
if (progress_callback && !progress_callback(6, 9))
return;
load2(m_indexes, conn);
if (progress_callback && !progress_callback(7, 9))
int n = 0;
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_namespaces, conn);
if (progress_callback && !progress_callback(8, 9))
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_classes, conn); // needs namespaces
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_attributes, conn);
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_authIds, conn);
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_constraints, conn);
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_databases, conn);
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_indexes, conn);
if (progress_callback && !progress_callback(++n, 9))
return;
load2(m_types, conn);
progress_callback && progress_callback(9, 9);
progress_callback && progress_callback(++n, 9);
}
void PgDatabaseCatalog::loadInfo(Pgsql::Connection &conn)
@ -167,7 +168,7 @@ void load(Pgsql::Connection &conn, IPgContainter &pg_cont)
std::string q = pg_cont.getLoadQuery();
Pgsql::Result result = conn.query(q.c_str());
if (result && result.resultStatus() == PGRES_TUPLES_OK) {
boost::timer::auto_cpu_timer t;
//boost::timer::auto_cpu_timer t;
pg_cont.load(result);
}
else {