PG fix test SELECT NULL::bool -> None

qgis · Jan 13, 2020 · 555c6c2 · 555c6c2
1 parent 792fa4b
commit 555c6c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -277,9 +277,12 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr
             const QVariant::Type vType { typeMap.value( colIdx, QVariant::Type::String ) };
             QVariant val { res.PQgetvalue( rowIdx, colIdx ) };
             // Special case for bools: 'f' and 't'
-            if ( vType == QVariant::Bool && ! val.isNull() )
+            if ( vType == QVariant::Bool )
             {
-              val = val.toString() == 't';
+              if ( ! val.toString().isEmpty() )
+              {
+                val = val.toString() == 't';
+              }
             }
             else if ( val.canConvert( static_cast<int>( vType ) ) )
             {

diff --git a/tests/src/python/test_qgsproviderconnection_postgres.py b/tests/src/python/test_qgsproviderconnection_postgres.py
@@ -204,7 +204,7 @@ def test_nulls(self):
 
         md = QgsProviderRegistry.instance().providerMetadata(self.providerKey)
         conn = md.createConnection(self.uri, {})
-        self.assertEqual(conn.executeSql('SELECT NULL::bool'), [[False]])
+        self.assertEqual(conn.executeSql('SELECT NULL::bool'), [[None]])
         self.assertEqual(conn.executeSql('SELECT NULL::text'), [[None]])
         self.assertEqual(conn.executeSql('SELECT NULL::bytea'), [[None]])