Connectios API fix Postgres char conversion in execSQL

elpaso · elpaso · commit aac0c92d278b · 2020-03-02T09:22:52.000+01:00
Fixes #34806
diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -228,7 +228,6 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr
           if ( typeRes.size() > 0 && typeRes.first().size() > 0 )
           {
             static const QStringList intTypes = { QStringLiteral( "oid" ),
-                                                  QStringLiteral( "char" ),
                                                   QStringLiteral( "int2" ),
                                                   QStringLiteral( "int4" ),
                                                   QStringLiteral( "int8" )
@@ -263,6 +262,10 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr
             {
               vType = QVariant::Bool;
             }
+            else if ( typName == QStringLiteral( "char" ) )
+            {
+              vType = QVariant::Char;
+            }
             else
             {
               QgsDebugMsg( QStringLiteral( "Unhandled PostgreSQL type %1" ).arg( typName ) );
diff --git a/tests/src/python/test_qgsproviderconnection_postgres.py b/tests/src/python/test_qgsproviderconnection_postgres.py
@@ -38,6 +38,7 @@ class TestPyQgsProviderConnectionPostgres(unittest.TestCase, TestPyQgsProviderCo
     @classmethod
     def setUpClass(cls):
         """Run before all tests"""
+
         TestPyQgsProviderConnectionBase.setUpClass()
         cls.postgres_conn = "service='qgis_test'"
         if 'QGIS_PGTEST_DB' in os.environ:
@@ -219,6 +220,7 @@ def test_nulls(self):
         self.assertEqual(conn.executeSql('SELECT NULL::bool'), [[None]])
         self.assertEqual(conn.executeSql('SELECT NULL::text'), [[None]])
         self.assertEqual(conn.executeSql('SELECT NULL::bytea'), [[None]])
+        self.assertEqual(conn.executeSql('SELECT NULL::char'), [[None]])
 
     def test_pk_cols_order(self):
         """Test that PKs are returned in consistent order: see GH #34167"""
@@ -228,6 +230,13 @@ def test_pk_cols_order(self):
         self.assertEqual(conn.table('qgis_test', 'bikes_view').primaryKeyColumns(), ['pk', 'name'])
         self.assertEqual(conn.table('qgis_test', 'some_poly_data_view').primaryKeyColumns(), ['pk', 'geom'])
 
+    def test_char_type_conversion(self):
+        """Test char types: see GH #34806"""
+
+        md = QgsProviderRegistry.instance().providerMetadata(self.providerKey)
+        conn = md.createConnection(self.uri, {})
+        self.assertEqual(conn.executeSql("SELECT relname, relkind FROM pg_class c, pg_namespace n WHERE n.oid = c.relnamespace AND relname = 'bikes_view' AND c.relkind IN ('t', 'v', 'm')"), [['bikes_view', 'v']])
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr`
`228`	`228`	`if ( typeRes.size() > 0 && typeRes.first().size() > 0 )`
`229`	`229`	`{`
`230`	`230`	`static const QStringList intTypes = { QStringLiteral( "oid" ),`
`231`		`- QStringLiteral( "char" ),`
`232`	`231`	`QStringLiteral( "int2" ),`
`233`	`232`	`QStringLiteral( "int4" ),`
`234`	`233`	`QStringLiteral( "int8" )`
`@@ -263,6 +262,10 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr`
`263`	`262`	`{`
`264`	`263`	`vType = QVariant::Bool;`
`265`	`264`	`}`
	`265`	`+ else if ( typName == QStringLiteral( "char" ) )`
	`266`	`+ {`
	`267`	`+ vType = QVariant::Char;`
	`268`	`+ }`
`266`	`269`	`else`
`267`	`270`	`{`
`268`	`271`	`QgsDebugMsg( QStringLiteral( "Unhandled PostgreSQL type %1" ).arg( typName ) );`