From e68173bf7d296b2948abed06f79c7cbd0ab66b0d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 28 Dec 2022 12:04:07 -0500 Subject: ensure whereclause, returning copied as tuples Fixed issue in the internal SQL traversal for DML statements like :class:`_dml.Update` and :class:`_dml.Delete` which would cause among other potential issues, a specific issue using lambda statements with the ORM update/delete feature. Fixes: #9033 Change-Id: I76428049cb767ba302fbea89555114bf63ab8687 --- test/sql/test_external_traversal.py | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'test/sql') diff --git a/test/sql/test_external_traversal.py b/test/sql/test_external_traversal.py index 8940276e3..8ccbd8d20 100644 --- a/test/sql/test_external_traversal.py +++ b/test/sql/test_external_traversal.py @@ -2964,3 +2964,41 @@ class ValuesBaseTest(fixtures.TestBase, AssertsCompiledSQL): "UPDATE construct does not support multiple parameter sets.", stmt.compile, ) + + @testing.variation("stmt_type", ["update", "delete"]) + def test_whereclause_returning_adapted(self, stmt_type): + """test #9033""" + + if stmt_type.update: + stmt = ( + t1.update() + .where(t1.c.col1 == 10) + .values(col1=15) + .returning(t1.c.col1) + ) + elif stmt_type.delete: + stmt = t1.delete().where(t1.c.col1 == 10).returning(t1.c.col1) + else: + stmt_type.fail() + + stmt = visitors.replacement_traverse(stmt, {}, lambda elem: None) + + assert isinstance(stmt._where_criteria, tuple) + assert isinstance(stmt._returning, tuple) + + stmt = stmt.where(t1.c.col2 == 5).returning(t1.c.col2) + + if stmt_type.update: + self.assert_compile( + stmt, + "UPDATE table1 SET col1=:col1 WHERE table1.col1 = :col1_1 " + "AND table1.col2 = :col2_1 RETURNING table1.col1, table1.col2", + ) + elif stmt_type.delete: + self.assert_compile( + stmt, + "DELETE FROM table1 WHERE table1.col1 = :col1_1 " + "AND table1.col2 = :col2_1 RETURNING table1.col1, table1.col2", + ) + else: + stmt_type.fail() -- cgit v1.2.1