Getting last changes

.github/workflows/cmake_builds.yml

@@ -409,7 +409,7 @@ jobs:
       shell: pwsh
       run: |
         echo "JAVA_HOME=$env:JAVA_HOME_11_X64" >> %GITHUB_ENV%
-    - uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+    - uses: conda-incubator/setup-miniconda@392cf345b1784333caa1a1185081c71e6ffd61bc # v3.0.2
       with:
         activate-environment: gdalenv
         miniforge-variant: Mambaforge
@@ -506,7 +506,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+    - uses: conda-incubator/setup-miniconda@392cf345b1784333caa1a1185081c71e6ffd61bc # v3.0.2
       with:
         activate-environment: gdalenv
         miniforge-variant: Mambaforge
@@ -653,7 +653,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+    - uses: conda-incubator/setup-miniconda@392cf345b1784333caa1a1185081c71e6ffd61bc # v3.0.2
       with:
         activate-environment: gdalenv
         python-version: 3.9

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+      uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,6 +61,7 @@ jobs:
 
     - name: Install dependencies
       run: |
+          sudo apt-get update
           sudo apt-get install -y ccache cmake g++ swig python3-numpy libproj-dev libqhull-dev
           sudo apt-get install -y \
             libblosc-dev \
@@ -148,6 +149,6 @@ jobs:
         key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+      uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/conda.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        platform: ['ubuntu-latest','windows-latest','macos-latest']
+        platform: ['ubuntu-latest','windows-latest','macos-latest','macos-14']
 
     env:
       GHA_CI_PLATFORM: ${{ matrix.platform }}
@@ -47,7 +47,7 @@ jobs:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-${{ steps.get-date.outputs.today }}-conda-${{ env.CACHE_NUMBER }}
 
-    - uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+    - uses: conda-incubator/setup-miniconda@392cf345b1784333caa1a1185081c71e6ffd61bc # v3.0.2
       with:
         #miniforge-variant: Mambaforge
         miniforge-version: latest

.github/workflows/macos.yml

@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
+      - uses: conda-incubator/setup-miniconda@392cf345b1784333caa1a1185081c71e6ffd61bc # v3.0.2
         with:
             channels: conda-forge
             auto-update-conda: true

.github/workflows/scorecard.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
         with:
           sarif_file: results.sarif

apps/gdalinfo_lib.cpp

@@ -290,30 +290,31 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
                GDALGetDriverShortName(hDriver), GDALGetDriverLongName(hDriver));
     }
 
-    // The list of files of a raster FileGDB is not super useful and potentially
-    // super long, so omit it, unless the -json mode is enabled
-    char **papszFileList =
-        (!bJson && EQUAL(GDALGetDriverShortName(hDriver), "OpenFileGDB"))
-            ? nullptr
-            : GDALGetFileList(hDataset);
-
-    if (papszFileList == nullptr || *papszFileList == nullptr)
+    if (psOptions->bShowFileList)
     {
-        if (bJson)
+        // The list of files of a raster FileGDB is not super useful and potentially
+        // super long, so omit it, unless the -json mode is enabled
+        char **papszFileList =
+            (!bJson && EQUAL(GDALGetDriverShortName(hDriver), "OpenFileGDB"))
+                ? nullptr
+                : GDALGetFileList(hDataset);
+
+        if (!papszFileList || *papszFileList == nullptr)
         {
-            json_object *poFiles = json_object_new_array();
-            json_object_object_add(poJsonObject, "files", poFiles);
+            if (bJson)
+            {
+                json_object *poFiles = json_object_new_array();
+                json_object_object_add(poJsonObject, "files", poFiles);
+            }
+            else
+            {
+                Concat(osStr, psOptions->bStdoutOutput,
+                       "Files: none associated\n");
+            }
         }
         else
         {
-            Concat(osStr, psOptions->bStdoutOutput, "Files: none associated\n");
-        }
-    }
-    else
-    {
-        if (bJson)
-        {
-            if (psOptions->bShowFileList)
+            if (bJson)
             {
                 json_object *poFiles = json_object_new_array();
 
@@ -327,20 +328,17 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
 
                 json_object_object_add(poJsonObject, "files", poFiles);
             }
-        }
-        else
-        {
-            Concat(osStr, psOptions->bStdoutOutput, "Files: %s\n",
-                   papszFileList[0]);
-            if (psOptions->bShowFileList)
+            else
             {
+                Concat(osStr, psOptions->bStdoutOutput, "Files: %s\n",
+                       papszFileList[0]);
                 for (int i = 1; papszFileList[i] != nullptr; i++)
                     Concat(osStr, psOptions->bStdoutOutput, "       %s\n",
                            papszFileList[i]);
             }
         }
+        CSLDestroy(papszFileList);
     }
