Merge pull request #45841 from 3nids/fix-rel-mismatch-type

3nids · web-flow · commit ac63c6e64564 · 2021-11-09T09:30:36.000+01:00
improve success of compiled expressions running on backend with mismatching types in relation field pairs
diff --git a/python/core/auto_generated/expression/qgsexpression.sip.in b/python/core/auto_generated/expression/qgsexpression.sip.in
@@ -673,13 +673,14 @@ length, and presents text representations of non numeric/text types (e.g., geome
 .. versionadded:: 2.14
 %End
 
-    static QString createFieldEqualityExpression( const QString &fieldName, const QVariant &value );
+    static QString createFieldEqualityExpression( const QString &fieldName, const QVariant &value, QVariant::Type fieldType = QVariant::Type::Invalid );
 %Docstring
 Create an expression allowing to evaluate if a field is equal to a
 value. The value may be null.
 
 :param fieldName: the name of the field
 :param value: the value of the field
+:param fieldType: the type of the field on the left side used to quote the value. If not given, the value type is used instead
 
 :return: the expression to evaluate field equality
 
diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp
@@ -1112,14 +1112,16 @@ QString QgsExpression::formatPreviewString( const QVariant &value, const bool ht
   }
 }
 
-QString QgsExpression::createFieldEqualityExpression( const QString &fieldName, const QVariant &value )
+QString QgsExpression::createFieldEqualityExpression( const QString &fieldName, const QVariant &value, QVariant::Type fieldType )
 {
   QString expr;
 
   if ( value.isNull() )
     expr = QStringLiteral( "%1 IS NULL" ).arg( quotedColumnRef( fieldName ) );
-  else
+  else if ( fieldType == QVariant::Type::Invalid )
     expr = QStringLiteral( "%1 = %2" ).arg( quotedColumnRef( fieldName ), quotedValue( value ) );
+  else
+    expr = QStringLiteral( "%1 = %2" ).arg( quotedColumnRef( fieldName ), quotedValue( value, fieldType ) );
 
   return expr;
 }
diff --git a/src/core/expression/qgsexpression.h b/src/core/expression/qgsexpression.h
@@ -659,10 +659,11 @@ class CORE_EXPORT QgsExpression
      *  value. The value may be null.
      * \param fieldName the name of the field
      * \param value the value of the field
+     * \param fieldType the type of the field on the left side used to quote the value. If not given, the value type is used instead
      * \returns the expression to evaluate field equality
      * \since QGIS 3.0
      */
-    static QString createFieldEqualityExpression( const QString &fieldName, const QVariant &value );
+    static QString createFieldEqualityExpression( const QString &fieldName, const QVariant &value, QVariant::Type fieldType = QVariant::Type::Invalid );
 
     /**
      * Returns TRUE if the given \a expression is a simple "field=value" type expression.
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -221,7 +221,16 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const
   for ( const FieldPair &pair : std::as_const( d->mFieldPairs ) )
   {
     QVariant val( feature.attribute( pair.referencedField() ) );
-    conditions << QgsExpression::createFieldEqualityExpression( pair.referencingField(), val );
+    int referencingIdx = referencingLayer()->fields().lookupField( pair.referencingField() );
+    if ( referencingIdx >= 0 )
+    {
+      QVariant::Type fieldType = referencingLayer()->fields().at( referencingIdx ).type();
+      conditions << QgsExpression::createFieldEqualityExpression( pair.referencingField(), val, fieldType );
+    }
+    else
+    {
+      conditions << QgsExpression::createFieldEqualityExpression( pair.referencingField(), val );
+    }
   }
 
   return conditions.join( QLatin1String( " AND " ) );
@@ -233,8 +242,17 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes
 
   for ( const FieldPair &pair : std::as_const( d->mFieldPairs ) )
   {
+    int referencedIdx = referencedLayer()->fields().lookupField( pair.referencedField() );
     int referencingIdx = referencingLayer()->fields().lookupField( pair.referencingField() );
-    conditions << QgsExpression::createFieldEqualityExpression( pair.referencedField(), attributes.at( referencingIdx ) );
+    if ( referencedIdx >= 0 )
+    {
+      QVariant::Type fieldType = referencedLayer()->fields().at( referencedIdx ).type();
+      conditions << QgsExpression::createFieldEqualityExpression( pair.referencedField(), attributes.at( referencingIdx ), fieldType );
+    }
+    else
+    {
+      conditions << QgsExpression::createFieldEqualityExpression( pair.referencedField(), attributes.at( referencingIdx ) );
+    }
   }
 
   QgsFeatureRequest myRequest;
diff --git a/tests/src/python/test_qgsexpression.py b/tests/src/python/test_qgsexpression.py
@@ -271,6 +271,20 @@ def testCreateFieldEqualityExpression(self):
         res = '"my\'field" = TRUE'
         self.assertEqual(e.createFieldEqualityExpression(field, value), res)
 
+        # test with field type
+        field = "myfield"
+        value = 1
+        type = QVariant.String
+        res = '"myfield" = \'1\''
+        self.assertEqual(e.createFieldEqualityExpression(field, value, type), res)
+
+        # test with field type
+        field = "myfield"
+        value = "1"
+        type = QVariant.Int
+        res = '"myfield" = 1'
+        self.assertEqual(e.createFieldEqualityExpression(field, value, type), res)
+
     def testReferencedAttributeIndexesNonExistingField(self):
         e = QgsExpression()
         e.setExpression("foo = 1")

Original file line number	Diff line number	Diff line change
`@@ -1112,14 +1112,16 @@ QString QgsExpression::formatPreviewString( const QVariant &value, const bool ht`
`1112`	`1112`	`}`
`1113`	`1113`	`}`
`1114`	`1114`
`1115`		`-QString QgsExpression::createFieldEqualityExpression( const QString &fieldName, const QVariant &value )`
	`1115`	`+QString QgsExpression::createFieldEqualityExpression( const QString &fieldName, const QVariant &value, QVariant::Type fieldType )`
`1116`	`1116`	`{`
`1117`	`1117`	`QString expr;`
`1118`	`1118`
`1119`	`1119`	`if ( value.isNull() )`
`1120`	`1120`	`expr = QStringLiteral( "%1 IS NULL" ).arg( quotedColumnRef( fieldName ) );`
`1121`		`- else`
	`1121`	`+ else if ( fieldType == QVariant::Type::Invalid )`
`1122`	`1122`	`expr = QStringLiteral( "%1 = %2" ).arg( quotedColumnRef( fieldName ), quotedValue( value ) );`
	`1123`	`+ else`
	`1124`	`+ expr = QStringLiteral( "%1 = %2" ).arg( quotedColumnRef( fieldName ), quotedValue( value, fieldType ) );`
`1123`	`1125`
`1124`	`1126`	`return expr;`
`1125`	`1127`	`}`