fixes #18421 : Keep options AUTO_REPACK=OFF when reloading data in ogr provider

troopa81 · nyalldawson · commit b30f51ab7102 · 2019-02-20T18:58:51.000+10:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4121,7 +4121,7 @@ void QgsOgrProvider::open( OpenMode mode )
   if ( !openReadOnly )
   {
     QStringList options;
-    if ( mode == OpenModeForceUpdateRepackOff )
+    if ( mode == OpenModeForceUpdateRepackOff || ( mDeferRepack && OpenModeSameAsCurrent ) )
     {
       options << "AUTO_REPACK=OFF";
     }
@@ -6455,5 +6455,3 @@ QGISEXTERN QgsTransaction *createTransaction( const QString &connString )
 
   return new QgsOgrTransaction( connString, ds );
 }
-
-
diff --git a/tests/src/python/test_provider_shapefile.py b/tests/src/python/test_provider_shapefile.py
@@ -484,6 +484,34 @@ def testDeleteShapes(self):
 
         vl = None
 
+    def testDontRepackOnReload(self):
+        ''' Test fix for #18421 '''
+
+        tmpdir = tempfile.mkdtemp()
+        self.dirs_to_cleanup.append(tmpdir)
+        srcpath = os.path.join(TEST_DATA_DIR, 'provider')
+        for file in glob.glob(os.path.join(srcpath, 'shapefile.*')):
+            shutil.copy(os.path.join(srcpath, file), tmpdir)
+        datasource = os.path.join(tmpdir, 'shapefile.shp')
+
+        vl = QgsVectorLayer('{}|layerid=0'.format(datasource), 'test', 'ogr')
+        feature_count = vl.featureCount()
+        # Start an iterator that will open a new connection
+        iterator = vl.getFeatures()
+        next(iterator)
+
+        # Delete another feature while in update mode
+        vl.dataProvider().enterUpdateMode()
+        vl.dataProvider().reloadData()
+        vl.dataProvider().deleteFeatures([0])
+
+        # Test that repacking has not been done (since in update mode)
+        ds = osgeo.ogr.Open(datasource)
+        self.assertTrue(ds.GetLayer(0).GetFeatureCount() == feature_count)
+        ds = None
+
+        vl = None
+
     def testRepackUnderFileLocks(self):
         ''' Test fix for #15570 and #15393 '''
 

Original file line number	Diff line number	Diff line change
`@@ -4121,7 +4121,7 @@ void QgsOgrProvider::open( OpenMode mode )`
`4121`	`4121`	`if ( !openReadOnly )`
`4122`	`4122`	`{`
`4123`	`4123`	`QStringList options;`
`4124`		`- if ( mode == OpenModeForceUpdateRepackOff )`
	`4124`	`+ if ( mode == OpenModeForceUpdateRepackOff \|\| ( mDeferRepack && OpenModeSameAsCurrent ) )`
`4125`	`4125`	`{`
`4126`	`4126`	`options << "AUTO_REPACK=OFF";`
`4127`	`4127`	`}`
`@@ -6455,5 +6455,3 @@ QGISEXTERN QgsTransaction *createTransaction( const QString &connString )`
`6455`	`6455`
`6456`	`6456`	`return new QgsOgrTransaction( connString, ds );`
`6457`	`6457`	`}`
`6458`		`-`
`6459`		`-`