[OGR provider] Run addFeatures() and deleteFeatures() within transaction

Cherry-picked from fbb8ffc
qgis · Mar 20, 2017 · 6becea7 · 6becea7
1 parent 6715441
commit 6becea7
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1306,6 +1306,8 @@ bool QgsOgrProvider::addFeatures( QgsFeatureList & flist )
 
   setRelevantFields( ogrLayer, true, attributeIndexes() );
 
+  const bool inTransaction = startTransaction();
+
   bool returnvalue = true;
   for ( QgsFeatureList::iterator it = flist.begin(); it != flist.end(); ++it )
   {
@@ -1315,6 +1317,11 @@ bool QgsOgrProvider::addFeatures( QgsFeatureList & flist )
     }
   }
 
+  if ( inTransaction )
+  {
+    commitTransaction();
+  }
+
   if ( !syncToDisc() )
   {
     returnvalue = false;
@@ -1820,6 +1827,8 @@ bool QgsOgrProvider::deleteFeatures( const QgsFeatureIds & id )
   if ( !doInitialActionsForEdition() )
     return false;
 
+  const bool inTransaction = startTransaction();
+
   bool returnvalue = true;
   for ( QgsFeatureIds::const_iterator it = id.begin(); it != id.end(); ++it )
   {
@@ -1829,6 +1838,11 @@ bool QgsOgrProvider::deleteFeatures( const QgsFeatureIds & id )
     }
   }
 
+  if ( inTransaction )
+  {
+    commitTransaction();
+  }
+
   if ( !syncToDisc() )
   {
     returnvalue = false;