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

Merge pull request #31986 from roya0045/patch-6

Browse Source 
[Bugfix] enabling spatialite gpkg amphibious mode
This commit is contained in:
Even Rouault 2019-11-14 19:23:27 +01:00 committed by GitHub
commit aeeb11b00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/utils.py
View File

@ -677,6 +677,13 @@ using the "mod_spatialite" extension (python3)"""
break
if not found:
raise RuntimeError("Cannot find any suitable spatialite module")
if any(['.gpkg' in arg for arg in args]):
try:
cur.execute("SELECT EnableGpkgAmphibiousMode()")
except (sqlite3.Error, sqlite3.DatabaseError, sqlite3.NotSupportedError):
QgsMessageLog.logMessage(u"warning:{}".format("Could not enable geopackage amphibious mode"),
QCoreApplication.translate("Python", "Python warning"))
cur.close()
con.enable_load_extension(False)
con.create_function("regexp", 2, fcnRegexp)

18
tests/src/python/test_db_manager_gpkg.py
View File

@ -24,6 +24,8 @@ from qgis.testing import start_app, unittest
from plugins.db_manager.db_plugins import supportedDbTypes, createDbPlugin
from plugins.db_manager.db_plugins.plugin import TableField
from utilities import unitTestDataPath
def GDAL_COMPUTE_VERSION(maj, min, rev):
return ((maj) * 1000000 + (min) * 10000 + (rev) * 100)
@ -444,6 +446,22 @@ class TestPyQgsDBManagerGpkg(unittest.TestCase):
connection.remove()
def testAmphibiousMode(self,):
connectionName = 'geopack1'
plugin = createDbPlugin('gpkg')
uri = QgsDataSourceUri()
test_gpkg = os.path.join(os.path.join(unitTestDataPath(), 'provider'), 'test_json.gpkg')
uri.setDatabase(test_gpkg)
plugin.addConnection(connectionName, uri)
connection = createDbPlugin('gpkg', connectionName)
connection.connect()
db = connection.database()
res = db.connector._execute(None, "SELECT St_area({}) from foo".format(db.tables()[0].fields()[1].name))
results = [row for row in res]
self.assertEqual(results, [(215229.265625,), (247328.171875,), (261752.78125,), (547597.2109375,), (15775.7578125,), (101429.9765625,), (268597.625,), (1634833.390625,), (596610.3359375,), (5268.8125,)])
connection.remove()
if __name__ == '__main__':
unittest.main()