[QGIS Commit] r14748 - trunk/qgis/src/providers/postgres
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 23 00:31:46 EST 2010
Author: jef
Date: 2010-11-22 21:31:46 -0800 (Mon, 22 Nov 2010)
New Revision: 14748
Modified:
trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
Log:
apply #3242
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2010-11-23 03:15:55 UTC (rev 14747)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2010-11-23 05:31:46 UTC (rev 14748)
@@ -3138,19 +3138,20 @@
"from " ).arg( quotedIdentifier( geometryColumn ) );
if ( mUseEstimatedMetadata )
{
- sql += QString( "(select %1 from %2 where %1 is not null limit %3) as t" )
+ sql += QString( "(select %1 from %2 where %1 is not null" )
.arg( quotedIdentifier( geometryColumn ) )
- .arg( mQuery )
- .arg( sGeomTypeSelectLimit );
+ .arg( mQuery );
+ if ( !sqlWhereClause.isEmpty() )
+ sql += " and " + sqlWhereClause;
+ sql += QString( " limit %1 ) as t" ).arg( sGeomTypeSelectLimit );
}
else
{
sql += mQuery;
+ if ( !sqlWhereClause.isEmpty() )
+ sql += " where " + sqlWhereClause;
}
- if ( !sqlWhereClause.isEmpty() )
- sql += " where " + sqlWhereClause;
-
result = connectionRO->PQexec( sql );
if ( PQntuples( result ) == 1 )
More information about the QGIS-commit
mailing list