qgis · Mar 1, 2023
diff --git a/‎src/core/providers/ogr/qgsogrprovider.cpp
Lines changed: 13 additions & 0 deletions b/‎src/core/providers/ogr/qgsogrprovider.cpp
Lines changed: 13 additions & 0 deletions
diff --git a/‎tests/src/python/test_provider_ogr.py
Lines changed: 14 additions & 0 deletions b/‎tests/src/python/test_provider_ogr.py
Lines changed: 14 additions & 0 deletions
diff --git a/‎tests/testdata/domains.gdb/a00000001.gdbtable
347 Bytes b/‎tests/testdata/domains.gdb/a00000001.gdbtable
347 Bytes
diff --git a/‎tests/testdata/domains.gdb/a00000001.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000001.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000002.gdbtable
2.04 KB b/‎tests/testdata/domains.gdb/a00000002.gdbtable
2.04 KB
diff --git a/‎tests/testdata/domains.gdb/a00000002.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000002.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000003.gdbtable
557 Bytes b/‎tests/testdata/domains.gdb/a00000003.gdbtable
557 Bytes
diff --git a/‎tests/testdata/domains.gdb/a00000003.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000003.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000004.freelist
4.34 KB b/‎tests/testdata/domains.gdb/a00000004.freelist
4.34 KB
diff --git a/‎tests/testdata/domains.gdb/a00000004.gdbtable
11.8 KB b/‎tests/testdata/domains.gdb/a00000004.gdbtable
11.8 KB
diff --git a/‎tests/testdata/domains.gdb/a00000004.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000004.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000005.gdbtable
1.7 KB b/‎tests/testdata/domains.gdb/a00000005.gdbtable
1.7 KB
diff --git a/‎tests/testdata/domains.gdb/a00000005.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000005.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000006.gdbtable
514 Bytes b/‎tests/testdata/domains.gdb/a00000006.gdbtable
514 Bytes
diff --git a/‎tests/testdata/domains.gdb/a00000006.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000006.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000007.gdbtable
2.24 KB b/‎tests/testdata/domains.gdb/a00000007.gdbtable
2.24 KB
diff --git a/‎tests/testdata/domains.gdb/a00000007.gdbtablx
4.03 KB b/‎tests/testdata/domains.gdb/a00000007.gdbtablx
4.03 KB
diff --git a/‎tests/testdata/domains.gdb/a00000009.gdbindexes
66 Bytes b/‎tests/testdata/domains.gdb/a00000009.gdbindexes
66 Bytes
diff --git a/‎tests/testdata/domains.gdb/a00000009.gdbtable
512 Bytes b/‎tests/testdata/domains.gdb/a00000009.gdbtable
512 Bytes
diff --git a/‎tests/testdata/domains.gdb/a00000009.gdbtablx
32 Bytes b/‎tests/testdata/domains.gdb/a00000009.gdbtablx
32 Bytes
diff --git a/‎tests/testdata/domains.gdb/gdb
8 Bytes b/‎tests/testdata/domains.gdb/gdb
8 Bytes
diff --git a/‎tests/testdata/domains.gdb/timestamps
Lines changed: 1 addition & 0 deletions b/‎tests/testdata/domains.gdb/timestamps
Lines changed: 1 addition & 0 deletions
@@ -857,6 +857,19 @@ void QgsOgrProvider::loadFields()
       // dataset retains ownership of domain!
       if ( OGRFieldDomainH domain = GDALDatasetGetFieldDomain( ds, domainName ) )
       {
+        switch ( OGR_FldDomain_GetSplitPolicy( domain ) )
+        {
+          case OFDSP_DEFAULT_VALUE:
+            newField.setSplitPolicy( Qgis::FieldDomainSplitPolicy::DefaultValue );
+            break;
+          case OFDSP_DUPLICATE:
+            newField.setSplitPolicy( Qgis::FieldDomainSplitPolicy::Duplicate );
+            break;
+          case OFDSP_GEOMETRY_RATIO:
+            newField.setSplitPolicy( Qgis::FieldDomainSplitPolicy::GeometryRatio );
+            break;
+        }
+
         switch ( OGR_FldDomain_GetDomainType( domain ) )
         {
           case OFDT_CODED:
 
@@ -1256,12 +1256,26 @@ def testFieldDomainNames(self):
         self.assertEqual(fields.field('with_range_domain_int').constraints().domainName(), 'range_domain_int')
         self.assertEqual(fields.field('with_glob_domain').constraints().domainName(), 'glob_domain')
 
+        self.assertEqual(fields.field('with_range_domain_int').splitPolicy(), Qgis.FieldDomainSplitPolicy.DefaultValue)
+        self.assertEqual(fields.field('with_glob_domain').splitPolicy(), Qgis.FieldDomainSplitPolicy.DefaultValue)
+
         datasource = os.path.join(unitTestDataPath(), 'gps_timestamp.gpkg')
         vl = QgsVectorLayer(datasource, 'test', 'ogr')
         self.assertTrue(vl.isValid())
         fields = vl.fields()
         self.assertFalse(fields.field('stringf').constraints().domainName())
 
+        datasource = os.path.join(unitTestDataPath(), 'domains.gdb|layername=test')
+        vl = QgsVectorLayer(datasource, 'test', 'ogr')
+        self.assertTrue(vl.isValid())
+        fields = vl.fields()
+        self.assertEqual(fields.field('default_value').splitPolicy(),
+                         Qgis.FieldDomainSplitPolicy.DefaultValue)
+        self.assertEqual(fields.field('duplicate').splitPolicy(),
+                         Qgis.FieldDomainSplitPolicy.Duplicate)
+        self.assertEqual(fields.field('ratio').splitPolicy(),
+                         Qgis.FieldDomainSplitPolicy.GeometryRatio)
+
     def testGdbLayerMetadata(self):
         """
         Test that we translate GDB metadata to QGIS layer metadata on loading a GDB source
 
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������