Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release/3.8] [openfilegdb] Correctly use "features" as related table type #9270

Merged
merged 1 commit into from
Feb 21, 2024
Merged

[Backport release/3.8] [openfilegdb] Correctly use "features" as related table type #9270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions autotest/ogr/ogr_fgdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2871,7 +2871,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetRightMappingTableFields() is None
assert rel.GetForwardPathLabel() == "my forward path label"
assert rel.GetBackwardPathLabel() == "my backward path label"
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_one_to_many")
assert rel is not None
Expand All @@ -2883,7 +2883,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetType() == gdal.GRT_ASSOCIATION
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_many_to_many")
assert rel is not None
Expand All @@ -2897,7 +2897,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetLeftMappingTableFields() == ["origin_foreign_key"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRightMappingTableFields() == ["destination_foreign_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_one")
assert rel is not None
Expand All @@ -2909,7 +2909,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetType() == gdal.GRT_COMPOSITE
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_many")
assert rel is not None
Expand All @@ -2921,7 +2921,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetType() == gdal.GRT_COMPOSITE
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_many_to_many")
assert rel is not None
Expand All @@ -2935,7 +2935,7 @@ def test_ogr_filegdb_read_relationships(openfilegdb_drv, fgdb_drv):
assert rel.GetLeftMappingTableFields() == ["origin_foreign_key"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRightMappingTableFields() == ["dest_foreign_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("points__ATTACHREL")
assert rel is not None
Expand Down
12 changes: 6 additions & 6 deletions autotest/ogr/ogr_openfilegdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2386,7 +2386,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetRightMappingTableFields() is None
assert rel.GetForwardPathLabel() == "my forward path label"
assert rel.GetBackwardPathLabel() == "my backward path label"
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_one_to_many")
assert rel is not None
Expand All @@ -2398,7 +2398,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetType() == gdal.GRT_ASSOCIATION
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_many_to_many")
assert rel is not None
Expand All @@ -2412,7 +2412,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetLeftMappingTableFields() == ["origin_foreign_key"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRightMappingTableFields() == ["destination_foreign_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_one")
assert rel is not None
Expand All @@ -2424,7 +2424,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetType() == gdal.GRT_COMPOSITE
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_many")
assert rel is not None
Expand All @@ -2436,7 +2436,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetType() == gdal.GRT_COMPOSITE
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_many_to_many")
assert rel is not None
Expand All @@ -2450,7 +2450,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetLeftMappingTableFields() == ["origin_foreign_key"]
assert rel.GetRightTableFields() == ["parent_pk"]
assert rel.GetRightMappingTableFields() == ["dest_foreign_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("points__ATTACHREL")
assert rel is not None
Expand Down
4 changes: 2 additions & 2 deletions autotest/ogr/ogr_openfilegdb_write.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2833,7 +2833,7 @@ def test_ogr_openfilegdb_write_relationships():
assert retrieved_rel.GetRightTableFields() == ["dest_pkey"]
assert retrieved_rel.GetForwardPathLabel() == "fwd label"
assert retrieved_rel.GetBackwardPathLabel() == "backward label"
assert retrieved_rel.GetRelatedTableType() == "feature"
assert retrieved_rel.GetRelatedTableType() == "features"

items_lyr = ds.GetLayerByName("GDB_Items")
f = items_lyr.GetFeature(8)
Expand Down Expand Up @@ -3182,7 +3182,7 @@ def test_ogr_openfilegdb_write_relationships():
assert retrieved_rel.GetRightTableFields() == ["dest_pkey"]
assert retrieved_rel.GetForwardPathLabel() == "my new fwd label"
assert retrieved_rel.GetBackwardPathLabel() == "my new backward label"
assert retrieved_rel.GetRelatedTableType() == "feature"
assert retrieved_rel.GetRelatedTableType() == "features"

# change relationship tables
lyr = ds.CreateLayer("new_origin_table", geom_type=ogr.wkbNone)
Expand Down
10 changes: 5 additions & 5 deletions autotest/ogr/ogr_pgeo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetRightMappingTableFields() is None
assert rel.GetForwardPathLabel() == "forward label"
assert rel.GetBackwardPathLabel() == "backward label"
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_one_to_many")
assert rel is not None
Expand All @@ -922,7 +922,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetType() == gdal.GRT_ASSOCIATION
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["primary_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("simple_many_to_many")
assert rel is not None
Expand All @@ -936,7 +936,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetLeftMappingTableFields() == ["rel_pk"]
assert rel.GetRightTableFields() == ["primary_key"]
assert rel.GetRightMappingTableFields() == ["rel_primary_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_one")
assert rel is not None
Expand All @@ -948,7 +948,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetType() == gdal.GRT_COMPOSITE
assert rel.GetLeftTableFields() == ["pk"]
assert rel.GetRightTableFields() == ["primary_key"]
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("composite_one_to_many")
assert rel is not None
Expand All @@ -962,7 +962,7 @@ def test_ogr_openfilegdb_read_relationships():
assert rel.GetLeftMappingTableFields() == None
assert rel.GetRightTableFields() == ["primary_key"]
assert rel.GetRightMappingTableFields() == None
assert rel.GetRelatedTableType() == "feature"
assert rel.GetRelatedTableType() == "features"

rel = ds.GetRelationship("points__ATTACHREL")
assert rel is not None
Expand Down
4 changes: 2 additions & 2 deletions autotest/utilities/test_ogrinfo_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ def test_ogrinfo_lib_relationships():
ret = gdal.VectorInfo(ds)
expected = """Relationship: composite_many_to_many
Type: Composite
Related table type: feature
Related table type: features
Cardinality: ManyToMany
Left table name: table6
Right table name: table7
Expand Down Expand Up @@ -667,7 +667,7 @@ def test_ogrinfo_lib_json_relationships():
# print(ret["relationships"]["composite_many_to_many"])
assert ret["relationships"]["composite_many_to_many"] == {
"type": "Composite",
"related_table_type": "feature",
"related_table_type": "features",
"cardinality": "ManyToMany",
"left_table_name": "table6",
"right_table_name": "table7",
Expand Down
2 changes: 1 addition & 1 deletion ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ ParseXMLRelationshipDef(const std::string &domainDef)
}
else
{
poRelationship->SetRelatedTableType("feature");
poRelationship->SetRelatedTableType("features");
}
return poRelationship;
}
Expand Down
Loading