[ogr] Automatically set QGIS field alias if OGR is able to read one

from the underlying datasource Supported on GDAL >= 3.2, for the file geodatabase driver only
qgis · Jul 22, 2020 · 05be43d · 05be43d
1 parent dac3f00
commit 05be43d
Show file tree

Hide file tree

Showing 62 changed files with 22 additions and 0 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -1246,6 +1246,14 @@ void QgsOgrProvider::loadFields()
                           width, prec, QString(), varSubType
                         );
 
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,2,0)
+    const QString alias = textEncoding()->toUnicode( OGR_Fld_GetAlternativeNameRef( fldDef ) );
+    if ( !alias.isEmpty() )
+    {
+      newField.setAlias( alias );
+    }
+#endif
+
     // check if field is nullable
     bool nullable = OGR_Fld_IsNullable( fldDef );
     if ( !nullable )

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -730,6 +730,20 @@ def testMixOfFilterExpressionAndSubsetStringWhenFilterExpressionCompilationFails
 
         self.assertCountEqual([f.attributes() for f in vl.getFeatures(request)], [['rectangle', '1']])
 
+    @unittest.skip(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(3, 2, 0))
+    def testFieldAliases(self):
+        """
+        Test that field aliases are taken from OGR where available (requires GDAL 3.2 or later)
+        """
+        datasource = os.path.join(unitTestDataPath(), 'field_alias.gdb')
+        vl = QgsVectorLayer(datasource, 'test', 'ogr')
+        self.assertTrue(vl.isValid())
+
+        fields = vl.fields()
+        self.assertEqual([f.name() for f in fields], ['OBJECTID', 'text', 'short_int', 'long_int', 'float', 'double', 'date', 'blob', 'guid', 'raster', 'SHAPE_Length', 'SHAPE_Area'])
+        self.assertEqual([f.alias() for f in fields],
+                         ['', 'My Text Field', 'My Short Int Field', 'My Long Int Field', 'My Float Field', 'My Double Field', 'My Date Field', 'My Blob Field', 'My GUID field', 'My Raster Field', '', ''])
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/testdata/field_alias.gdb/a00000001.TablesByName.atx b/tests/testdata/field_alias.gdb/a00000001.TablesByName.atx
diff --git a/tests/testdata/field_alias.gdb/a00000001.gdbindexes b/tests/testdata/field_alias.gdb/a00000001.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000001.gdbtable b/tests/testdata/field_alias.gdb/a00000001.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000001.gdbtablx b/tests/testdata/field_alias.gdb/a00000001.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000002.gdbtable b/tests/testdata/field_alias.gdb/a00000002.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000002.gdbtablx b/tests/testdata/field_alias.gdb/a00000002.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000003.gdbindexes b/tests/testdata/field_alias.gdb/a00000003.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000003.gdbtable b/tests/testdata/field_alias.gdb/a00000003.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000003.gdbtablx b/tests/testdata/field_alias.gdb/a00000003.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000004.CatItemsByPhysicalName.atx b/tests/testdata/field_alias.gdb/a00000004.CatItemsByPhysicalName.atx
diff --git a/tests/testdata/field_alias.gdb/a00000004.CatItemsByType.atx b/tests/testdata/field_alias.gdb/a00000004.CatItemsByType.atx
diff --git a/tests/testdata/field_alias.gdb/a00000004.FDO_UUID.atx b/tests/testdata/field_alias.gdb/a00000004.FDO_UUID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000004.gdbindexes b/tests/testdata/field_alias.gdb/a00000004.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000004.gdbtable b/tests/testdata/field_alias.gdb/a00000004.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000004.gdbtablx b/tests/testdata/field_alias.gdb/a00000004.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000004.spx b/tests/testdata/field_alias.gdb/a00000004.spx
diff --git a/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByName.atx b/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByName.atx
diff --git a/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByParentTypeID.atx b/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByParentTypeID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByUUID.atx b/tests/testdata/field_alias.gdb/a00000005.CatItemTypesByUUID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000005.gdbindexes b/tests/testdata/field_alias.gdb/a00000005.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000005.gdbtable b/tests/testdata/field_alias.gdb/a00000005.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000005.gdbtablx b/tests/testdata/field_alias.gdb/a00000005.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000006.CatRelsByDestinationID.atx b/tests/testdata/field_alias.gdb/a00000006.CatRelsByDestinationID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000006.CatRelsByOriginID.atx b/tests/testdata/field_alias.gdb/a00000006.CatRelsByOriginID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000006.CatRelsByType.atx b/tests/testdata/field_alias.gdb/a00000006.CatRelsByType.atx
diff --git a/tests/testdata/field_alias.gdb/a00000006.FDO_UUID.atx b/tests/testdata/field_alias.gdb/a00000006.FDO_UUID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000006.gdbindexes b/tests/testdata/field_alias.gdb/a00000006.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000006.gdbtable b/tests/testdata/field_alias.gdb/a00000006.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000006.gdbtablx b/tests/testdata/field_alias.gdb/a00000006.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByBackwardLabel.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByBackwardLabel.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByDestItemTypeID.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByDestItemTypeID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByForwardLabel.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByForwardLabel.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByName.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByName.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByUUID.atx b/tests/testdata/field_alias.gdb/a00000007.CatRelTypesByUUID.atx
diff --git a/tests/testdata/field_alias.gdb/a00000007.gdbindexes b/tests/testdata/field_alias.gdb/a00000007.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000007.gdbtable b/tests/testdata/field_alias.gdb/a00000007.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000007.gdbtablx b/tests/testdata/field_alias.gdb/a00000007.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000009.gdbindexes b/tests/testdata/field_alias.gdb/a00000009.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a00000009.gdbtable b/tests/testdata/field_alias.gdb/a00000009.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a00000009.gdbtablx b/tests/testdata/field_alias.gdb/a00000009.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a00000009.spx b/tests/testdata/field_alias.gdb/a00000009.spx
diff --git a/tests/testdata/field_alias.gdb/a0000000a.gdbindexes b/tests/testdata/field_alias.gdb/a0000000a.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a0000000a.gdbtable b/tests/testdata/field_alias.gdb/a0000000a.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a0000000a.gdbtablx b/tests/testdata/field_alias.gdb/a0000000a.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a0000000b.gdbindexes b/tests/testdata/field_alias.gdb/a0000000b.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a0000000b.gdbtable b/tests/testdata/field_alias.gdb/a0000000b.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a0000000b.gdbtablx b/tests/testdata/field_alias.gdb/a0000000b.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a0000000c.band_index.atx b/tests/testdata/field_alias.gdb/a0000000c.band_index.atx
diff --git a/tests/testdata/field_alias.gdb/a0000000c.blk_key_index.atx b/tests/testdata/field_alias.gdb/a0000000c.blk_key_index.atx
diff --git a/tests/testdata/field_alias.gdb/a0000000c.col_index.atx b/tests/testdata/field_alias.gdb/a0000000c.col_index.atx
diff --git a/tests/testdata/field_alias.gdb/a0000000c.gdbindexes b/tests/testdata/field_alias.gdb/a0000000c.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a0000000c.gdbtable b/tests/testdata/field_alias.gdb/a0000000c.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a0000000c.gdbtablx b/tests/testdata/field_alias.gdb/a0000000c.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/a0000000c.row_index.atx b/tests/testdata/field_alias.gdb/a0000000c.row_index.atx
diff --git a/tests/testdata/field_alias.gdb/a0000000d.gdbindexes b/tests/testdata/field_alias.gdb/a0000000d.gdbindexes
diff --git a/tests/testdata/field_alias.gdb/a0000000d.gdbtable b/tests/testdata/field_alias.gdb/a0000000d.gdbtable
diff --git a/tests/testdata/field_alias.gdb/a0000000d.gdbtablx b/tests/testdata/field_alias.gdb/a0000000d.gdbtablx
diff --git a/tests/testdata/field_alias.gdb/gdb b/tests/testdata/field_alias.gdb/gdb
diff --git a/tests/testdata/field_alias.gdb/timestamps b/tests/testdata/field_alias.gdb/timestamps