From 4c306818396c8cc98a16a14c5ed3361cf6ff373a Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 22 Aug 2017 13:12:43 -0400 Subject: [PATCH] - allow a separate template database to be used for PG CREATE DATABASE. as nobody will connect to it that would solve the contention issue here Change-Id: I00a4d52091876e120faff4a8a5493c53280d96f1 --- lib/sqlalchemy/testing/plugin/plugin_base.py | 3 +++ lib/sqlalchemy/testing/provision.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 2aeebd3192..aeae944fe0 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -65,6 +65,9 @@ def setup_options(make_option): help="Run only tests marked with __backend__") make_option("--nomemory", action="store_true", dest="nomemory", help="Don't run memory profiling tests") + make_option("--postgresql-templatedb", type="string", + help="name of template database to use for Postgresql " + "CREATE DATABASE (defaults to current database)") make_option("--low-connections", action="store_true", dest="low_connections", help="Use a low number of distinct connections - " diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py index 95fa2f8f75..033537156e 100644 --- a/lib/sqlalchemy/testing/provision.py +++ b/lib/sqlalchemy/testing/provision.py @@ -160,23 +160,26 @@ def _sqlite_post_configure_engine(url, engine, follower_ident): @_create_db.for_db("postgresql") def _pg_create_db(cfg, eng, ident): + template_db = cfg.options.postgresql_templatedb + with eng.connect().execution_options( isolation_level="AUTOCOMMIT") as conn: try: _pg_drop_db(cfg, conn, ident) except Exception: pass - currentdb = conn.scalar("select current_database()") - for attempt in range(10): + if not template_db: + template_db = conn.scalar("select current_database()") + for attempt in range(3): try: conn.execute( - "CREATE DATABASE %s TEMPLATE %s" % (ident, currentdb)) + "CREATE DATABASE %s TEMPLATE %s" % (ident, template_db)) except exc.OperationalError as err: if "accessed by other users" in str(err): log.info( "Waiting to create %s, URI %r, " - "template DB is in use sleeping for .5", - ident, eng.url) + "template DB %s is in use sleeping for .5", + ident, eng.url, template_db) time.sleep(.5) else: break -- 2.47.3