updated

treefrogframework · Dec 9, 2023 · 88b9957 · 88b9957
1 parent d3212a6
commit 88b9957
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/tsqldatabase.cpp b/src/tsqldatabase.cpp
@@ -85,7 +85,6 @@ TSqlDatabase::DbmsType TSqlDatabase::dbmsType() const
 
 void TSqlDatabase::setDriverExtension(TSqlDriverExtension *extension)
 {
-    Q_ASSERT(!_driverExtension);
     _driverExtension = extension;
 }
 

diff --git a/src/tsqldatabasepool.cpp b/src/tsqldatabasepool.cpp
@@ -304,13 +304,16 @@ bool TSqlDatabasePool::openDatabase(TSqlDatabase &database)
 {
     bool ret = database.sqlDatabase().open();
 
-    TSqlDriverExtension *extension = database.driverExtension();
-    if (extension) {
-        TSqlDriverExtensionFactory::destroy(database.sqlDatabase().driverName(), extension);
+    if (ret) {
+        TSqlDriverExtension *extension = database.driverExtension();
+        if (extension) {
+            TSqlDriverExtensionFactory::destroy(database.sqlDatabase().driverName(), extension);
+        }
+
+        extension = TSqlDriverExtensionFactory::create(database.sqlDatabase().driverName(), database.sqlDatabase().driver());
+        database.setDriverExtension(extension);
     }
 
-    extension = TSqlDriverExtensionFactory::create(database.sqlDatabase().driverName(), database.sqlDatabase().driver());
-    database.setDriverExtension(extension);
     return ret;
 }
 

diff --git a/src/tsqldatabasepool.h b/src/tsqldatabasepool.h
@@ -26,7 +26,6 @@ class T_CORE_EXPORT TSqlDatabasePool : public QObject {
 protected:
     void init();
     void timerEvent(QTimerEvent *event);
-    //void closeDatabase(QSqlDatabase &database);
 
 private:
     bool openDatabase(TSqlDatabase &database);