postgres provider: also cast field expressions to text (fixes #12346)

jef-n · jef-n · commit f04c40c28330 · 2015-03-10T09:03:22.000+01:00
(cherry picked from commit 1acad42f48dcf7ce31512356c8dd609292f22899)
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -1183,15 +1183,15 @@ QString QgsPostgresConn::fieldExpression( const QgsField &fld, QString expr )
   expr = expr.arg( quotedIdentifier( fld.name() ) );
   if ( type == "money" )
   {
-    return QString( "cash_out(%1)" ).arg( expr );
+    return QString( "cash_out(%1)::text" ).arg( expr );
   }
   else if ( type.startsWith( "_" ) )
   {
-    return QString( "array_out(%1)" ).arg( expr );
+    return QString( "array_out(%1)::text" ).arg( expr );
   }
   else if ( type == "bool" )
   {
-    return QString( "boolout(%1)" ).arg( expr );
+    return QString( "boolout(%1)::text" ).arg( expr );
   }
   else if ( type == "geometry" )
   {
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1270,8 +1270,7 @@ void QgsPostgresProvider::uniqueValues( int index, QList<QVariant> &uniqueValues
       sql += QString( " WHERE %1" ).arg( mSqlWhereClause );
     }
 
-    sql +=  QString( " ORDER BY %1" )
-            .arg( quotedIdentifier( fld.name() ) );
+    sql +=  QString( " ORDER BY %1" ).arg( connectionRO()->fieldExpression( fld ) );
 
     if ( limit >= 0 )
     {

Original file line number	Diff line number	Diff line change
`@@ -1183,15 +1183,15 @@ QString QgsPostgresConn::fieldExpression( const QgsField &fld, QString expr )`
`1183`	`1183`	`expr = expr.arg( quotedIdentifier( fld.name() ) );`
`1184`	`1184`	`if ( type == "money" )`
`1185`	`1185`	`{`
`1186`		`- return QString( "cash_out(%1)" ).arg( expr );`
	`1186`	`+ return QString( "cash_out(%1)::text" ).arg( expr );`
`1187`	`1187`	`}`
`1188`	`1188`	`else if ( type.startsWith( "_" ) )`
`1189`	`1189`	`{`
`1190`		`- return QString( "array_out(%1)" ).arg( expr );`
	`1190`	`+ return QString( "array_out(%1)::text" ).arg( expr );`
`1191`	`1191`	`}`
`1192`	`1192`	`else if ( type == "bool" )`
`1193`	`1193`	`{`
`1194`		`- return QString( "boolout(%1)" ).arg( expr );`
	`1194`	`+ return QString( "boolout(%1)::text" ).arg( expr );`
`1195`	`1195`	`}`
`1196`	`1196`	`else if ( type == "geometry" )`
`1197`	`1197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1270,8 +1270,7 @@ void QgsPostgresProvider::uniqueValues( int index, QList<QVariant> &uniqueValues`
`1270`	`1270`	`sql += QString( " WHERE %1" ).arg( mSqlWhereClause );`
`1271`	`1271`	`}`
`1272`	`1272`
`1273`		`- sql += QString( " ORDER BY %1" )`
`1274`		`- .arg( quotedIdentifier( fld.name() ) );`
	`1273`	`+ sql += QString( " ORDER BY %1" ).arg( connectionRO()->fieldExpression( fld ) );`
`1275`	`1274`
`1276`	`1275`	`if ( limit >= 0 )`
`1277`	`1276`	`{`