diff options
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 9 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/provision.py | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index c1a2cf81d..87afa0293 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1412,12 +1412,6 @@ from ...types import VARCHAR IDX_USING = re.compile(r"^(?:btree|hash|gist|gin|[\w_]+)$", re.I) -AUTOCOMMIT_REGEXP = re.compile( - r"\s*(?:UPDATE|INSERT|CREATE|DELETE|DROP|ALTER|GRANT|REVOKE|" - "IMPORT FOREIGN SCHEMA|REFRESH MATERIALIZED VIEW|TRUNCATE)", - re.I | re.UNICODE, -) - RESERVED_WORDS = set( [ "all", @@ -3088,9 +3082,6 @@ class PGExecutionContext(default.DefaultExecutionContext): return super(PGExecutionContext, self).get_insert_default(column) - def should_autocommit_text(self, statement): - return AUTOCOMMIT_REGEXP.match(statement) - class PGReadOnlyConnectionCharacteristic( characteristics.ConnectionCharacteristic diff --git a/lib/sqlalchemy/dialects/postgresql/provision.py b/lib/sqlalchemy/dialects/postgresql/provision.py index 68a01e483..289dda4b6 100644 --- a/lib/sqlalchemy/dialects/postgresql/provision.py +++ b/lib/sqlalchemy/dialects/postgresql/provision.py @@ -88,7 +88,9 @@ def _postgresql_set_default_schema_on_connection( @drop_all_schema_objects_pre_tables.for_db("postgresql") def drop_all_schema_objects_pre_tables(cfg, eng): with eng.connect().execution_options(isolation_level="AUTOCOMMIT") as conn: - for xid in conn.execute("select gid from pg_prepared_xacts").scalars(): + for xid in conn.exec_driver_sql( + "select gid from pg_prepared_xacts" + ).scalars(): conn.execute("ROLLBACK PREPARED '%s'" % xid) |