[Qt] Guarantee QSqlDatabase connection name uniqueness

Guarantee QSqlDatabase connection name uniqueness by using a static counter together with the current thread.
mapbox · Feb 1, 2017 · ab814ef · ab814ef
1 parent 47b67fe
commit ab814ef
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp
@@ -4,6 +4,7 @@
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QStringList>
+#include <QThread>
 #include <QVariant>
 
 #include <cassert>
@@ -52,10 +53,16 @@ void checkDatabaseError(const QSqlDatabase &db) {
 class DatabaseImpl {
 public:
     DatabaseImpl(const char* filename, int flags) {
+        static uint64_t count = 0;
+        const QString connectionName = QString::number(uint64_t(QThread::currentThread())) + QString::number(count++);
+
         if (!QSqlDatabase::drivers().contains("QSQLITE")) {
             throw Exception { Exception::Code::CANTOPEN, "SQLite driver not found." };
         }
-        db.reset(new QSqlDatabase(QSqlDatabase::addDatabase("QSQLITE", QString::number(qrand()))));
+
+        assert(!QSqlDatabase::contains(connectionName));
+        db.reset(new QSqlDatabase(QSqlDatabase::addDatabase("QSQLITE", connectionName)));
+
         QString connectOptions = db->connectOptions();
         if (flags & OpenFlag::ReadOnly) {
             if (!connectOptions.isEmpty()) connectOptions.append(';');