Merge pull request #11275 from rouault/fix_11274

GPKG: make sure gpkg_ogr_contents.feature_count = 0 on a newly created empty table
OSGeo · Nov 22, 2024 · 0151b87 · 0151b87
2 parents bbf5667 + 0ea26b2
commit 0151b87
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
@@ -623,13 +623,27 @@ def test_ogr_gpkg_6(gpkg_ds, tmp_path):
 
 
 def test_ogr_gpkg_7(gpkg_ds):
+    def get_feature_count_from_gpkg_contents():
+        with gpkg_ds.ExecuteSQL(
+            'SELECT feature_count FROM gpkg_ogr_contents WHERE table_name = "field_test_layer"',
+            dialect="DEBUG",
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            ret = f.GetField(0)
+        return ret
 
     lyr = gpkg_ds.CreateLayer("field_test_layer", geom_type=ogr.wkbPoint)
     field_defn = ogr.FieldDefn("dummy", ogr.OFTString)
     lyr.CreateField(field_defn)
 
+    gpkg_ds.SyncToDisk()
+
+    assert get_feature_count_from_gpkg_contents() == 0
+
     gpkg_ds = gdaltest.reopen(gpkg_ds, update=1)
 
+    assert get_feature_count_from_gpkg_contents() == 0
+
     lyr = gpkg_ds.GetLayerByName("field_test_layer")
     geom = ogr.CreateGeometryFromWkt("POINT(10 10)")
     feat = ogr.Feature(lyr.GetLayerDefn())
@@ -642,6 +656,9 @@ def test_ogr_gpkg_7(gpkg_ds):
 
     assert lyr.CreateFeature(feat) == 0, "cannot create feature"
 
+    # None is expected here since CreateFeature() has temporarily disabled triggers
+    assert get_feature_count_from_gpkg_contents() is None
+
     # Read back what we just inserted
     lyr.ResetReading()
     feat_read = lyr.GetNextFeature()
@@ -690,34 +707,17 @@ def test_ogr_gpkg_7(gpkg_ds):
 
     assert lyr.GetFeatureCount() == 2
 
-    def get_feature_count_from_gpkg_contents():
-        with gpkg_ds.ExecuteSQL(
-            'SELECT feature_count FROM gpkg_ogr_contents WHERE table_name = "field_test_layer"',
-            dialect="DEBUG",
-        ) as sql_lyr:
-            f = sql_lyr.GetNextFeature()
-            ret = f.GetField(0)
-        return ret
-
-    assert get_feature_count_from_gpkg_contents() == 2
-
     assert lyr.CreateFeature(ogr.Feature(lyr.GetLayerDefn())) == ogr.OGRERR_NONE
 
     assert lyr.GetFeatureCount() == 3
 
-    # 2 is expected here since CreateFeature() has temporarily disable triggers
-    assert get_feature_count_from_gpkg_contents() == 2
-
     # Test upserting an existing feature
     feat.SetField("dummy", "updated")
     fid = feat.GetFID()
     assert lyr.UpsertFeature(feat) == ogr.OGRERR_NONE, "cannot upsert existing feature"
 
     assert feat.GetFID() == fid
 
-    # UpsertFeature() has serialized value 3 and re-enables triggers
-    assert get_feature_count_from_gpkg_contents() == 3
-
     upserted_feat = lyr.GetFeature(feat.GetFID())
     assert (
         upserted_feat.GetField("dummy") == "updated"
@@ -5526,7 +5526,7 @@ def test_ogr_gpkg_test_ogrsf(gpkg_ds):
     dbname = gpkg_ds.GetDescription()
 
     # Do integrity check first
-    gpkg_ds = ogr.Open(dbname)
+    gpkg_ds = gdaltest.reopen(gpkg_ds)
     with gpkg_ds.ExecuteSQL("PRAGMA integrity_check") as sql_lyr:
         feat = sql_lyr.GetNextFeature()
         assert feat.GetField(0) == "ok", "integrity check failed"

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -6035,7 +6035,7 @@ OGRErr OGRGeoPackageTableLayer::RunDeferredCreationIfNecessary()
 
         pszSQL = sqlite3_mprintf(
             "INSERT INTO gpkg_ogr_contents (table_name, feature_count) "
-            "VALUES ('%q', NULL)",
+            "VALUES ('%q', 0)",
             pszLayerName);
         err = SQLCommand(m_poDS->GetDB(), pszSQL);
         sqlite3_free(pszSQL);