Fixes #34537 : Allow setting null in relation reference widget

qgis · Apr 15, 2020 · 091c86a · 091c86a
1 parent 75b5f39
commit 091c86a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/core/qgsfeaturefiltermodel.cpp b/src/core/qgsfeaturefiltermodel.cpp
@@ -623,7 +623,7 @@ QVariantList QgsFeatureFilterModel::extraIdentifierValues() const
   {
     QVariantList nullValues;
     for ( int i = 0; i < mIdentifierFields.count(); i++ )
-      nullValues << QVariant();
+      nullValues << QVariant( QVariant::Int );
     return nullValues;
   }
   return mExtraIdentifierValues;

diff --git a/tests/src/gui/testqgsfeaturelistcombobox.cpp b/tests/src/gui/testqgsfeaturelistcombobox.cpp
@@ -160,6 +160,29 @@ void TestQgsFeatureListComboBox::testMultipleForeignKeys()
 
   cb->setIdentifierValues( QVariantList() << "gold" << 777 << "rush" );
   QCOMPARE( cb->identifierValues(), QVariantList() << "gold" << 777 << "rush" );
+
+  cb->setIdentifierValuesToNull();
+  QCOMPARE( cb->identifierValues().count(), 3 );
+  QCOMPARE( cb->identifierValues(), QVariantList() << QVariant( QVariant::Int ) << QVariant( QVariant::Int ) << QVariant( QVariant::Int ) );
+
+  cb->setIdentifierValues( QVariantList() << "silver" << 888 << "fish" );
+  QCOMPARE( cb->identifierValues(), QVariantList() << "silver" << 888 << "fish" );
+
+  cb->setIdentifierValuesToNull();
+  QCOMPARE( cb->identifierValues().count(), 3 );
+  QCOMPARE( cb->identifierValues(), QVariantList() << QVariant( QVariant::Int ) << QVariant( QVariant::Int ) << QVariant( QVariant::Int ) );
+
+  cb->setIdentifierFields( QStringList() << "material" << "raccord" );
+  cb->setDisplayExpression( "\"material\" || ' ' || \"raccord\"" );
+  cb->setAllowNull( true );
+
+  cb->setIdentifierValues( QVariantList() << "gold" << "fish" );
+  QCOMPARE( cb->identifierValues().count(), 2 );
+  QCOMPARE( cb->identifierValues(), QVariantList() << "gold" << "fish" );
+
+  cb->setIdentifierValuesToNull();
+  QCOMPARE( cb->identifierValues().count(), 2 );
+  QCOMPARE( cb->identifierValues(), QVariantList() << QVariant( QVariant::Int ) << QVariant( QVariant::Int ) );
 }
 
 void TestQgsFeatureListComboBox::testAllowNull()

diff --git a/tests/src/gui/testqgsrelationreferencewidget.cpp b/tests/src/gui/testqgsrelationreferencewidget.cpp
@@ -511,8 +511,9 @@ void TestQgsRelationReferenceWidget::testSetGetForeignKey()
   QCOMPARE( w.mComboBox->currentText(), QStringLiteral( "(12)" ) );
   QCOMPARE( spy.count(), 2 );
 
-  w.setForeignKeys( QVariantList() << QVariant( QVariant::Int ) );
-  Q_ASSERT( w.foreignKeys().at( 0 ).isNull() );
+  w.setForeignKeys( QVariantList() << QVariant() );
+  QVERIFY( w.foreignKeys().at( 0 ).isNull() );
+  QVERIFY( w.foreignKeys().at( 0 ).isValid() );
   QCOMPARE( spy.count(), 3 );
 }