Adding patch to avoid alias conflict issues in join conditions (#425)

Adds a patch to the SQLGlot generation of join conditions to ensure aliases are _always_ maintained, especially in ambiguous cases. Also adjusts several facets of the synthea/wdi testing infrastructure to ensure the tests run as expected.

Author: knassre-bodo

pydough/sqlglot/sqlglot_relational_visitor.py

@@ -436,9 +436,7 @@ def visit_join(self, join: Join) -> None:
             this=inputs[1],
             alias=TableAlias(this=alias_map.get(join.default_input_aliases[i], None)),
         )
-        cond: RelationalExpression = join.condition.accept_shuttle(
-            self._alias_remover
-        ).accept_shuttle(self._alias_modifier)
+        cond: RelationalExpression = join.condition.accept_shuttle(self._alias_modifier)
         cond_expr: SQLGlotExpression = self._expr_visitor.relational_to_sqlglot(cond)
         join_type: str = join.join_type.value
         if join_type == "SEMI" and join.cardinality.singular:

tests/conftest.py

@@ -601,7 +601,7 @@ def sqlite_custom_datasets_connection() -> DatabaseContext:
         "cd tests/gen_data",
         "rm -fv synthea.db",
         "rm -fv world_development_indicators.db",
-        "sqlite3 synthea.db < init_synthea.sql",
+        "sqlite3 synthea.db < init_synthea_sqlite.sql",
         "sqlite3 world_development_indicators.db < init_world_indicators_sqlite.sql",
     ]
     # Get the shell commands required to re-create all the db files

tests/gen_data/init_world_indicators_sqlite.sql

