also fix QgsPostgresProvider::uniqueValues() and ::parseEnumRange()

jef · jef · commit 8f08d0d20dd7 · 2009-11-03T16:11:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11907 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1702,13 +1702,13 @@ void QgsPostgresProvider::uniqueValues( int index, QList<QVariant> &uniqueValues
     if ( sqlWhereClause.isEmpty() )
     {
       sql = QString( "select distinct %1 from %2 order by %1" )
-            .arg( fieldExpression( fld ) )
+            .arg( quotedIdentifier( fld.name() ) )
             .arg( mSchemaTableName );
     }
     else
     {
       sql = QString( "select distinct %1 from %2 where %3 order by %1" )
-            .arg( fieldExpression( fld ) )
+            .arg( quotedIdentifier( fld.name() ) )
             .arg( mSchemaTableName )
             .arg( sqlWhereClause );
     }
@@ -1777,7 +1777,7 @@ void QgsPostgresProvider::enumValues( int index, QStringList& enumList )
 bool QgsPostgresProvider::parseEnumRange( QStringList& enumValues, const QString& attributeName ) const
 {
   enumValues.clear();
-  QString enumRangeSql = QString( "SELECT enum_range(%1) from %2 limit1" ).arg( quotedIdentifier( attributeName ) ).arg( mSchemaTableName );
+  QString enumRangeSql = QString( "SELECT enum_range(%1) from %2 limit 1" ).arg( quotedIdentifier( attributeName ) ).arg( mSchemaTableName );
   Result enumRangeRes = connectionRO->PQexec( enumRangeSql );
   if ( PQresultStatus( enumRangeRes ) == PGRES_TUPLES_OK && PQntuples( enumRangeRes ) > 0 )
   {

Original file line number	Diff line number	Diff line change
`@@ -1702,13 +1702,13 @@ void QgsPostgresProvider::uniqueValues( int index, QList<QVariant> &uniqueValues`
`1702`	`1702`	`if ( sqlWhereClause.isEmpty() )`
`1703`	`1703`	`{`
`1704`	`1704`	`sql = QString( "select distinct %1 from %2 order by %1" )`
`1705`		`- .arg( fieldExpression( fld ) )`
	`1705`	`+ .arg( quotedIdentifier( fld.name() ) )`
`1706`	`1706`	`.arg( mSchemaTableName );`
`1707`	`1707`	`}`
`1708`	`1708`	`else`
`1709`	`1709`	`{`
`1710`	`1710`	`sql = QString( "select distinct %1 from %2 where %3 order by %1" )`
`1711`		`- .arg( fieldExpression( fld ) )`
	`1711`	`+ .arg( quotedIdentifier( fld.name() ) )`
`1712`	`1712`	`.arg( mSchemaTableName )`
`1713`	`1713`	`.arg( sqlWhereClause );`
`1714`	`1714`	`}`
`@@ -1777,7 +1777,7 @@ void QgsPostgresProvider::enumValues( int index, QStringList& enumList )`
`1777`	`1777`	`bool QgsPostgresProvider::parseEnumRange( QStringList& enumValues, const QString& attributeName ) const`
`1778`	`1778`	`{`
`1779`	`1779`	`enumValues.clear();`
`1780`		`- QString enumRangeSql = QString( "SELECT enum_range(%1) from %2 limit1" ).arg( quotedIdentifier( attributeName ) ).arg( mSchemaTableName );`
	`1780`	`+ QString enumRangeSql = QString( "SELECT enum_range(%1) from %2 limit 1" ).arg( quotedIdentifier( attributeName ) ).arg( mSchemaTableName );`
`1781`	`1781`	`Result enumRangeRes = connectionRO->PQexec( enumRangeSql );`
`1782`	`1782`	`if ( PQresultStatus( enumRangeRes ) == PGRES_TUPLES_OK && PQntuples( enumRangeRes ) > 0 )`
`1783`	`1783`	`{`