summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-05-25 14:12:41 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-05-25 14:12:41 +0000
commite6792a3db7825f360df65a62f245087aec0a3e27 (patch)
tree2a955c731266892e94d32e5fac135dc140dccac6 /lib/sqlalchemy
parentd7b131d2dfc4c519b23d9ed29364036ef88b1863 (diff)
parentc0612f8166b7cd07895e7302bb59192abbb68c43 (diff)
downloadsqlalchemy-e6792a3db7825f360df65a62f245087aec0a3e27.tar.gz
Merge "enable pg8000 for 1.29.1 and above" into main
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/testing/fixtures.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py
index d4e4d2dca..4b5366186 100644
--- a/lib/sqlalchemy/testing/fixtures.py
+++ b/lib/sqlalchemy/testing/fixtures.py
@@ -461,6 +461,10 @@ class TablesTest(TestBase):
elif self.run_create_tables == "each":
drop_all_tables_from_metadata(self._tables_metadata, self.bind)
+ savepoints = getattr(config.requirements, "savepoints", False)
+ if savepoints:
+ savepoints = savepoints.enabled
+
# no need to run deletes if tables are recreated on setup
if (
self.run_define_tables != "each"
@@ -478,7 +482,11 @@ class TablesTest(TestBase):
]
):
try:
- conn.execute(table.delete())
+ if savepoints:
+ with conn.begin_nested():
+ conn.execute(table.delete())
+ else:
+ conn.execute(table.delete())
except sa.exc.DBAPIError as ex:
print(
("Error emptying table %s: %r" % (table, ex)),