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

[processing] fix for import into spatialite and execute sql algorithms

Browse Source
This commit is contained in:
Mathieu Pellerin 2017-11-24 12:22:19 +07:00 committed by GitHub
parent 03ec2d8a98
commit 1fcadb72ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/qgis/ImportIntoSpatialite.py
View File

@ -84,7 +84,9 @@ class ImportIntoSpatialite(QgisAlgorithm):
databaseuri = database.dataProvider().dataSourceUri() databaseuri = database.dataProvider().dataSourceUri()
uri = QgsDataSourceUri(databaseuri) uri = QgsDataSourceUri(databaseuri)
if uri.database() is '': 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')] databaseuri = databaseuri[:databaseuri.find('|layerid')]
uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri)) uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri))
db = spatialite.GeoDB(uri) db = spatialite.GeoDB(uri)

4
python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
View File

@ -61,7 +61,9 @@ class SpatialiteExecuteSQL(QgisAlgorithm):
databaseuri = database.dataProvider().dataSourceUri() databaseuri = database.dataProvider().dataSourceUri()
uri = QgsDataSourceUri(databaseuri) uri = QgsDataSourceUri(databaseuri)
if uri.database() is '': 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')] databaseuri = databaseuri[:databaseuri.find('|layerid')]
uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri)) uri = QgsDataSourceUri('dbname=\'%s\'' % (databaseuri))
db = spatialite.GeoDB(uri) db = spatialite.GeoDB(uri)