Add test for #16833

strk · strk · commit 462f73cb0e79 · 2017-07-19T20:46:51.000+02:00
diff --git a/python/plugins/db_manager/db_plugins/postgis/plugin_test.py b/python/plugins/db_manager/db_plugins/postgis/plugin_test.py
@@ -35,6 +35,7 @@
 
 from db_manager.db_plugins.postgis.plugin import PostGisDBPlugin, PGRasterTable
 from db_manager.db_plugins.postgis.plugin import PGDatabase
+from db_manager.db_plugins.postgis.data_model import PGSqlResultModel
 from db_manager.db_plugins.plugin import Table
 from db_manager.db_plugins.postgis.connector import PostGisDBConnector
 
@@ -125,6 +126,23 @@ def check_rasterTableGdalURI(expected_dbname):
 
         check_rasterTableGdalURI(expected_dbname)
 
+    # See http://issues.qgis.org/issues/16833
+    def test_unicodeInQuery(self):
+        os.environ['PGDATABASE'] = self.testdb
+        obj = QObject() # needs to be kept alive
+        database = PGDatabase(obj, QgsDataSourceURI())
+        self.assertIsInstance(database, PGDatabase)
+        # SQL as string literal
+        res = database.sqlResultModel("SELECT 'é'::text", obj)
+        self.assertIsInstance(res, PGSqlResultModel)
+        dat = res.getData(0, 0)
+        self.assertEqual(dat, u"é")
+        # SQL as unicode literal
+        res = database.sqlResultModel(u"SELECT 'é'::text", obj)
+        self.assertIsInstance(res, PGSqlResultModel)
+        dat = res.getData(0, 0)
+        self.assertEqual(dat, u"é")
+
 
 if __name__ == '__main__':
     unittest.main()
