diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-07-08 15:12:30 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-07-08 15:44:39 -0400 |
| commit | 54b0cebc2b22475e4ae153d7e84ecb953797f4c5 (patch) | |
| tree | ef19c5c9087ca9564455b27e4448d447cc8d8b14 | |
| parent | a438952d60d50748c22c51fd64317f523b735865 (diff) | |
| download | sqlalchemy-54b0cebc2b22475e4ae153d7e84ecb953797f4c5.tar.gz | |
Repair change of "future_select" caught in merge conflict
the recent change to select() apparently seems to have
been merged with other statements in the test_update_delete
test that was still using the old term.
Change-Id: I6be3eb148249bfcf08aae19efcad89803c69c658
| -rw-r--r-- | test/orm/test_update_delete.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py index 11f22c142..e4396d919 100644 --- a/test/orm/test_update_delete.py +++ b/test/orm/test_update_delete.py @@ -487,10 +487,10 @@ class UpdateDeleteTest(fixtures.MappedTest): def test_update_future_lambda(self): User, users = self.classes.User, self.tables.users - sess = Session() + sess = Session(future=True) john, jack, jill, jane = ( - sess.execute(future_select(User).order_by(User.id)).scalars().all() + sess.execute(select(User).order_by(User.id)).scalars().all() ) sess.execute( @@ -504,7 +504,7 @@ class UpdateDeleteTest(fixtures.MappedTest): eq_([john.age, jack.age, jill.age, jane.age], [25, 37, 29, 27]) eq_( - sess.execute(future_select(User.age).order_by(User.id)).all(), + sess.execute(select(User.age).order_by(User.id)).all(), list(zip([25, 37, 29, 27])), ) @@ -623,10 +623,10 @@ class UpdateDeleteTest(fixtures.MappedTest): def test_update_fetch_returning_lambda(self): User = self.classes.User - sess = Session() + sess = Session(future=True) john, jack, jill, jane = ( - sess.execute(future_select(User).order_by(User.id)).scalars().all() + sess.execute(select(User).order_by(User.id)).scalars().all() ) with self.sql_execution_asserter() as asserter: @@ -711,10 +711,10 @@ class UpdateDeleteTest(fixtures.MappedTest): def test_delete_fetch_returning_lambda(self): User = self.classes.User - sess = Session() + sess = Session(future=True) john, jack, jill, jane = ( - sess.execute(future_select(User).order_by(User.id)).scalars().all() + sess.execute(select(User).order_by(User.id)).scalars().all() ) in_(john, sess) |
