Merge pull request #36128 from qgis-bot/backport-36124-to-release-3_12

m-kuhn · web-flow · commit 9cfa28515183 · 2020-05-01T20:52:18.000+02:00
[Backport release-3_12] Fixed fetching NULL bigint pgsql attributes. Fixes #36011
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -859,7 +859,14 @@ void QgsPostgresFeatureIterator::getFeatureAttribute( int idx, QgsPostgresResult
     }
     case QVariant::LongLong:
     {
-      v = QgsPostgresProvider::convertValue( fld.type(), fld.subType(), QString::number( mConn->getBinaryInt( queryResult, row, col ) ), fld.typeName() );
+      if ( ::PQgetisnull( queryResult.result(), row, col ) )
+      {
+        v = QVariant( QVariant::LongLong );
+      }
+      else
+      {
+        v = QgsPostgresProvider::convertValue( fld.type(), fld.subType(), QString::number( mConn->getBinaryInt( queryResult, row, col ) ), fld.typeName() );
+      }
       break;
     }
     default:
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -441,6 +441,10 @@ def testNonPkBigintField(self):
         bigint_with_default_idx = vl.fields().lookupField('bigint_attribute_def')
         self.assertEqual(f.attributes()[bigint_with_default_idx], 42)
 
+        # check if NULL values are correctly read
+        bigint_def_null_idx = vl.fields().lookupField('bigint_attribute')
+        self.assertEqual(f.attributes()[bigint_def_null_idx], NULL)
+
         # check if we can overwrite a default value
         vl.startEditing()
         vl.changeAttributeValue(f.id(), bigint_with_default_idx, 43)

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,14 @@ void QgsPostgresFeatureIterator::getFeatureAttribute( int idx, QgsPostgresResult`
`859`	`859`	`}`
`860`	`860`	`case QVariant::LongLong:`
`861`	`861`	`{`
`862`		`- v = QgsPostgresProvider::convertValue( fld.type(), fld.subType(), QString::number( mConn->getBinaryInt( queryResult, row, col ) ), fld.typeName() );`
	`862`	`+ if ( ::PQgetisnull( queryResult.result(), row, col ) )`
	`863`	`+ {`
	`864`	`+ v = QVariant( QVariant::LongLong );`
	`865`	`+ }`
	`866`	`+ else`
	`867`	`+ {`
	`868`	`+ v = QgsPostgresProvider::convertValue( fld.type(), fld.subType(), QString::number( mConn->getBinaryInt( queryResult, row, col ) ), fld.typeName() );`
	`869`	`+ }`
`863`	`870`	`break;`
`864`	`871`	`}`
`865`	`872`	`default:`