Skip to content

Commit 1fcadb7

Browse files
authoredNov 24, 2017
[processing] fix for import into spatialite and execute sql algorithms
1 parent 03ec2d8 commit 1fcadb7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed
 

‎python/plugins/processing/algs/qgis/ImportIntoSpatialite.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ def processAlgorithm(self, parameters, context, feedback):
8484
databaseuri = database.dataProvider().dataSourceUri()
8585
uri = QgsDataSourceUri(databaseuri)
8686
if uri.database() is '':
87-
if '|layerid' in databaseuri:
87+
if '|layername' in databaseuri:
88+
databaseuri = databaseuri[:databaseuri.find('|layername')]
89+
elif '|layerid' in databaseuri:
8890
databaseuri = databaseuri[:databaseuri.find('|layerid')]
8991
uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri))
9092
db = spatialite.GeoDB(uri)

‎python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ def processAlgorithm(self, parameters, context, feedback):
6161
databaseuri = database.dataProvider().dataSourceUri()
6262
uri = QgsDataSourceUri(databaseuri)
6363
if uri.database() is '':
64-
if '|layerid' in databaseuri:
64+
if '|layername' in databaseuri:
65+
databaseuri = databaseuri[:databaseuri.find('|layername')]
66+
elif '|layerid' in databaseuri:
6567
databaseuri = databaseuri[:databaseuri.find('|layerid')]
6668
uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri))
6769
db = spatialite.GeoDB(uri)

0 commit comments

Comments
 (0)
Please sign in to comment.