GPKG: hopefully unbreak VS2017 builds

tmSreedarsh · Jan 29, 2024 · ec69b46 · ec69b46
1 parent 37651a9
commit ec69b46
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 52 deletions.
diff --git a/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
@@ -414,44 +414,6 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
 
     GDALDataset *GetRasterLayerDataset(const char *pszLayerName);
 
-    //! Instance of that class temporarily disable foreign key checks
-    class TemporaryForeignKeyCheckDisabler
-    {
-      public:
-        explicit TemporaryForeignKeyCheckDisabler(GDALGeoPackageDataset *poDS)
-            : m_poDS(poDS),
-              m_nPragmaForeignKeysOldValue(SQLGetInteger(
-                  m_poDS->GetDB(), "PRAGMA foreign_keys", nullptr))
-        {
-            if (m_nPragmaForeignKeysOldValue)
-            {
-                CPL_IGNORE_RET_VAL(
-                    SQLCommand(m_poDS->GetDB(), "PRAGMA foreign_keys = 0"));
-            }
-        }
-
-        ~TemporaryForeignKeyCheckDisabler()
-        {
-            if (m_nPragmaForeignKeysOldValue)
-            {
-                CPL_IGNORE_RET_VAL(
-                    SQLCommand(m_poDS->GetDB(), "PRAGMA foreign_keys = 1"));
-            }
-        }
-
-      private:
-        CPL_DISALLOW_COPY_ASSIGN(TemporaryForeignKeyCheckDisabler)
-
-        GDALGeoPackageDataset *m_poDS = nullptr;
-        int m_nPragmaForeignKeysOldValue = 0;
-    };
-
-    //! Return an object that, while alive, temporarily disables foreign key checks
-    TemporaryForeignKeyCheckDisabler GetTemporaryForeignKeyCheckDisabler()
-    {
-        return TemporaryForeignKeyCheckDisabler(this);
-    }
-
   protected:
     virtual CPLErr IRasterIO(GDALRWFlag, int, int, int, int, void *, int, int,
                              GDALDataType, int, int *, GSpacing, GSpacing,
@@ -503,6 +465,41 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     bool HasGDALAspatialExtension();
 };
 
+/************************************************************************/
+/*                   GPKGTemporaryForeignKeyCheckDisabler               */
+/************************************************************************/
+
+//! Instance of that class temporarily disable foreign key checks
+class GPKGTemporaryForeignKeyCheckDisabler
+{
+  public:
+    explicit GPKGTemporaryForeignKeyCheckDisabler(GDALGeoPackageDataset *poDS)
+        : m_poDS(poDS), m_nPragmaForeignKeysOldValue(SQLGetInteger(
+                            m_poDS->GetDB(), "PRAGMA foreign_keys", nullptr))
+    {
+        if (m_nPragmaForeignKeysOldValue)
+        {
+            CPL_IGNORE_RET_VAL(
+                SQLCommand(m_poDS->GetDB(), "PRAGMA foreign_keys = 0"));
+        }
+    }
+
+    ~GPKGTemporaryForeignKeyCheckDisabler()
+    {
+        if (m_nPragmaForeignKeysOldValue)
+        {
+            CPL_IGNORE_RET_VAL(
+                SQLCommand(m_poDS->GetDB(), "PRAGMA foreign_keys = 1"));
+        }
+    }
+
+  private:
+    CPL_DISALLOW_COPY_ASSIGN(GPKGTemporaryForeignKeyCheckDisabler)
+
+    GDALGeoPackageDataset *m_poDS = nullptr;
+    int m_nPragmaForeignKeysOldValue = 0;
+};
+
 /************************************************************************/
 /*                        GDALGeoPackageRasterBand                      */
 /************************************************************************/

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -380,8 +380,8 @@ bool GDALGeoPackageDataset::ConvertGpkgSpatialRefSysToExtensionWkt2(
         return false;
 
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(this);
 
     bool bRet = SoftStartTransaction() == OGRERR_NONE;
 
@@ -6756,8 +6756,8 @@ int GDALGeoPackageDataset::FindLayerIndex(const char *pszLayerName)
 OGRErr GDALGeoPackageDataset::DeleteLayerCommon(const char *pszLayerName)
 {
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(this);
 
     char *pszSQL = sqlite3_mprintf(
         "DELETE FROM gpkg_contents WHERE lower(table_name) = lower('%q')",
@@ -6889,8 +6889,8 @@ OGRErr GDALGeoPackageDataset::DeleteLayer(int iLayer)
     CPLDebug("GPKG", "DeleteLayer(%s)", osLayerName.c_str());
 
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(this);
 
     OGRErr eErr = SoftStartTransaction();
 
@@ -6959,8 +6959,8 @@ OGRErr GDALGeoPackageDataset::DeleteLayer(int iLayer)
 OGRErr GDALGeoPackageDataset::DeleteRasterLayer(const char *pszLayerName)
 {
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(this);
 
     OGRErr eErr = SoftStartTransaction();
 

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -5168,8 +5168,8 @@ OGRErr OGRGeoPackageTableLayer::Rename(const char *pszDstTableName)
     }
 
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        m_poDS->GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(m_poDS);
 
     if (m_poDS->SoftStartTransaction() != OGRERR_NONE)
     {
@@ -6208,8 +6208,8 @@ OGRErr OGRGeoPackageTableLayer::DeleteField(int iFieldToDelete)
     m_poDS->ResetReadingAllLayers();
 
     // Temporary remove foreign key checks
-    const auto oTemporaryForeignKeyCheckDisabler(
-        m_poDS->GetTemporaryForeignKeyCheckDisabler());
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(m_poDS);
 
     if (m_poDS->SoftStartTransaction() != OGRERR_NONE)
     {
@@ -7140,8 +7140,8 @@ OGRErr OGRGeoPackageTableLayer::AlterGeomFieldDefn(
              !poOldSRS->IsSame(poNewSRS.get(), apszOptions)))
         {
             // Temporary remove foreign key checks
-            const auto oTemporaryForeignKeyCheckDisabler(
-                m_poDS->GetTemporaryForeignKeyCheckDisabler());
+            const GPKGTemporaryForeignKeyCheckDisabler
+                oGPKGTemporaryForeignKeyCheckDisabler(m_poDS);
 
             if (m_poDS->SoftStartTransaction() != OGRERR_NONE)
                 return OGRERR_FAILURE;