- fix up rendering of "of"

- move out tests, dialect specific out of compiler, compiler tests use new API,
legacy API tests in test_selecatble
- add support for adaptation of ForUpdateArg, alias support in compilers

2 files changed, 61 insertions, 71 deletions

diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 26cd30026..f1f852ddc 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -1045,86 +1045,22 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_for_update(self):
         self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update=True),
+            table1.select(table1.c.myid == 7).with_for_update(),
             "SELECT mytable.myid, mytable.name, mytable.description "
             "FROM mytable WHERE mytable.myid = :myid_1 FOR UPDATE")
 
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update=False),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = :myid_1")
-
         # not supported by dialect, should just use update
         self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update='nowait'),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = :myid_1 FOR UPDATE")
-
-        # unknown lock mode
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update='unknown_mode'),
+            table1.select(table1.c.myid == 7).with_for_update(nowait=True),
             "SELECT mytable.myid, mytable.name, mytable.description "
             "FROM mytable WHERE mytable.myid = :myid_1 FOR UPDATE")
 
-        # ----- mysql
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update=True),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %s FOR UPDATE",
-            dialect=mysql.dialect())
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update="read"),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %s LOCK IN SHARE MODE",
-            dialect=mysql.dialect())
-
-        # ----- oracle
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update=True),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = :myid_1 FOR UPDATE",
-            dialect=oracle.dialect())
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update="nowait"),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = :myid_1 FOR UPDATE NOWAIT",
-            dialect=oracle.dialect())
-
-        # ----- postgresql
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update=True),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %(myid_1)s FOR UPDATE",
-            dialect=postgresql.dialect())
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update="nowait"),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %(myid_1)s FOR UPDATE NOWAIT",
-            dialect=postgresql.dialect())
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update="read"),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %(myid_1)s FOR SHARE",
-            dialect=postgresql.dialect())
-
-        self.assert_compile(
-            table1.select(table1.c.myid == 7, for_update="read_nowait"),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %(myid_1)s FOR SHARE NOWAIT",
-            dialect=postgresql.dialect())
+        assert_raises_message(
+            exc.ArgumentError,
+            "Unknown for_update argument: 'unknown_mode'",
+            table1.select, table1.c.myid == 7, for_update='unknown_mode'
+        )
 
-        self.assert_compile(
-            table1.select(table1.c.myid == 7).with_for_update(of=table1.c.myid),
-            "SELECT mytable.myid, mytable.name, mytable.description "
-            "FROM mytable WHERE mytable.myid = %(myid_1)s FOR UPDATE OF mytable",
-            dialect=postgresql.dialect())
 
     def test_alias(self):
         # test the alias for a table1.  column names stay the same,
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 0fc7a0ed0..66cdd87c2 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -1903,3 +1903,57 @@ class WithLabelsTest(fixtures.TestBase):
             ['t1_x', 't2_x']
         )
         self._assert_result_keys(sel, ['t1_a', 't2_b'])
+
+class ForUpdateTest(fixtures.TestBase, AssertsCompiledSQL):
+    __dialect__ = "default"
+
+    def _assert_legacy(self, leg, read=False, nowait=False):
+        t = table('t', column('c'))
+        s1 = select([t], for_update=leg)
+        if leg is False:
+            assert s1._for_update_arg is None
+            assert s1.for_update is None
+        else:
+            eq_(
+                s1._for_update_arg.read, read
+            )
+            eq_(
+                s1._for_update_arg.nowait, nowait
+            )
+            eq_(s1.for_update, leg)
+
+    def test_false_legacy(self):
+        self._assert_legacy(False)
+
+    def test_plain_true_legacy(self):
+        self._assert_legacy(True)
+
+    def test_read_legacy(self):
+        self._assert_legacy("read", read=True)
+
+    def test_nowait_legacy(self):
+        self._assert_legacy("nowait", nowait=True)
+
+    def test_read_nowait_legacy(self):
+        self._assert_legacy("read_nowait", read=True, nowait=True)
+
+    def test_basic_clone(self):
+        t = table('t', column('c'))
+        s = select([t]).with_for_update(read=True, of=t.c.c)
+        s2 = visitors.ReplacingCloningVisitor().traverse(s)
+        assert s2._for_update_arg is not s._for_update_arg
+        eq_(s2._for_update_arg.read, True)
+        eq_(s2._for_update_arg.of, [t.c.c])
+        self.assert_compile(s2,
+            "SELECT t.c FROM t FOR SHARE OF t",
+            dialect="postgresql")
+
+    def test_adapt(self):
+        t = table('t', column('c'))
+        s = select([t]).with_for_update(read=True, of=t.c.c)
+        a = t.alias()
+        s2 = sql_util.ClauseAdapter(a).traverse(s)
+        eq_(s2._for_update_arg.of, [a.c.c])
+        self.assert_compile(s2,
+            "SELECT t_1.c FROM t AS t_1 FOR SHARE OF t_1",
+            dialect="postgresql")