SL provider: convert geometries to multipart when necessary (fix #6257)

brushtyler · brushtyler · commit 1bde6c58df3e · 2012-12-05T19:16:04.000+01:00
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -3720,6 +3720,49 @@ void QgsSpatiaLiteProvider::uniqueValues( int index, QList < QVariant > &uniqueV
   return;
 }
 
+QString QgsSpatiaLiteProvider::geomParam() const
+{
+  QString geometry;
+
+  bool forceMulti = false;
+
+  switch ( geometryType() )
+  {
+    case QGis::WKBPoint:
+    case QGis::WKBLineString:
+    case QGis::WKBPolygon:
+    case QGis::WKBPoint25D:
+    case QGis::WKBLineString25D:
+    case QGis::WKBPolygon25D:
+    case QGis::WKBUnknown:
+    case QGis::WKBNoGeometry:
+      forceMulti = false;
+      break;
+
+    case QGis::WKBMultiPoint:
+    case QGis::WKBMultiLineString:
+    case QGis::WKBMultiPolygon:
+    case QGis::WKBMultiPoint25D:
+    case QGis::WKBMultiLineString25D:
+    case QGis::WKBMultiPolygon25D:
+      forceMulti = true;
+      break;
+  }
+
+  if ( forceMulti )
+  {
+    geometry += "ST_Multi(";
+  }
+
+  geometry += QString( "GeomFromWKB(?, %2)" ).arg( mSrid );
+
+  if ( forceMulti )
+  {
+    geometry += ")";
+  }
+
+  return geometry;
+}
 
 bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
 {
@@ -3750,7 +3793,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
   if ( !mGeometryColumn.isNull() )
   {
     sql += separator + quotedIdentifier( mGeometryColumn );
-    values += separator + QString( "GeomFromWKB(?, %2)" ).arg( mSrid );
+    values += separator + geomParam();
     separator = ",";
   }
 
diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -286,6 +286,8 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     /** convert a QgsField to work with SL */
     static bool convertField( QgsField &field );
 
+    QString geomParam() const;
+
     QgsFieldMap attributeFields;
     /**
        * Flag indicating if the layer data source is a valid SpatiaLite layer
