From 5bcdbacae447083eb14471c8a82f7c798beea623 Mon Sep 17 00:00:00 2001
From: Gord Thompson <gord@gordthompson.com>
Date: Tue, 31 Mar 2020 06:33:55 -0600
Subject: [PATCH] Clean up (engine|db).execute for mysql

Change-Id: Ibc3509630a7c418b500ec7c6587f311326b75c93
---
 test/dialect/mysql/test_query.py | 37 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/test/dialect/mysql/test_query.py b/test/dialect/mysql/test_query.py
index 39485ae102..0c1e623fe8 100644
--- a/test/dialect/mysql/test_query.py
+++ b/test/dialect/mysql/test_query.py
@@ -130,9 +130,9 @@ class MatchTest(fixtures.TestBase):
         )
         eq_([3], [r.id for r in results])
 
-    def test_return_value(self):
+    def test_return_value(self, connection):
         # test [ticket:3263]
-        result = testing.db.execute(
+        result = connection.execute(
             select(
                 [
                     matchtable.c.title.match("Agile Ruby Programming").label(
@@ -233,35 +233,36 @@ class AnyAllTest(fixtures.TablesTest):
     @classmethod
     def insert_data(cls):
         stuff = cls.tables.stuff
-        testing.db.execute(
-            stuff.insert(),
-            [
-                {"id": 1, "value": 1},
-                {"id": 2, "value": 2},
-                {"id": 3, "value": 3},
-                {"id": 4, "value": 4},
-                {"id": 5, "value": 5},
-            ],
-        )
+        with testing.db.begin() as conn:
+            conn.execute(
+                stuff.insert(),
+                [
+                    {"id": 1, "value": 1},
+                    {"id": 2, "value": 2},
+                    {"id": 3, "value": 3},
+                    {"id": 4, "value": 4},
+                    {"id": 5, "value": 5},
+                ],
+            )
 
-    def test_any_w_comparator(self):
+    def test_any_w_comparator(self, connection):
         stuff = self.tables.stuff
         stmt = select([stuff.c.id]).where(
             stuff.c.value > any_(select([stuff.c.value]).scalar_subquery())
         )
 
-        eq_(testing.db.execute(stmt).fetchall(), [(2,), (3,), (4,), (5,)])
+        eq_(connection.execute(stmt).fetchall(), [(2,), (3,), (4,), (5,)])
 
-    def test_all_w_comparator(self):
+    def test_all_w_comparator(self, connection):
         stuff = self.tables.stuff
         stmt = select([stuff.c.id]).where(
             stuff.c.value >= all_(select([stuff.c.value]).scalar_subquery())
         )
 
-        eq_(testing.db.execute(stmt).fetchall(), [(5,)])
+        eq_(connection.execute(stmt).fetchall(), [(5,)])
 
-    def test_any_literal(self):
+    def test_any_literal(self, connection):
         stuff = self.tables.stuff
         stmt = select([4 == any_(select([stuff.c.value]).scalar_subquery())])
 
-        is_(testing.db.execute(stmt).scalar(), True)
+        is_(connection.execute(stmt).scalar(), True)
-- 
2.47.3