[db-manager] Invalidate sqlite connection if it was created in another thread

elpaso · elpaso · commit 8fb112d26fd8 · 2019-03-11T16:04:00.000+01:00
Fixes #21028 - DB manager: SQLite objects created in a thread can only be used in that same thread
diff --git a/python/plugins/db_manager/db_plugins/gpkg/connector.py b/python/plugins/db_manager/db_plugins/gpkg/connector.py
@@ -25,6 +25,7 @@
 from functools import cmp_to_key
 
 from qgis.PyQt.QtWidgets import QApplication
+from qgis.PyQt.QtCore import QThread
 
 from ..connector import DBConnector
 from ..plugin import ConnectionError, DbError, Table
@@ -65,6 +66,26 @@ def _opendb(self):
             raise ConnectionError(QApplication.translate("DBManagerPlugin", '"{dbname}" not recognized as GPKG ({shortname} reported instead.)').format(dbname=self.dbname, shortname=self.gdal_ds.GetDriver().ShortName))
         self.has_raster = self.gdal_ds.RasterCount != 0 or self.gdal_ds.GetMetadata('SUBDATASETS') is not None
         self.connection = None
+        self._current_thread = None
+
+    @property
+    def connection(self):
+        """Creates and returns a spatialite connection, if
+        the existing connection was created in another thread
+        invalidates it and create a new one.
+        """
+
+        if self._connection is None or self._current_thread != int(QThread.currentThreadId()):
+            self._current_thread = int(QThread.currentThreadId())
+            try:
+                self._connection = spatialite_connect(str(self.dbname))
+            except self.connection_error_types() as e:
+                raise ConnectionError(e)
+        return self._connection
+
+    @connection.setter
+    def connection(self, conn):
+        self._connection = conn
 
     def unquoteId(self, quotedId):
         if len(quotedId) <= 2 or quotedId[0] != '"' or quotedId[len(quotedId) - 1] != '"':
