From 074bde5cccf924b10ed15b7b2d91035cf253b57a Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Jan 2017 17:03:54 -0500 Subject: db_sql: run table creation queries during import synchronously too --- modules/database/db_sql.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/database/db_sql.cpp') diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 12fc8512f..873a8cc7a 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -123,14 +123,20 @@ class DBSQL : public Module, public Pipe continue; std::vector create = this->sql->CreateTable(this->prefix + s_type->GetName(), data); - for (unsigned i = 0; i < create.size(); ++i) - this->RunBackground(create[i]); - Query insert = this->sql->BuildInsert(this->prefix + s_type->GetName(), obj->id, data); + if (this->imported) + { + for (unsigned i = 0; i < create.size(); ++i) + this->RunBackground(create[i]); + this->RunBackground(insert, new ResultSQLSQLInterface(this, obj)); + } else { + for (unsigned i = 0; i < create.size(); ++i) + this->sql->RunQuery(create[i]); + /* We are importing objects from another database module, so don't do asynchronous * queries in case the core has to shut down, it will cut short the import */ -- cgit