Merge pull request #131 from PDOK/fix-geom-col-valid

fix geometry column validation
PDOK · Nov 11, 2024 · 135a674 · 135a674
2 parents 5e88e63 + 55d6697
commit 135a674
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/geopackage_validator/validations/table_definitions_check.py b/geopackage_validator/validations/table_definitions_check.py
@@ -76,7 +76,7 @@ def compare_table_definitions(new_definition, old_definition, compare_columns=Tr
         old_table = old_tables[table_name]
         new_table = new_tables[table_name]
         old_geometry = old_table.get("geometry_column")
-        new_geometry = old_table.get("geometry_column")
+        new_geometry = new_table.get("geometry_column")
         if old_geometry != new_geometry:
             results.append(
                 f"{table_name} geometry_column changed from {old_geometry} to {new_geometry}"

diff --git a/tests/validations/test_table_definitions_check.py b/tests/validations/test_table_definitions_check.py
@@ -94,9 +94,12 @@ def test_table_definitions_check_incorrect_column_name():
         "tables": [
             {
                 "name": "test_allcorrect",
-                "geometry_column": "geometry",
+                "geometry_column": "geometry",  # geom -> 1 error
                 "columns": [
-                    {"name": "id", "type": "INTEGER"},  # name should be fid
+                    {
+                        "name": "id",
+                        "type": "INTEGER",
+                    },  # name should be fid -> 2 errors (1 missing and 1 extra)
                     {"name": "geom", "type": "POLYGON"},
                 ],
             }
@@ -111,7 +114,7 @@ def test_table_definitions_check_incorrect_column_name():
         None, table_definitions=table_definitions
     ).check_table_definitions(current_definitions)
 
-    assert len(diff) == 2
+    assert len(diff) == 3
 
 
 def test_table_definitions_check_table_changed():