]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Repair change of "future_select" caught in merge conflict
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 8 Jul 2020 19:12:30 +0000 (15:12 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 8 Jul 2020 19:44:39 +0000 (15:44 -0400)
commit54b0cebc2b22475e4ae153d7e84ecb953797f4c5
treeef19c5c9087ca9564455b27e4448d447cc8d8b14
parenta438952d60d50748c22c51fd64317f523b735865
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
test/orm/test_update_delete.py