Skip to content
Permalink
Browse files

Merge pull request #9481 from qgis/backport-9478-on-release-3_6

Backport #9478 on release-3_6
  • Loading branch information
elpaso committed Mar 13, 2019
2 parents 1f95ab6 + b0b068d commit 50c9a5e733e9f51cee02120662227c30222a2030
Showing with 21 additions and 0 deletions.
  1. +21 −0 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
@@ -63,6 +64,26 @@ def _opendb(self):
raise ConnectionError(QApplication.translate("DBManagerPlugin", '"{0}" not found').format(self.dbname))
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] != '"':

0 comments on commit 50c9a5e

Please sign in to comment.
You can’t perform that action at this time.