Modernize tests - dml_values

Change-Id: Ida86ed40c43d91813151621b847376976773a5f9

1 files changed, 47 insertions, 36 deletions

diff --git a/test/dialect/postgresql/test_compiler.py b/test/dialect/postgresql/test_compiler.py
index cd360c2d4..d2c81e63f 100644
--- a/test/dialect/postgresql/test_compiler.py
+++ b/test/dialect/postgresql/test_compiler.py
@@ -129,8 +129,10 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             column("name", String(128)),
             column("description", String(128)),
         )
-        u = update(table1, values=dict(name="foo")).returning(
-            table1.c.myid, table1.c.name
+        u = (
+            update(table1)
+            .values(dict(name="foo"))
+            .returning(table1.c.myid, table1.c.name)
         )
         self.assert_compile(
             u,
@@ -138,7 +140,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             "RETURNING mytable.myid, mytable.name",
             dialect=dialect,
         )
-        u = update(table1, values=dict(name="foo")).returning(table1)
+        u = update(table1).values(dict(name="foo")).returning(table1)
         self.assert_compile(
             u,
             "UPDATE mytable SET name=%(name)s "
@@ -146,8 +148,10 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             "mytable.description",
             dialect=dialect,
         )
-        u = update(table1, values=dict(name="foo")).returning(
-            func.length(table1.c.name)
+        u = (
+            update(table1)
+            .values(dict(name="foo"))
+            .returning(func.length(table1.c.name))
         )
         self.assert_compile(
             u,
@@ -165,8 +169,10 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             column("description", String(128)),
         )
 
-        i = insert(table1, values=dict(name="foo")).returning(
-            table1.c.myid, table1.c.name
+        i = (
+            insert(table1)
+            .values(dict(name="foo"))
+            .returning(table1.c.myid, table1.c.name)
         )
         self.assert_compile(
             i,
@@ -175,7 +181,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             "mytable.name",
             dialect=dialect,
         )
-        i = insert(table1, values=dict(name="foo")).returning(table1)
+        i = insert(table1).values(dict(name="foo")).returning(table1)
         self.assert_compile(
             i,
             "INSERT INTO mytable (name) VALUES "
@@ -183,8 +189,10 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             "mytable.name, mytable.description",
             dialect=dialect,
         )
-        i = insert(table1, values=dict(name="foo")).returning(
-            func.length(table1.c.name)
+        i = (
+            insert(table1)
+            .values(dict(name="foo"))
+            .returning(func.length(table1.c.name))
         )
         self.assert_compile(
             i,
@@ -1742,7 +1750,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
         )
         self.assert_compile(stmt, expected)
 
-        stmt = update(tbl1, values=dict(id=1))
+        stmt = update(tbl1).values(dict(id=1))
         stmt = stmt.with_hint("ONLY", dialect_name="postgresql")
         expected = "UPDATE ONLY testtbl1 SET id=%(id)s"
         self.assert_compile(stmt, expected)
@@ -2240,9 +2248,11 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_do_nothing_no_target(self):
 
-        i = insert(
-            self.table1, values=dict(name="foo")
-        ).on_conflict_do_nothing()
+        i = (
+            insert(self.table1)
+            .values(dict(name="foo"))
+            .on_conflict_do_nothing()
+        )
         self.assert_compile(
             i,
             "INSERT INTO mytable (name) VALUES "
@@ -2251,9 +2261,11 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_do_nothing_index_elements_target(self):
 
-        i = insert(
-            self.table1, values=dict(name="foo")
-        ).on_conflict_do_nothing(index_elements=["myid"])
+        i = (
+            insert(self.table1)
+            .values(dict(name="foo"))
+            .on_conflict_do_nothing(index_elements=["myid"])
+        )
         self.assert_compile(
             i,
             "INSERT INTO mytable (name) VALUES "
@@ -2342,7 +2354,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_str_index_elements_target_two(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             index_elements=["myid"], set_=dict(name=i.excluded.name)
         )
@@ -2354,7 +2366,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_col_index_elements_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             index_elements=[self.table1.c.myid],
             set_=dict(name=i.excluded.name),
@@ -2367,7 +2379,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_unnamed_pk_constraint_target(self):
-        i = insert(self.table_with_metadata, values=dict(myid=1, name="foo"))
+        i = insert(self.table_with_metadata).values(dict(myid=1, name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.table_with_metadata.primary_key,
             set_=dict(name=i.excluded.name),
@@ -2380,7 +2392,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_pk_constraint_index_elements_target(self):
-        i = insert(self.table_with_metadata, values=dict(myid=1, name="foo"))
+        i = insert(self.table_with_metadata).values(dict(myid=1, name="foo"))
         i = i.on_conflict_do_update(
             index_elements=self.table_with_metadata.primary_key,
             set_=dict(name=i.excluded.name),
@@ -2393,7 +2405,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_named_unique_constraint_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.unique_constr, set_=dict(myid=i.excluded.myid)
         )
@@ -2405,7 +2417,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_string_constraint_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.unique_constr.name, set_=dict(myid=i.excluded.myid)
         )
@@ -2418,7 +2430,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_do_nothing_quoted_string_constraint_target(self):
         """test #6696"""
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_nothing(constraint="Some Constraint Name")
         self.assert_compile(
             i,
@@ -2442,7 +2454,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
             uq,
         )
 
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
 
         i = i.on_conflict_do_nothing(constraint=uq)
         self.assert_compile(
@@ -2455,7 +2467,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_do_nothing_quoted_named_constraint_target(self):
         """test #6696"""
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         unique_constr = UniqueConstraint(
             self.table1.c.myid, name="Some Constraint Name"
         )
@@ -2468,7 +2480,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_index_elements_where_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             index_elements=self.goofy_index.expressions,
             index_where=self.goofy_index.dialect_options["postgresql"][
@@ -2485,9 +2497,8 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_index_elements_where_target_multivalues(self):
-        i = insert(
-            self.table1,
-            values=[dict(name="foo"), dict(name="bar"), dict(name="bat")],
+        i = insert(self.table1).values(
+            [dict(name="foo"), dict(name="bar"), dict(name="bat")],
         )
         i = i.on_conflict_do_update(
             index_elements=self.goofy_index.expressions,
@@ -2512,7 +2523,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_unnamed_index_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
 
         unnamed_goofy = Index(
             None, self.table1.c.name, postgresql_where=self.table1.c.name > "m"
@@ -2530,7 +2541,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_unnamed_exclude_constraint_target(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.excl_constr_anon, set_=dict(name=i.excluded.name)
         )
@@ -2543,7 +2554,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_add_whereclause(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.excl_constr_anon,
             set_=dict(name=i.excluded.name),
@@ -2563,7 +2574,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_add_whereclause_references_excluded(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = i.on_conflict_do_update(
             constraint=self.excl_constr_anon,
             set_=dict(name=i.excluded.name),
@@ -2579,7 +2590,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_do_update_additional_colnames(self):
-        i = insert(self.table1, values=dict(name="bar"))
+        i = insert(self.table1).values(dict(name="bar"))
         i = i.on_conflict_do_update(
             constraint=self.excl_constr_anon,
             set_=dict(name="somename", unknown="unknown"),
@@ -2604,7 +2615,7 @@ class InsertOnConflictTest(fixtures.TestBase, AssertsCompiledSQL):
             )
 
     def test_on_conflict_as_cte(self):
-        i = insert(self.table1, values=dict(name="foo"))
+        i = insert(self.table1).values(dict(name="foo"))
         i = (
             i.on_conflict_do_update(
                 constraint=self.excl_constr_anon,