Use @@ as primary key separator

mhugent · mhugent · commit 40b67e28d4e7 · 2018-02-21T11:46:16.000+01:00
diff --git a/src/server/qgsowsserver.cpp b/src/server/qgsowsserver.cpp
@@ -72,10 +72,20 @@ QString QgsOWSServer::featureGmlId( const QgsFeature* f, const QgsAttributeList&
     return QString();
   }
 
-  if ( pkAttributes.size() != 1 )
+  if ( pkAttributes.isEmpty() )
   {
     return QString::number( f->id() );
   }
 
-  return f->attribute( pkAttributes.at( 0 ) ).toString();
+  QString pkId;
+  QgsAttributeList::const_iterator it = pkAttributes.constBegin();
+  for ( ; it != pkAttributes.constEnd(); ++it )
+  {
+    if ( it != pkAttributes.constBegin() )
+    {
+      pkId.append( pkSeparator() );
+    }
+    pkId.append( f->attribute( *it ).toString() );
+  }
+  return pkId;
 }
diff --git a/src/server/qgsowsserver.h b/src/server/qgsowsserver.h
@@ -55,6 +55,8 @@ class QgsOWSServer
      */
     static void restoreLayerFilters( const QHash < QgsMapLayer*, QString >& filterMap );
 
+    static QString pkSeparator() { return "@@"; }
+
   private:
     QgsOWSServer() {}
 
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -1872,13 +1872,31 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( const QDomElement& filterEl
       fid = fidElem.attribute( "fid" );
       if ( fid.contains( "." ) )
         fid = fid.section( ".", 1, 1 );
-      if ( provider->pkAttributeIndexes().size() == 1 )
+      QgsAttributeList pkAttributes = provider->pkAttributeIndexes();
+      if ( pkAttributes.isEmpty() )
+      {
+        fids.insert( fid.toLongLong( &conversionSuccess ) );
+      }
+      else
       {
         //assume ID is the primary key, as it is more stable than the feature ID
         QgsFeature feature;
         const QgsFields& fields = provider->fields();
-        QString fieldName = fields[provider->pkAttributeIndexes().at( 0 )].name();
-        QgsExpression pkExpression( fieldName + " = " + fid );
+
+        QString expressionString;
+        QStringList pkValues = fid.split( pkSeparator() );
+        int pkExprSize = qMin( pkAttributes.size(), pkValues.size() );
+        for ( int i = 0; i < pkExprSize; ++i )
+        {
+          if ( i > 0 )
+          {
+            expressionString.append( " AND " );
+          }
+          QString fieldName = fields[ pkAttributes.at( i )].name();
+          expressionString.append( fieldName + " = " + pkValues.at( i ) );
+        }
+        QgsExpression pkExpression( expressionString );
+
         QgsExpressionContext exprContext = QgsExpressionContextUtils::createFeatureBasedContext( feature, fields );
         QgsFeatureRequest fReq( pkExpression, exprContext );
         QgsFeatureIterator fIt = provider->getFeatures( fReq );
@@ -1887,10 +1905,6 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( const QDomElement& filterEl
           fids.insert( feature.id() );
         }
       }
-      else //assume it is the feture id
-      {
-        fids.insert( fid.toLongLong( &conversionSuccess ) );
-      }
     }
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,20 @@ QString QgsOWSServer::featureGmlId( const QgsFeature* f, const QgsAttributeList&`
`72`	`72`	`return QString();`
`73`	`73`	`}`
`74`	`74`
`75`		`- if ( pkAttributes.size() != 1 )`
	`75`	`+ if ( pkAttributes.isEmpty() )`
`76`	`76`	`{`
`77`	`77`	`return QString::number( f->id() );`
`78`	`78`	`}`
`79`	`79`
`80`		`- return f->attribute( pkAttributes.at( 0 ) ).toString();`
	`80`	`+ QString pkId;`
	`81`	`+ QgsAttributeList::const_iterator it = pkAttributes.constBegin();`
	`82`	`+ for ( ; it != pkAttributes.constEnd(); ++it )`
	`83`	`+ {`
	`84`	`+ if ( it != pkAttributes.constBegin() )`
	`85`	`+ {`
	`86`	`+ pkId.append( pkSeparator() );`
	`87`	`+ }`
	`88`	`+ pkId.append( f->attribute( *it ).toString() );`
	`89`	`+ }`
	`90`	`+ return pkId;`
`81`	`91`	`}`