apply #3242

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14748 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/providers/postgres/qgspostgresprovider.cpp

@@ -3138,19 +3138,20 @@ bool QgsPostgresProvider::getGeometryDetails()
                      "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 )