sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-11 00:04:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #21028 - DB manager: SQLite objects created in a thread can only be used in that same thread
This commit is contained in:
Alessandro Pasotti 2019-03-11 16:04:00 +01:00
parent 8f0cfda89a
commit 8fb112d26f
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/plugins/db_manager/db_plugins/gpkg/connector.py
View File

@ -25,6 +25,7 @@ from builtins import str
from functools import cmp_to_key from functools import cmp_to_key
from qgis.PyQt.QtWidgets import QApplication from qgis.PyQt.QtWidgets import QApplication
from qgis.PyQt.QtCore import QThread
from ..connector import DBConnector from ..connector import DBConnector
from ..plugin import ConnectionError, DbError, Table from ..plugin import ConnectionError, DbError, Table
@ -65,6 +66,26 @@ class GPKGDBConnector(DBConnector):
raise ConnectionError(QApplication.translate("DBManagerPlugin", '"{dbname}" not recognized as GPKG ({shortname} reported instead.)').format(dbname=self.dbname, shortname=self.gdal_ds.GetDriver().ShortName)) 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.has_raster = self.gdal_ds.RasterCount != 0 or self.gdal_ds.GetMetadata('SUBDATASETS') is not None
self.connection = 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): def unquoteId(self, quotedId):
if len(quotedId) <= 2 or quotedId[0] != '"' or quotedId[len(quotedId) - 1] != '"': if len(quotedId) <= 2 or quotedId[0] != '"' or quotedId[len(quotedId) - 1] != '"':