Do not differentiate strings from non string in conditions

pblottiere · pblottiere · commit 8e43acabae76 · 2017-07-03T23:06:08.000+02:00
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -178,15 +178,9 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const
     {
       conditions << QStringLiteral( "%1 IS NULL" ).arg( quotedColRef );
     }
-    else if ( referencingField.type() == QVariant::String )
-    {
-      // Use quotes
-      conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( val.toString() ) );
-    }
     else
     {
-      // No quotes
-      conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, val.toString() );
+      conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( val ) );
     }
   }
 
@@ -203,18 +197,8 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes
     int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );
 
     QgsField referencedField = referencedLayer()->fields().at( referencedIdx );
-    const QString quotedColRef = QgsExpression::quotedColumnRef( fieldPair.referencedField() ) ;
 
-    if ( referencedField.type() == QVariant::String )
-    {
-      // Use quotes
-      conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( attributes.at( referencingIdx ).toString() ) );
-    }
-    else
-    {
-      // No quotes
-      conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, attributes.at( referencingIdx ).toString() );
-    }
+    conditions << QStringLiteral( "%1 = %2" ).arg( QgsExpression::quotedColumnRef( fieldPair.referencedField() ), QgsExpression::quotedValue( attributes.at( referencingIdx ) ) );
   }
 
   QgsFeatureRequest myRequest;

Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,9 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const`
`178`	`178`	`{`
`179`	`179`	`conditions << QStringLiteral( "%1 IS NULL" ).arg( quotedColRef );`
`180`	`180`	`}`
`181`		`- else if ( referencingField.type() == QVariant::String )`
`182`		`- {`
`183`		`- // Use quotes`
`184`		`- conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( val.toString() ) );`
`185`		`- }`
`186`	`181`	`else`
`187`	`182`	`{`
`188`		`- // No quotes`
`189`		`- conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, val.toString() );`
	`183`	`+ conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( val ) );`
`190`	`184`	`}`
`191`	`185`	`}`
`192`	`186`
`@@ -203,18 +197,8 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes`
`203`	`197`	`int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );`
`204`	`198`
`205`	`199`	`QgsField referencedField = referencedLayer()->fields().at( referencedIdx );`
`206`		`- const QString quotedColRef = QgsExpression::quotedColumnRef( fieldPair.referencedField() ) ;`
`207`	`200`
`208`		`- if ( referencedField.type() == QVariant::String )`
`209`		`- {`
`210`		`- // Use quotes`
`211`		`- conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, QgsExpression::quotedValue( attributes.at( referencingIdx ).toString() ) );`
`212`		`- }`
`213`		`- else`
`214`		`- {`
`215`		`- // No quotes`
`216`		`- conditions << QStringLiteral( "%1 = %2" ).arg( quotedColRef, attributes.at( referencingIdx ).toString() );`
`217`		`- }`
	`201`	`+ conditions << QStringLiteral( "%1 = %2" ).arg( QgsExpression::quotedColumnRef( fieldPair.referencedField() ), QgsExpression::quotedValue( attributes.at( referencingIdx ) ) );`
`218`	`202`	`}`
`219`	`203`
`220`	`204`	`QgsFeatureRequest myRequest;`