diff options
Diffstat (limited to 'test/sql/test_selectable.py')
| -rw-r--r-- | test/sql/test_selectable.py | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index a467bb0a3..baa8d8961 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -269,15 +269,11 @@ class SelectableTest( eq_( s1.selected_columns.foo.proxy_set, - set( - [s1.selected_columns.foo, scalar_select, scalar_select.element] - ), + {s1.selected_columns.foo, scalar_select, scalar_select.element}, ) eq_( s2.selected_columns.foo.proxy_set, - set( - [s2.selected_columns.foo, scalar_select, scalar_select.element] - ), + {s2.selected_columns.foo, scalar_select, scalar_select.element}, ) assert ( @@ -295,11 +291,11 @@ class SelectableTest( eq_( s1.c.foo.proxy_set, - set([s1.c.foo, scalar_select, scalar_select.element]), + {s1.c.foo, scalar_select, scalar_select.element}, ) eq_( s2.c.foo.proxy_set, - set([s2.c.foo, scalar_select, scalar_select.element]), + {s2.c.foo, scalar_select, scalar_select.element}, ) assert s1.corresponding_column(scalar_select) is s1.c.foo @@ -616,7 +612,7 @@ class SelectableTest( s2c1 = s2._clone() s3c1 = s3._clone() - eq_(base._cloned_intersection([s1c1, s3c1], [s2c1, s1c2]), set([s1c1])) + eq_(base._cloned_intersection([s1c1, s3c1], [s2c1, s1c2]), {s1c1}) def test_cloned_difference(self): t1 = table("t1", column("x")) @@ -633,7 +629,7 @@ class SelectableTest( eq_( base._cloned_difference([s1c1, s2c1, s3c1], [s2c1, s1c2]), - set([s3c1]), + {s3c1}, ) def test_distance_on_aliases(self): @@ -1940,13 +1936,13 @@ class RefreshForNewColTest(fixtures.TestBase): q = Column("q", Integer) a.append_column(q) a._refresh_for_new_column(q) - eq_(a.foreign_keys, set([fk])) + eq_(a.foreign_keys, {fk}) fk2 = ForeignKey("g.id") p = Column("p", Integer, fk2) a.append_column(p) a._refresh_for_new_column(p) - eq_(a.foreign_keys, set([fk, fk2])) + eq_(a.foreign_keys, {fk, fk2}) def test_fk_join(self): m = MetaData() @@ -1960,13 +1956,13 @@ class RefreshForNewColTest(fixtures.TestBase): q = Column("q", Integer) b.append_column(q) j._refresh_for_new_column(q) - eq_(j.foreign_keys, set([fk])) + eq_(j.foreign_keys, {fk}) fk2 = ForeignKey("g.id") p = Column("p", Integer, fk2) b.append_column(p) j._refresh_for_new_column(p) - eq_(j.foreign_keys, set([fk, fk2])) + eq_(j.foreign_keys, {fk, fk2}) class AnonLabelTest(fixtures.TestBase): @@ -2641,10 +2637,10 @@ class ReduceTest(fixtures.TestBase, AssertsExecutionResults): ) s1 = select(t1, t2) s2 = s1.reduce_columns(only_synonyms=False) - eq_(set(s2.selected_columns), set([t1.c.x, t1.c.y, t2.c.q])) + eq_(set(s2.selected_columns), {t1.c.x, t1.c.y, t2.c.q}) s2 = s1.reduce_columns() - eq_(set(s2.selected_columns), set([t1.c.x, t1.c.y, t2.c.z, t2.c.q])) + eq_(set(s2.selected_columns), {t1.c.x, t1.c.y, t2.c.z, t2.c.q}) def test_reduce_only_synonym_fk(self): m = MetaData() @@ -2664,13 +2660,11 @@ class ReduceTest(fixtures.TestBase, AssertsExecutionResults): s1 = s1.reduce_columns(only_synonyms=True) eq_( set(s1.selected_columns), - set( - [ - s1.selected_columns.x, - s1.selected_columns.y, - s1.selected_columns.q, - ] - ), + { + s1.selected_columns.x, + s1.selected_columns.y, + s1.selected_columns.q, + }, ) def test_reduce_only_synonym_lineage(self): @@ -2688,7 +2682,7 @@ class ReduceTest(fixtures.TestBase, AssertsExecutionResults): s2 = select(t1, s1).where(t1.c.x == s1.c.x).where(s1.c.y == t1.c.z) eq_( set(s2.reduce_columns().selected_columns), - set([t1.c.x, t1.c.y, t1.c.z, s1.c.y, s1.c.z]), + {t1.c.x, t1.c.y, t1.c.z, s1.c.y, s1.c.z}, ) # reverse order, s1.c.x wins @@ -2696,7 +2690,7 @@ class ReduceTest(fixtures.TestBase, AssertsExecutionResults): s2 = select(s1, t1).where(t1.c.x == s1.c.x).where(s1.c.y == t1.c.z) eq_( set(s2.reduce_columns().selected_columns), - set([s1.c.x, t1.c.y, t1.c.z, s1.c.y, s1.c.z]), + {s1.c.x, t1.c.y, t1.c.z, s1.c.y, s1.c.z}, ) def test_reduce_aliased_join(self): @@ -2994,7 +2988,7 @@ class AnnotationsTest(fixtures.TestBase): for obj in [t, t.c.x, a, t.c.x > 1, (t.c.x > 1).label(None)]: annot = obj._annotate({}) - eq_(set([obj]), set([annot])) + eq_({obj}, {annot}) def test_clone_annotations_dont_hash(self): t = table("t", column("x")) @@ -3005,7 +2999,7 @@ class AnnotationsTest(fixtures.TestBase): for obj in [s, s2]: annot = obj._annotate({}) - ne_(set([obj]), set([annot])) + ne_({obj}, {annot}) def test_replacement_traverse_preserve(self): """test that replacement traverse that hits an unannotated column @@ -3802,11 +3796,11 @@ class ResultMapTest(fixtures.TestBase): def _mapping(self, stmt): compiled = stmt.compile() - return dict( - (elem, key) + return { + elem: key for key, elements in compiled._create_result_map().items() for elem in elements[1] - ) + } def test_select_label_alt_name(self): t = self._fixture() |