modified tests for join order variation in 1.4 vs 2.0

Author: kiraksi

noxfile.py

@@ -213,6 +213,8 @@ def default(session, install_extras=True):
         install_target = "."
     session.install("-e", install_target, "-c", constraints_path)
 
+    session.run("python", "-m", "pip", "freeze")
+
     # Run py.test against the unit tests.
     session.run(
         "py.test",
@@ -550,6 +552,7 @@ def prerelease_deps(session):
         "requests",
     ]
     session.install(*other_deps)
+    session.run("python", "-m", "pip", "freeze")
 
     # Print out prerelease package versions
     session.run(

sqlalchemy_bigquery/base.py

@@ -275,8 +275,7 @@ def _known_tables(self):
         asfrom_froms = self.stack[-1].get("asfrom_froms", [])
         for from_ in asfrom_froms:
             if isinstance(from_, Table):
-                if from_.name not in known_tables:
-                    known_tables.add(from_.name)
+                known_tables.add(from_.name)
 
         return known_tables
 

tests/unit/conftest.py

@@ -40,7 +40,14 @@
     sqlalchemy_version >= packaging.version.parse("1.4"),
     reason="requires sqlalchemy 1.3 or lower",
 )
-
+sqlalchemy_before_2_0 = pytest.mark.skipif(
+    sqlalchemy_version >= packaging.version.parse("2.0"),
+    reason="requires sqlalchemy 1.3 or lower",
+)
+sqlalchemy_2_0_or_higher = pytest.mark.skipif(
+    sqlalchemy_version < packaging.version.parse("2.0"),
+    reason="requires sqlalchemy 1.4 or higher",
+)
 
 @pytest.fixture()
 def faux_conn():

tests/unit/test_compiler.py

@@ -21,7 +21,12 @@
 import sqlalchemy.exc
 
 from .conftest import setup_table
-from .conftest import sqlalchemy_1_4_or_higher, sqlalchemy_before_1_4
+from .conftest import (
+    sqlalchemy_1_4_or_higher,
+    sqlalchemy_before_1_4,
+    sqlalchemy_2_0_or_higher,
+    sqlalchemy_before_2_0,
+)
 
 
 def test_constraints_are_ignored(faux_conn, metadata):
@@ -142,35 +147,36 @@ def prepare_implicit_join_base_query(
     return q
 
 
-@sqlalchemy_before_1_4
-def test_no_implicit_join_asterix_for_inner_unnest_before_1_4(faux_conn, metadata):
+@sqlalchemy_before_2_0
+def test_no_implicit_join_asterix_for_inner_unnest_before_2_0(faux_conn, metadata):
     # See: https://github.com/googleapis/python-bigquery-sqlalchemy/issues/368
-    q = prepare_implicit_join_base_query(faux_conn, metadata, True, True)
+    q = prepare_implicit_join_base_query(faux_conn, metadata, True, False)
     expected_initial_sql = (
         "SELECT `table1`.`foo`, `table2`.`bar` \n"
         "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`"
     )
     found_initial_sql = q.compile(faux_conn).string
     assert found_initial_sql == expected_initial_sql
 
-    q = sqlalchemy.select(["*"]).select_from(q)
+    q = q.subquery()
+    q = sqlalchemy.select("*").select_from(q)
 
     expected_outer_sql = (
         "SELECT * \n"
         "FROM (SELECT `table1`.`foo` AS `foo`, `table2`.`bar` AS `bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`)"
+        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`) AS `anon_1`"
     )
     found_outer_sql = q.compile(faux_conn).string
     assert found_outer_sql == expected_outer_sql
 
 
-@sqlalchemy_1_4_or_higher
+@sqlalchemy_2_0_or_higher
 def test_no_implicit_join_asterix_for_inner_unnest(faux_conn, metadata):
     # See: https://github.com/googleapis/python-bigquery-sqlalchemy/issues/368
     q = prepare_implicit_join_base_query(faux_conn, metadata, True, False)
     expected_initial_sql = (
         "SELECT `table1`.`foo`, `table2`.`bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`"
+        "FROM unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`, `table2`"
     )
     found_initial_sql = q.compile(faux_conn).string
     assert found_initial_sql == expected_initial_sql
@@ -181,41 +187,42 @@ def test_no_implicit_join_asterix_for_inner_unnest(faux_conn, metadata):
     expected_outer_sql = (
         "SELECT * \n"
         "FROM (SELECT `table1`.`foo` AS `foo`, `table2`.`bar` AS `bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`) AS `anon_1`"
+        "FROM unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`, `table2`) AS `anon_1`"
     )
     found_outer_sql = q.compile(faux_conn).string
     assert found_outer_sql == expected_outer_sql
 
 
-@sqlalchemy_before_1_4
+@sqlalchemy_before_2_0
 def test_no_implicit_join_for_inner_unnest_before_1_4(faux_conn, metadata):
     # See: https://github.com/googleapis/python-bigquery-sqlalchemy/issues/368
-    q = prepare_implicit_join_base_query(faux_conn, metadata, True, True)
+    q = prepare_implicit_join_base_query(faux_conn, metadata, True, False)
     expected_initial_sql = (
         "SELECT `table1`.`foo`, `table2`.`bar` \n"
         "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`"
     )
     found_initial_sql = q.compile(faux_conn).string
     assert found_initial_sql == expected_initial_sql
 
-    q = sqlalchemy.select([q.c.foo]).select_from(q)
+    q = q.subquery()
+    q = sqlalchemy.select(q.c.foo).select_from(q)
 
     expected_outer_sql = (
-        "SELECT `foo` \n"
+        "SELECT `anon_1`.`foo` \n"
         "FROM (SELECT `table1`.`foo` AS `foo`, `table2`.`bar` AS `bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`)"
+        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`) AS `anon_1`"
     )
     found_outer_sql = q.compile(faux_conn).string
     assert found_outer_sql == expected_outer_sql
 
 
-@sqlalchemy_1_4_or_higher
+@sqlalchemy_2_0_or_higher
 def test_no_implicit_join_for_inner_unnest(faux_conn, metadata):
     # See: https://github.com/googleapis/python-bigquery-sqlalchemy/issues/368
     q = prepare_implicit_join_base_query(faux_conn, metadata, True, False)
     expected_initial_sql = (
         "SELECT `table1`.`foo`, `table2`.`bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`"
+        "FROM unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`, `table2`"
     )
     found_initial_sql = q.compile(faux_conn).string
     assert found_initial_sql == expected_initial_sql
@@ -226,7 +233,7 @@ def test_no_implicit_join_for_inner_unnest(faux_conn, metadata):
     expected_outer_sql = (
         "SELECT `anon_1`.`foo` \n"
         "FROM (SELECT `table1`.`foo` AS `foo`, `table2`.`bar` AS `bar` \n"
-        "FROM `table2`, unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`) AS `anon_1`"
+        "FROM unnest(`table2`.`foos`) AS `unnested_foos` JOIN `table1` ON `table1`.`foo` = `unnested_foos`, `table2`) AS `anon_1`"
     )
     found_outer_sql = q.compile(faux_conn).string
     assert found_outer_sql == expected_outer_sql