Merge pull request #2418 from nyalldawson/postgres_in

jef-n · jef-n · commit 6a1d206536fb · 2015-11-05T22:02:53.000+01:00
Use IN (...) for postgres FilterFids requests
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -549,13 +549,35 @@ QString QgsPostgresUtils::whereClause( QgsFeatureId featureId, const QgsFields&
 
 QString QgsPostgresUtils::whereClause( const QgsFeatureIds& featureIds, const QgsFields& fields, QgsPostgresConn* conn, QgsPostgresPrimaryKeyType pkType, const QList<int>& pkAttrs, QSharedPointer<QgsPostgresSharedData> sharedData )
 {
-  QStringList whereClauses;
-  Q_FOREACH ( const QgsFeatureId featureId, featureIds )
+  switch ( pkType )
   {
-    whereClauses << whereClause( featureId, fields, conn, pkType, pkAttrs, sharedData );
-  }
+    case pktOid:
+    case pktInt:
+    {
+      //simple primary key, so prefer to use an "IN (...)" query. These are much faster then multiple chained ...OR... clauses
+      QString delim;
+      QString expr = QString( "%1 IN (" ).arg(( pkType == pktOid ? "oid" : QgsPostgresConn::quotedIdentifier( fields[ pkAttrs[0] ].name() ) ) );
 
-  return whereClauses.isEmpty() ? "" : whereClauses.join( " OR " ).prepend( '(' ).append( ')' );
+      Q_FOREACH ( const QgsFeatureId featureId, featureIds )
+      {
+        expr += delim + QString::number( featureId );
+        delim = ',';
+      }
+      expr += ')';
+
+      return expr;
+    }
+    default:
+    {
+      //complex primary key, need to build up where string
+      QStringList whereClauses;
+      Q_FOREACH ( const QgsFeatureId featureId, featureIds )
+      {
+        whereClauses << whereClause( featureId, fields, conn, pkType, pkAttrs, sharedData );
+      }
+      return whereClauses.isEmpty() ? "" : whereClauses.join( " OR " ).prepend( '(' ).append( ')' );
+    }
+  }
 }
 
 QString QgsPostgresUtils::andWhereClauses( const QString& c1, const QString& c2 )
