Revert "SA20: Address deprecation warnings in SqlAlchemyDictTypeTest"

This reverts commit b20faba.

Author: amotl

src/crate/client/sqlalchemy/tests/dict_test.py

@@ -37,22 +37,22 @@
 
 
 class SqlAlchemyDictTypeTest(TestCase):
+
     def setUp(self):
         self.engine = sa.create_engine('crate://')
-        metadata = sa.MetaData()
-        self.mytable = sa.Table('mytable',
-                                metadata,
+        # FIXME: Deprecated with SA20.
+        metadata = sa.MetaData(bind=self.engine)
+        self.mytable = sa.Table('mytable', metadata,
                                 sa.Column('name', sa.String),
-                                sa.Column('data', Craty),
-                                autoload_with=self.engine)
+                                sa.Column('data', Craty))
 
     def assertSQL(self, expected_str, actual_expr):
         self.assertEqual(expected_str, str(actual_expr).replace('\n', ''))
 
     def test_select_with_dict_column(self):
         mytable = self.mytable
         self.assertSQL(
-            "SELECT mytable.data[:data_1] AS anon_1 FROM mytable",
+            "SELECT mytable.data['x'] AS anon_1 FROM mytable",
             select(mytable.c.data['x'])
         )
 
@@ -61,7 +61,7 @@ def test_select_with_dict_column_where_clause(self):
         s = select(mytable.c.data).\
             where(mytable.c.data['x'] == 1)
         self.assertSQL(
-            "SELECT mytable.data FROM mytable WHERE mytable.data[:data_1] = :param_1",
+            "SELECT mytable.data FROM mytable WHERE mytable.data['x'] = ?",
             s
         )
 
@@ -71,7 +71,7 @@ def test_select_with_dict_column_nested_where(self):
         s = s.where(mytable.c.data['x']['y'] == 1)
         self.assertSQL(
             "SELECT mytable.name FROM mytable " +
-            "WHERE mytable.data[:data_1][:param_1] = :param_2",
+            "WHERE mytable.data['x']['y'] = ?",
             s
         )
 
@@ -80,7 +80,7 @@ def test_select_with_dict_column_where_clause_gt(self):
         s = select(mytable.c.data).\
             where(mytable.c.data['x'] > 1)
         self.assertSQL(
-            "SELECT mytable.data FROM mytable WHERE mytable.data[:data_1] > :param_1",
+            "SELECT mytable.data FROM mytable WHERE mytable.data['x'] > ?",
             s
         )
 
@@ -90,18 +90,19 @@ def test_select_with_dict_column_where_clause_other_col(self):
         s = s.where(mytable.c.data['x'] == mytable.c.name)
         self.assertSQL(
             "SELECT mytable.name FROM mytable " +
-            "WHERE mytable.data[:data_1] = mytable.name",
+            "WHERE mytable.data['x'] = mytable.name",
             s
         )
 
     def test_update_with_dict_column(self):
         mytable = self.mytable
         stmt = mytable.update().\
             where(mytable.c.name == 'Arthur Dent').\
-            values({mytable.c.data['x']: "Trillian"})
-
+            values({
+                "data['x']": "Trillian"
+            })
         self.assertSQL(
-            "UPDATE mytable SET data[:data_1]=:param_1 WHERE mytable.name = :name_1",
+            "UPDATE mytable SET data['x'] = ? WHERE mytable.name = ?",
             stmt
         )