-    CSLDestroy(papszFileList);
 
     if (bJson)
     {

apps/gdaltindex_bin.cpp

@@ -51,7 +51,7 @@ static void Usage(bool bIsError, const char *pszErrorMsg)
         "                  [-skip_different_projection] [-t_srs <target_srs>]\n"
         "                  [-src_srs_name field_name] [-src_srs_format "
         "{AUTO|WKT|EPSG|PROJ}]\n"
-        "                  [-lyr_name <name>]\n"
+        "                  [-lyr_name <name>] [-lco <KEY>=<VALUE>]...\n"
         "                  [-gti_filename <name>]\n"
         "                  [-tr <xres> <yres>] [-te <xmin> <ymin> <xmax> "
         "<ymax>]\n"

apps/gdaltindex_lib.cpp

@@ -75,6 +75,7 @@ struct GDALTileIndexOptions
     std::string osFormat{};
     std::string osIndexLayerName{};
     std::string osLocationField = "location";
+    CPLStringList aosLCO{};
     std::string osTargetSRS{};
     bool bWriteAbsolutePath = false;
     bool bSkipDifferentProjection = false;
@@ -504,9 +505,9 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
                 oSRS = *poSrcSRS;
         }
 
-        poLayer = poTileIndexDS->CreateLayer(osLayerName.c_str(),
-                                             oSRS.IsEmpty() ? nullptr : &oSRS,
-                                             wkbPolygon, nullptr);
+        poLayer = poTileIndexDS->CreateLayer(
+            osLayerName.c_str(), oSRS.IsEmpty() ? nullptr : &oSRS, wkbPolygon,
+            psOptions->aosLCO.List());
         if (!poLayer)
             return nullptr;
 
@@ -1193,6 +1194,11 @@ GDALTileIndexOptionsNew(char **papszArgv,
             CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
             psOptions->osLocationField = papszArgv[++iArg];
         }
+        else if (strcmp(papszArgv[iArg], "-lco") == 0)
+        {
+            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+            psOptions->aosLCO.AddString(papszArgv[++iArg]);
+        }
         else if (strcmp(papszArgv[iArg], "-t_srs") == 0)
         {
             CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);

autotest/ogr/ogr_gpkg.py

@@ -7093,6 +7093,33 @@ def test_ogr_gpkg_relations(tmp_vsimem, tmp_path):
     assert rel.GetRightMappingTableFields() == ["related_id"]
     assert rel.GetRelatedTableType() == "features"
 
+    # a one-to-many relationship defined using foreign key constraints
+    ds = gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE)
+    ds.ExecuteSQL(
+        "CREATE TABLE test_relation_a(artistid INTEGER PRIMARY KEY, artistname  TEXT)"
+    )
+    ds.ExecuteSQL(
+        "CREATE TABLE test_relation_b(trackid INTEGER, trackname TEXT, trackartist INTEGER, FOREIGN KEY(trackartist) REFERENCES test_relation_a(artistid))"
+    )
+    ds = None
+
+    ds = gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE)
+    assert ds.GetRelationshipNames() == [
+        "custom_type",
+        "test_relation_a_test_relation_b",
+    ]
+    assert ds.GetRelationship("custom_type") is not None
+    rel = ds.GetRelationship("test_relation_a_test_relation_b")
+    assert rel is not None
+    assert rel.GetName() == "test_relation_a_test_relation_b"
+    assert rel.GetLeftTableName() == "test_relation_a"
+    assert rel.GetRightTableName() == "test_relation_b"
+    assert rel.GetCardinality() == gdal.GRC_ONE_TO_MANY
+    assert rel.GetType() == gdal.GRT_ASSOCIATION
+    assert rel.GetLeftTableFields() == ["artistid"]
+    assert rel.GetRightTableFields() == ["trackartist"]
+    assert rel.GetRelatedTableType() == "features"
+
     ds = None
 
 

autotest/ogr/ogr_ods.py

@@ -59,6 +59,8 @@ def ogr_ods_check(ds):
 
     assert lyr.TestCapability("foo") == 0
 
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
+
     lyr = ds.GetLayer(6)
     assert lyr.GetName() == "Feuille7", "bad layer name"
 
@@ -363,6 +365,7 @@ def test_ogr_ods_8():
     drv = ogr.GetDriverByName("ODS")
     ds = drv.CreateDataSource("/vsimem/ogr_ods_8.ods")
     lyr = ds.CreateLayer("foo")
+    assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
     lyr.CreateField(ogr.FieldDefn("Field1", ogr.OFTInteger64))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetField(0, 1)