- set primary key value to NULL in split when there is no default value.

- modified the test accordingly
qgis · Jul 11, 2013 · 45ab8cc · 45ab8cc
1 parent 827ed31
commit 45ab8cc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -254,6 +254,10 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
           {
             newAttributes[ pkIdx ] = defaultValue;
           }
+          else //try with NULL
+          {
+            newAttributes[ pkIdx ] = QVariant();
+          }
         }
 
         newFeature.setAttributes( newAttributes );

diff --git a/tests/src/python/test_qgsspatialiteprovider.py b/tests/src/python/test_qgsspatialiteprovider.py
@@ -52,6 +52,15 @@ def setUpClass(cls):
         sql +=    "VALUES (1, 'toto', GeomFromText('POLYGON((0 0,1 0,1 1,0 1,0 0))', 4326))"
         cur.execute(sql)
 
+        # table with multiple column primary key
+        sql = "CREATE TABLE test_pg_mk (id INTEGER NOT NULL, name TEXT NOT NULL, PRIMARY KEY(id,name))"
+        cur.execute(sql)
+        sql = "SELECT AddGeometryColumn('test_pg_mk', 'geometry', 4326, 'POLYGON', 'XY')"
+        cur.execute(sql)
+        sql = "INSERT INTO test_pg_mk (id, name, geometry) "
+        sql +=    "VALUES (1, 'toto', GeomFromText('POLYGON((0 0,1 0,1 1,0 1,0 0))', 4326))"
+        cur.execute(sql)
+
         con.commit()
         con.close()
 
@@ -79,6 +88,17 @@ def test_SplitFeature(self):
         layer.startEditing()
         layer.splitFeatures([QgsPoint(0.5, -0.5), QgsPoint(0.5, 1.5)], 0)==0 or die("error in split")
         layer.splitFeatures([QgsPoint(-0.5, 0.5), QgsPoint(1.5, 0.5)], 0)==0 or die("error in split")
+        layer.commitChanges() or die("this commit should work")
+        layer.featureCount() == 4 or die("we should have 4 features after 2 split")
+
+    def test_SplitFeatureWithFailedCommit(self):
+        """Create spatialite database"""
+        layer = QgsVectorLayer("dbname=test.sqlite table=test_pg_mk (geometry)", "test_pg_mk", "spatialite")
+        assert(layer.isValid())
+        assert(layer.hasGeometryType())
+        layer.startEditing()
+        layer.splitFeatures([QgsPoint(0.5, -0.5), QgsPoint(0.5, 1.5)], 0)==0 or die("error in split")
+        layer.splitFeatures([QgsPoint(-0.5, 0.5), QgsPoint(1.5, 0.5)], 0)==0 or die("error in split")
         if layer.commitChanges():
             die("this commit should fail")
         layer.rollBack()