[OGR provider] Expose FileGeodatabase layer alias name as dataComment…

…() (fixes qgis#55900)
rouault · Jan 21, 2024 · 661342f · 661342f
1 parent 121aaa3
commit 661342f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -3239,6 +3239,12 @@ QgsCoordinateReferenceSystem QgsOgrProvider::crs() const
   return srs;
 }
 
+QString QgsOgrProvider::dataComment() const
+{
+  // Potentially set on File Geodatabase
+  return mOgrLayer->GetMetadataItem( QStringLiteral( "ALIAS_NAME" ) );
+}
+
 QSet<QVariant> QgsOgrProvider::uniqueValues( int index, int limit ) const
 {
   QSet<QVariant> uniqueValues;

diff --git a/src/core/providers/ogr/qgsogrprovider.h b/src/core/providers/ogr/qgsogrprovider.h
@@ -78,6 +78,8 @@ class QgsOgrProvider final: public QgsVectorDataProvider
 
     QgsCoordinateReferenceSystem crs() const override;
 
+    QString dataComment() const override;
+
     /**
      * Gets the number of sublayer in the OGR datasource.
      * layer_styles is not counted.

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -3497,6 +3497,27 @@ def testGeoJsonMapType(self):
         f = vl.getFeature(1)
         self.assertEqual(f.attributes()[0], {'style': {'color': 'yellow'}})
 
+    @unittest.skipIf(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(3, 8, 0), "GDAL 3.8 required")
+    def testDataCommentFileGeodatabase(self):
+
+        with tempfile.TemporaryDirectory() as temp_dir:
+            dest_file_name = os.path.join(temp_dir, 'testDataCommentFileGeodatabase.gdb')
+            ds = ogr.GetDriverByName("OpenFileGDB").CreateDataSource(dest_file_name)
+            ds.CreateLayer("test", geom_type=ogr.wkbPoint)
+            ds = None
+
+            vl = QgsVectorLayer(dest_file_name, 'vl')
+            self.assertEqual(vl.dataComment(), "")
+
+        with tempfile.TemporaryDirectory() as temp_dir:
+            dest_file_name = os.path.join(temp_dir, 'testDataCommentFileGeodatabase.gdb')
+            ds = ogr.GetDriverByName("OpenFileGDB").CreateDataSource(dest_file_name)
+            ds.CreateLayer("test", geom_type=ogr.wkbPoint, options=["LAYER_ALIAS=my_alias"])
+            ds = None
+
+            vl = QgsVectorLayer(dest_file_name, 'vl')
+            self.assertEqual(vl.dataComment(), "my_alias")
+
 
 if __name__ == '__main__':
     unittest.main()