From 19690a5fe81f4efb5a03d638005ba5071889c0e8 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Feb 2025 22:40:58 +0100 Subject: [PATCH 1/4] GPKG: make it compatibile with SQLite 3.49.1 in SQLITE_DQS=0 mode (again) --- ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp index 3ecad6c329ca..21f133649785 100644 --- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp +++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp @@ -7295,11 +7295,11 @@ OGRErr OGRGeoPackageTableLayer::AlterGeomFieldDefn( CPLString() .Printf( "UPDATE gpkg_geometry_columns SET column_name = '%s' " - "WHERE lower(table_name) = lower(\"%s\") " - "AND lower(column_name) = lower(\"%s\")", + "WHERE lower(table_name) = lower('%s') " + "AND lower(column_name) = lower('%s')", SQLEscapeLiteral(poNewGeomFieldDefn->GetNameRef()).c_str(), - SQLEscapeName(m_pszTableName).c_str(), - SQLEscapeName(poGeomFieldDefn->GetNameRef()).c_str()) + SQLEscapeLiteral(m_pszTableName).c_str(), + SQLEscapeLiteral(poGeomFieldDefn->GetNameRef()).c_str()) .c_str()); if (eErr != OGRERR_NONE) { From 5adc13b7c90eacd27efac9c208d2fa7affffe044 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Feb 2025 23:38:19 +0100 Subject: [PATCH 2/4] SQLite dialect: make it compatibile with SQLite 3.49.1 in SQLITE_DQS=0 mode --- ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp index 63f40ffcc9fc..2fc0c532146d 100644 --- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp +++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp @@ -184,9 +184,9 @@ static void OGR2SQLITEAddLayer(const char *&pszStart, int &nNum, { oLayerDesc.osSubstitutedName = CPLString().Printf("_OGR_%d", nNum++); - osModifiedSQL += "\""; + osModifiedSQL += "'"; osModifiedSQL += oLayerDesc.osSubstitutedName; - osModifiedSQL += "\""; + osModifiedSQL += "'"; } else { From 834381809ab043ad83ab5ee4f61751f18828bd5f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 19 Feb 2025 00:28:15 +0100 Subject: [PATCH 3/4] Revert "Fix doc building" This reverts commit 3e34cfe067fd6a9d593f4760e8cdf67524bb181f. --- doc/source/download.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/download.rst b/doc/source/download.rst index f39f7091c056..c181361129a2 100644 --- a/doc/source/download.rst +++ b/doc/source/download.rst @@ -20,7 +20,7 @@ Current Release * **2025-02-14** `gdal-3.10.2.tar.gz`_ `3.10.2 "Gulf of Mexico" Release Notes`_ (`3.10.2 md5`_) -.. _`3.10.2 "Gulf of Mexico" Release Notes`: https://github.com/OSGeo/gdal/blob/v3.10.2/NEWS.md +.. _`3.10.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.10.2/NEWS.md .. _`gdal-3.10.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.10.2/gdal-3.10.2.tar.gz .. _`3.10.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.10.2/gdal-3.10.2.tar.gz.md5 From 45ebf24c5453475bdfb4ac6052f11444a0b652fb Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 19 Feb 2025 00:28:18 +0100 Subject: [PATCH 4/4] Revert "Doc: add Gulf of Mexico nickname" This reverts commit ca3cb8c2bf3a8f97e8fae9153a36bb268559a9bc. --- NEWS.md | 2 +- doc/source/about_no_title.rst | 2 +- doc/source/download.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index a976003c5cb1..a0427eecb781 100644 --- a/NEWS.md +++ b/NEWS.md @@ -360,7 +360,7 @@ XODR driver: * Fix typo in handling of Translate widthPct, heightPct * add relatedFieldNameMatch parameter to gdal.VectorTranslate() -# GDAL/OGR 3.10.2 "Gulf of Mexico" Release Notes +# GDAL/OGR 3.10.2 Release Notes GDAL 3.10.2 is a bugfix release. diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst index ccb02739c95e..0c967d4b28ad 100644 --- a/doc/source/about_no_title.rst +++ b/doc/source/about_no_title.rst @@ -1,4 +1,4 @@ -GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the February 2025 GDAL/OGR 3.10.2 "Gulf Of Mexico" release. +GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the February 2025 GDAL/OGR 3.10.2 release. .. only:: html diff --git a/doc/source/download.rst b/doc/source/download.rst index c181361129a2..d11a13e7645a 100644 --- a/doc/source/download.rst +++ b/doc/source/download.rst @@ -18,7 +18,7 @@ Source Code Current Release ............... -* **2025-02-14** `gdal-3.10.2.tar.gz`_ `3.10.2 "Gulf of Mexico" Release Notes`_ (`3.10.2 md5`_) +* **2025-02-14** `gdal-3.10.2.tar.gz`_ `3.10.2 Release Notes`_ (`3.10.2 md5`_) .. _`3.10.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.10.2/NEWS.md .. _`gdal-3.10.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.10.2/gdal-3.10.2.tar.gz