From 6738a73f635387b8326f546313cdfd12cf9ef5ab Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 29 Oct 2025 13:37:43 +0900 Subject: [PATCH] fix tests --- test/orm/inheritance/test_basic.py | 15 +++++------- test/orm/test_defaults.py | 6 ++--- test/orm/test_unitofworkv2.py | 37 ++++++++++++------------------ test/orm/test_versioning.py | 5 ---- 4 files changed, 23 insertions(+), 40 deletions(-) diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py index 93cf55da30..f84807fa92 100644 --- a/test/orm/inheritance/test_basic.py +++ b/test/orm/inheritance/test_basic.py @@ -1706,8 +1706,7 @@ class PassiveDeletesTest(fixtures.MappedTest): s.flush() asserter.assert_( CompiledSQL( - "SELECT a.id AS a_id, a.type AS a_type " - "FROM a WHERE a.id = :pk_1", + "SELECT a.id, a.type FROM a WHERE a.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]), @@ -1748,8 +1747,7 @@ class PassiveDeletesTest(fixtures.MappedTest): s.flush() asserter.assert_( CompiledSQL( - "SELECT a.id AS a_id, a.type AS a_type " - "FROM a WHERE a.id = :pk_1", + "SELECT a.id, a.type FROM a WHERE a.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]), @@ -1786,8 +1784,7 @@ class PassiveDeletesTest(fixtures.MappedTest): s.flush() asserter.assert_( CompiledSQL( - "SELECT a.id AS a_id, a.type AS a_type " - "FROM a WHERE a.id = :pk_1", + "SELECT a.id, a.type FROM a WHERE a.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]), @@ -3220,9 +3217,9 @@ class OptimizedLoadTest(fixtures.MappedTest): bool(eager_defaults), [ CompiledSQL( - "SELECT base.counter AS base_counter, " - "sub.subcounter AS sub_subcounter, " - "sub.subcounter2 AS sub_subcounter2 " + "SELECT base.counter, " + "sub.subcounter, " + "sub.subcounter2 " "FROM base JOIN sub ON base.id = sub.id " "WHERE base.id = :pk_1", lambda ctx: {"pk_1": s1.id}, diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py index 6cd1bfa200..0b0ad90943 100644 --- a/test/orm/test_defaults.py +++ b/test/orm/test_defaults.py @@ -388,14 +388,12 @@ class ComputedDefaultsOnUpdateTest(fixtures.MappedTest): enable_returning=False, ), CompiledSQL( - "SELECT test.bar AS test_bar FROM test " - "WHERE test.id = :pk_1", + "SELECT test.bar FROM test WHERE test.id = :pk_1", [{"pk_1": 1}], enable_returning=False, ), CompiledSQL( - "SELECT test.bar AS test_bar FROM test " - "WHERE test.id = :pk_1", + "SELECT test.bar FROM test WHERE test.id = :pk_1", [{"pk_1": 2}], enable_returning=False, ), diff --git a/test/orm/test_unitofworkv2.py b/test/orm/test_unitofworkv2.py index 29240cfe6e..af6f0c2ce7 100644 --- a/test/orm/test_unitofworkv2.py +++ b/test/orm/test_unitofworkv2.py @@ -848,7 +848,7 @@ class RaiseLoadIgnoredTest( sess.flush, # for the flush process, lazy="raise" is ignored CompiledSQL( - "SELECT b.id, b.a_id FROM b " "WHERE :param_1 = b.a_id", + "SELECT b.id, b.a_id FROM b WHERE :param_1 = b.a_id", [{"param_1": 1}], ), CompiledSQL( @@ -2496,14 +2496,12 @@ class EagerDefaultsTest(fixtures.MappedTest): enable_returning=False, ), CompiledSQL( - "SELECT test.foo AS test_foo FROM test " - "WHERE test.id = :pk_1", + "SELECT test.foo FROM test WHERE test.id = :pk_1", [{"pk_1": 1}], enable_returning=False, ), CompiledSQL( - "SELECT test.foo AS test_foo FROM test " - "WHERE test.id = :pk_1", + "SELECT test.foo FROM test WHERE test.id = :pk_1", [{"pk_1": 2}], enable_returning=False, ), @@ -2564,13 +2562,11 @@ class EagerDefaultsTest(fixtures.MappedTest): [{"id": 1}, {"id": 2}], ), CompiledSQL( - "SELECT test.foo AS test_foo FROM test " - "WHERE test.id = :pk_1", + "SELECT test.foo FROM test WHERE test.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL( - "SELECT test.foo AS test_foo FROM test " - "WHERE test.id = :pk_1", + "SELECT test.foo FROM test WHERE test.id = :pk_1", [{"pk_1": 2}], ), ], @@ -2630,12 +2626,12 @@ class EagerDefaultsTest(fixtures.MappedTest): ], ), CompiledSQL( - "SELECT test3.foo AS test3_foo " + "SELECT test3.foo " "FROM test3 WHERE test3.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL( - "SELECT test3.foo AS test3_foo " + "SELECT test3.foo " "FROM test3 WHERE test3.id = :pk_1", [{"pk_1": 2}], ), @@ -2721,12 +2717,12 @@ class EagerDefaultsTest(fixtures.MappedTest): enable_returning=False, ), CompiledSQL( - "SELECT test2.bar AS test2_bar FROM test2 " + "SELECT test2.bar FROM test2 " "WHERE test2.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL( - "SELECT test2.bar AS test2_bar FROM test2 " + "SELECT test2.bar FROM test2 " "WHERE test2.id = :pk_1", [{"pk_1": 3}], ), @@ -2820,13 +2816,13 @@ class EagerDefaultsTest(fixtures.MappedTest): enable_returning=False, ), CompiledSQL( - "SELECT test4.bar AS test4_bar FROM test4 " + "SELECT test4.bar FROM test4 " "WHERE test4.id = :pk_1", [{"pk_1": 1}], enable_returning=False, ), CompiledSQL( - "SELECT test4.bar AS test4_bar FROM test4 " + "SELECT test4.bar FROM test4 " "WHERE test4.id = :pk_1", [{"pk_1": 3}], enable_returning=False, @@ -2924,18 +2920,15 @@ class EagerDefaultsTest(fixtures.MappedTest): enable_returning=False, ), CompiledSQL( - "SELECT test2.bar AS test2_bar FROM test2 " - "WHERE test2.id = :pk_1", + "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1", [{"pk_1": 1}], ), CompiledSQL( - "SELECT test2.bar AS test2_bar FROM test2 " - "WHERE test2.id = :pk_1", + "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1", [{"pk_1": 3}], ), CompiledSQL( - "SELECT test2.bar AS test2_bar FROM test2 " - "WHERE test2.id = :pk_1", + "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1", [{"pk_1": 4}], ), ) @@ -3114,7 +3107,7 @@ class EagerDefaultsTest(fixtures.MappedTest): [{"id": 1, "bar": 5}], ), CompiledSQL( - "SELECT anon_1.foo AS anon_1_foo FROM " + "SELECT anon_1.foo FROM " "(SELECT test.id AS id, test.foo AS foo, " "test2.id AS id2, test2.bar AS bar FROM test " "JOIN test2 ON test.foo = test2.foo) AS anon_1 " diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py index 06fb1b2a5f..d239869a4e 100644 --- a/test/orm/test_versioning.py +++ b/test/orm/test_versioning.py @@ -1421,7 +1421,6 @@ class ServerVersioningTest(fixtures.MappedTest): statements.append( CompiledSQL( "SELECT version_table.version_id " - "AS version_table_version_id " "FROM version_table WHERE version_table.id = :pk_1", lambda ctx: [{"pk_1": 1}], ) @@ -1479,7 +1478,6 @@ class ServerVersioningTest(fixtures.MappedTest): ), CompiledSQL( "SELECT version_table.version_id " - "AS version_table_version_id " "FROM version_table WHERE version_table.id = :pk_1", lambda ctx: [{"pk_1": 1}], ), @@ -1630,19 +1628,16 @@ class ServerVersioningTest(fixtures.MappedTest): ), CompiledSQL( "SELECT version_table.version_id " - "AS version_table_version_id " "FROM version_table WHERE version_table.id = :pk_1", lambda ctx: [{"pk_1": 1}], ), CompiledSQL( "SELECT version_table.version_id " - "AS version_table_version_id " "FROM version_table WHERE version_table.id = :pk_1", lambda ctx: [{"pk_1": 2}], ), CompiledSQL( "SELECT version_table.version_id " - "AS version_table_version_id " "FROM version_table WHERE version_table.id = :pk_1", lambda ctx: [{"pk_1": 3}], ), -- 2.47.3