From 1fcadb72ff3f2f9b008e395bd7ff11a9ffe053b2 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Fri, 24 Nov 2017 12:22:19 +0700 Subject: [PATCH] [processing] fix for import into spatialite and execute sql algorithms --- python/plugins/processing/algs/qgis/ImportIntoSpatialite.py | 4 +++- python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py b/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py index 5cb5444db66..39c3b363d85 100644 --- a/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py +++ b/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py @@ -84,7 +84,9 @@ class ImportIntoSpatialite(QgisAlgorithm): databaseuri = database.dataProvider().dataSourceUri() uri = QgsDataSourceUri(databaseuri) if uri.database() is '': - if '|layerid' in databaseuri: + if '|layername' in databaseuri: + databaseuri = databaseuri[:databaseuri.find('|layername')] + elif '|layerid' in databaseuri: databaseuri = databaseuri[:databaseuri.find('|layerid')] uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri)) db = spatialite.GeoDB(uri) diff --git a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py index f07492bf32d..36cda5b7f05 100644 --- a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py @@ -61,7 +61,9 @@ class SpatialiteExecuteSQL(QgisAlgorithm): databaseuri = database.dataProvider().dataSourceUri() uri = QgsDataSourceUri(databaseuri) if uri.database() is '': - if '|layerid' in databaseuri: + if '|layername' in databaseuri: + databaseuri = databaseuri[:databaseuri.find('|layername')] + elif '|layerid' in databaseuri: databaseuri = databaseuri[:databaseuri.find('|layerid')] uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri)) db = spatialite.GeoDB(uri)