vector bugfixes

jef · jef · commit ef10609f1788 · 2008-09-23T05:42:44.000Z
- QgsVectorLayer::commitChanges: handle deleted added features - QgsPostgresProvider: - update ids of added features only, when they were actually inserted - deallocate prepared statements after rollback (fixes #1328) git-svn-id: http://svn.osgeo.org/qgis/trunk@9381 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2747,6 +2747,18 @@ bool QgsVectorLayer::commitChanges()
     {
       for ( QgsFeatureList::iterator iter = mAddedFeatures.begin(); iter != mAddedFeatures.end(); ++iter )
       {
+        if ( mDeletedFeatureIds.contains( iter->featureId() ) )
+        {
+          mDeletedFeatureIds.remove( iter->featureId() );
+
+          if ( mChangedGeometries.contains( iter->featureId() ) )
+            mChangedGeometries.remove( iter->featureId() );
+
+          mAddedFeatures.erase( iter );
+
+          continue;
+        }
+
         if ( mChangedGeometries.contains( iter->featureId() ) )
         {
           iter->setGeometry( mChangedGeometries.take( iter->featureId() ) );
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1821,6 +1821,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )
     PQclear( stmt );
 
     int primaryKeyHighWater = maxPrimaryKeyValue();
+    QList<int> newIds;
 
     for ( QgsFeatureList::iterator features = flist.begin(); features != flist.end(); features++ )
     {
@@ -1832,7 +1833,8 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )
       QStringList params;
       params << geomParam;
       params << QString( "%1" ).arg( ++primaryKeyHighWater );
-      features->setFeatureId( primaryKeyHighWater );
+
+      newIds << primaryKeyHighWater;
 
       for ( int i = 0; i < fieldId.size(); i++ )
         params << paramValue( attributevec[ fieldId[i] ].toString(), defaultValue[i] );
@@ -1843,14 +1845,17 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )
       PQclear( result );
     }
 
+    for ( int i = 0; i < flist.size(); i++ )
+      flist[i].setFeatureId( newIds[i] );
+
     connectionRW->PQexecNR( "DEALLOCATE addfeatures" );
     connectionRW->PQexecNR( "COMMIT" );
   }
   catch ( PGException &e )
   {
     e.showErrorMessage( tr( "Error while adding features" ) );
-    connectionRW->PQexecNR( "DEALLOCATE addfeatures" );
     connectionRW->PQexecNR( "ROLLBACK" );
+    connectionRW->PQexecNR( "DEALLOCATE addfeatures" );
     returnvalue = false;
   }
 
@@ -2121,8 +2126,8 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
   catch ( PGException &e )
   {
     e.showErrorMessage( tr( "Error while changing geometry values" ) );
-    connectionRW->PQexecNR( "DEALLOCATE updatefeatures" );
     connectionRW->PQexecNR( "ROLLBACK" );
+    connectionRW->PQexecNR( "DEALLOCATE updatefeatures" );
     returnvalue = false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2747,6 +2747,18 @@ bool QgsVectorLayer::commitChanges()`
`2747`	`2747`	`{`
`2748`	`2748`	`for ( QgsFeatureList::iterator iter = mAddedFeatures.begin(); iter != mAddedFeatures.end(); ++iter )`
`2749`	`2749`	`{`
	`2750`	`+ if ( mDeletedFeatureIds.contains( iter->featureId() ) )`
	`2751`	`+ {`
	`2752`	`+ mDeletedFeatureIds.remove( iter->featureId() );`
	`2753`	`+`
	`2754`	`+ if ( mChangedGeometries.contains( iter->featureId() ) )`
	`2755`	`+ mChangedGeometries.remove( iter->featureId() );`
	`2756`	`+`
	`2757`	`+ mAddedFeatures.erase( iter );`
	`2758`	`+`
	`2759`	`+ continue;`
	`2760`	`+ }`
	`2761`	`+`
`2750`	`2762`	`if ( mChangedGeometries.contains( iter->featureId() ) )`
`2751`	`2763`	`{`
`2752`	`2764`	`iter->setGeometry( mChangedGeometries.take( iter->featureId() ) );`
Original file line number	Diff line number	Diff line change
`@@ -1821,6 +1821,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )`
`1821`	`1821`	`PQclear( stmt );`
`1822`	`1822`
`1823`	`1823`	`int primaryKeyHighWater = maxPrimaryKeyValue();`
	`1824`	`+ QList<int> newIds;`
`1824`	`1825`
`1825`	`1826`	`for ( QgsFeatureList::iterator features = flist.begin(); features != flist.end(); features++ )`
`1826`	`1827`	`{`
`@@ -1832,7 +1833,8 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )`
`1832`	`1833`	`QStringList params;`
`1833`	`1834`	`params << geomParam;`
`1834`	`1835`	`params << QString( "%1" ).arg( ++primaryKeyHighWater );`
`1835`		`- features->setFeatureId( primaryKeyHighWater );`
	`1836`	`+`
	`1837`	`+ newIds << primaryKeyHighWater;`
`1836`	`1838`
`1837`	`1839`	`for ( int i = 0; i < fieldId.size(); i++ )`
`1838`	`1840`	`params << paramValue( attributevec[ fieldId[i] ].toString(), defaultValue[i] );`
`@@ -1843,14 +1845,17 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )`
`1843`	`1845`	`PQclear( result );`
`1844`	`1846`	`}`
`1845`	`1847`
	`1848`	`+ for ( int i = 0; i < flist.size(); i++ )`
	`1849`	`+ flist[i].setFeatureId( newIds[i] );`
	`1850`	`+`
`1846`	`1851`	`connectionRW->PQexecNR( "DEALLOCATE addfeatures" );`
`1847`	`1852`	`connectionRW->PQexecNR( "COMMIT" );`
`1848`	`1853`	`}`
`1849`	`1854`	`catch ( PGException &e )`
`1850`	`1855`	`{`
`1851`	`1856`	`e.showErrorMessage( tr( "Error while adding features" ) );`
`1852`		`- connectionRW->PQexecNR( "DEALLOCATE addfeatures" );`
`1853`	`1857`	`connectionRW->PQexecNR( "ROLLBACK" );`
	`1858`	`+ connectionRW->PQexecNR( "DEALLOCATE addfeatures" );`
`1854`	`1859`	`returnvalue = false;`
`1855`	`1860`	`}`
`1856`	`1861`
`@@ -2121,8 +2126,8 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )`
`2121`	`2126`	`catch ( PGException &e )`
`2122`	`2127`	`{`
`2123`	`2128`	`e.showErrorMessage( tr( "Error while changing geometry values" ) );`
`2124`		`- connectionRW->PQexecNR( "DEALLOCATE updatefeatures" );`
`2125`	`2129`	`connectionRW->PQexecNR( "ROLLBACK" );`
	`2130`	`+ connectionRW->PQexecNR( "DEALLOCATE updatefeatures" );`
`2126`	`2131`	`returnvalue = false;`
`2127`	`2132`	`}`
`2128`	`2133`