@@ -6,7 +6,7 @@
       {
         "name": "all_prevalences",
         "type": "simple table",
-        "table path": "main.all_prevalences",
+        "table path": "synthea.all_prevalences",
         "unique properties": [
           "ITEM"
         ],
@@ -92,7 +92,7 @@
       {
         "name": "allergies",
         "type": "simple table",
-        "table path": "main.allergies",
+        "table path": "synthea.allergies",
         "unique properties": [
           "PATIENT",
           "ENCOUNTER",
@@ -182,7 +182,7 @@
       {
         "name": "careplans",
         "type": "simple table",
-        "table path": "main.careplans",
+        "table path": "synthea.careplans",
         "unique properties": [
           [
             "ID",
@@ -321,7 +321,7 @@
       {
         "name": "claims",
         "type": "simple table",
-        "table path": "main.claims",
+        "table path": "synthea.claims",
         "unique properties": [
           "ID"
         ],
@@ -420,7 +420,7 @@
       {
         "name": "conditions",
         "type": "simple table",
-        "table path": "main.conditions",
+        "table path": "synthea.conditions",
         "unique properties": [
           [
             "START",
@@ -517,7 +517,7 @@
       {
         "name": "encounters",
         "type": "simple table",
-        "table path": "main.encounters",
+        "table path": "synthea.encounters",
         "unique properties": [
           "ID"
         ],
@@ -620,7 +620,7 @@
       {
         "name": "immunizations",
         "type": "simple table",
-        "table path": "main.immunizations",
+        "table path": "synthea.immunizations",
         "unique properties": [
           "DATE",
           "PATIENT",
@@ -698,7 +698,7 @@
       {
         "name": "medications",
         "type": "simple table",
-        "table path": "main.medications",
+        "table path": "synthea.medications",
         "unique properties": [
           "START",
           "PATIENT",
@@ -817,7 +817,7 @@
       {
         "name": "observations",
         "type": "simple table",
-        "table path": "main.observations",
+        "table path": "synthea.observations",
         "unique properties": [
           [
             "DATE",
@@ -928,7 +928,7 @@
       {
         "name": "patients",
         "type": "simple table",
-        "table path": "main.patients",
+        "table path": "synthea.patients",
         "unique properties": [
           "patient"
         ],
@@ -1155,7 +1155,7 @@
       {
         "name": "procedures",
         "type": "simple table",
-        "table path": "main.procedures",
+        "table path": "synthea.procedures",
         "unique properties": [
           [
             "DATE",

tests/test_metadata/synthea_graph.json

@@ -6,7 +6,7 @@
       {
         "name": "Country",
         "type": "simple table",
-        "table path": "main.Country",
+        "table path": "wdi.Country",
         "unique properties": [
           "CountryCode"
         ],
@@ -421,7 +421,7 @@
       {
         "name": "CountryNotes",
         "type": "simple table",
-        "table path": "main.CountryNotes",
+        "table path": "wdi.CountryNotes",
         "unique properties": [
           "Countrycode",
           "Seriescode"
@@ -473,7 +473,7 @@
       {
         "name": "Footnotes",
         "type": "simple table",
-        "table path": "main.Footnotes",
+        "table path": "wdi.Footnotes",
         "unique properties": [
           "Countrycode",
           "Seriescode",
@@ -539,7 +539,7 @@
       {
         "name": "Indicators",
         "type": "simple table",
-        "table path": "main.Indicators",
+        "table path": "wdi.Indicators",
         "unique properties": [
           "CountryCode",
           "IndicatorCode",
@@ -631,7 +631,7 @@
       {
         "name": "Series",
         "type": "simple table",
-        "table path": "main.Series",
+        "table path": "wdi.Series",
         "unique properties": [
           "SeriesCode"
         ],
@@ -903,7 +903,7 @@
       {
         "name": "SeriesNotes",
         "type": "simple table",
-        "table path": "main.SeriesNotes",
+        "table path": "wdi.SeriesNotes",
         "unique properties": [
           "Seriescode",
           "Year"
@@ -966,7 +966,7 @@
             "CountryCode"
           ]
         },
-        "description": "Relationship between CountryNotes and Country",
+        "description": "The country that the country note belongs to.",
         "synonyms": []
       },
       {
@@ -976,7 +976,7 @@
         "original property": "Country",
         "singular": false,
         "always matches": true,
-        "description": "Relationship between  and ",
+        "description": "The notes for each country.",
         "synonyms": []
       },
       {
@@ -991,7 +991,7 @@
             "SeriesCode"
           ]
         },
-        "description": "Relationship between CountryNotes and Series",
+        "description": "The series for each country note.",
         "synonyms": []
       },
       {
@@ -1001,7 +1001,7 @@
         "original property": "Series",
         "singular": false,
         "always matches": true,
-        "description": "Relationship between  and ",
+        "description": "The country notes for each series.",
         "synonyms": []
       },
       {
@@ -1016,7 +1016,7 @@
             "CountryCode"
           ]
         },
-        "description": "Relationship between Footnotes and Country",
+        "description": "The country that the footnote belongs to.",
         "synonyms": []
       },
       {
@@ -1026,7 +1026,7 @@
         "original property": "Country",
         "singular": false,
         "always matches": true,
-        "description": "Relationship between  and ",
+        "description": "The footnotes for the country.",
         "synonyms": []
       },
       {
@@ -1041,7 +1041,7 @@
             "SeriesCode"
           ]
         },
-        "description": "Relationship between Footnotes and Series",
+        "description": "The Series that the footnote belongs to.",
         "synonyms": []
       },
       {
@@ -1050,8 +1050,8 @@
         "original parent": "Footnotes",
         "original property": "Series",
         "singular": false,
-        "always matches": true,
-        "description": "Relationship between  and ",
+        "always matches": false,
+        "description": "The footnotes of the series.",
         "synonyms": []
       },
       {
@@ -1066,7 +1066,7 @@
             "CountryCode"
           ]
         },
-        "description": "Relationship between Indicators and Country",
+        "description": "The country that the indicator belongs to.",
         "synonyms": []
       },
       {
@@ -1076,7 +1076,7 @@
         "original property": "Country",
         "singular": false,
         "always matches": true,
-        "description": "Relationship between  and ",
+        "description": "The indicators for the country.",
         "synonyms": []
       },
       {
@@ -1091,7 +1091,7 @@
             "SeriesCode"
           ]
         },
-        "description": "Relationship between SeriesNotes and Series",
+        "description": "The series that the series note belongs to.",
         "synonyms": []
       },
       {
@@ -1101,7 +1101,7 @@
         "original property": "Series",
         "singular": false,
         "always matches": true,
-        "description": "Relationship between  and ",
+        "description": "The series notes for the series.",
         "synonyms": []
       }
     ]