[QGIS Commit] r11907 - trunk/qgis/src/providers/postgres
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 3 11:11:24 EST 2009
Author: jef
Date: 2009-11-03 11:11:23 -0500 (Tue, 03 Nov 2009)
New Revision: 11907
Modified:
trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
Log:
also fix QgsPostgresProvider::uniqueValues() and ::parseEnumRange()
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2009-11-03 15:59:38 UTC (rev 11906)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2009-11-03 16:11:23 UTC (rev 11907)
@@ -1702,13 +1702,13 @@
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 @@
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 )
{
More information about the QGIS-commit
mailing list