1 files changed, 44 insertions, 22 deletions

diff --git a/lib/sqlalchemy/dialects/sqlite/provision.py b/lib/sqlalchemy/dialects/sqlite/provision.py
index d0d12695d..e5b17e829 100644
--- a/lib/sqlalchemy/dialects/sqlite/provision.py
+++ b/lib/sqlalchemy/dialects/sqlite/provision.py
@@ -1,9 +1,12 @@
 import os
+import re
 
+from ... import exc
 from ...engine import url as sa_url
 from ...testing.provision import create_db
 from ...testing.provision import drop_db
 from ...testing.provision import follower_url_from_main
+from ...testing.provision import generate_driver_url
 from ...testing.provision import log
 from ...testing.provision import post_configure_engine
 from ...testing.provision import run_reap_dbs
@@ -11,21 +14,38 @@ from ...testing.provision import stop_test_class_outside_fixtures
 from ...testing.provision import temp_table_keyword_args
 
 
-# likely needs a generate_driver_url() def here for the --dbdriver part to
-# work
+# TODO: I can't get this to build dynamically with pytest-xdist procs
+_drivernames = {"pysqlite", "aiosqlite", "pysqlcipher"}
 
-_drivernames = set()
+
+@generate_driver_url.for_db("sqlite")
+def generate_driver_url(url, driver, query_str):
+    if driver == "pysqlcipher" and url.get_driver_name() != "pysqlcipher":
+        if url.database:
+            url = url.set(database=url.database + ".enc")
+        url = url.set(password="test")
+    url = url.set(drivername="sqlite+%s" % (driver,))
+    try:
+        url.get_dialect()
+    except exc.NoSuchModuleError:
+        return None
+    else:
+        return url
 
 
 @follower_url_from_main.for_db("sqlite")
 def _sqlite_follower_url_from_main(url, ident):
     url = sa_url.make_url(url)
+
     if not url.database or url.database == ":memory:":
         return url
     else:
-        _drivernames.add(url.get_driver_name())
+
+        m = re.match(r"(.+?)\.(.+)$", url.database)
+        name, ext = m.group(1, 2)
+        drivername = url.get_driver_name()
         return sa_url.make_url(
-            "sqlite+%s:///%s.db" % (url.get_driver_name(), ident)
+            "sqlite+%s:///%s_%s.%s" % (drivername, drivername, ident, ext)
         )
 
 
@@ -81,7 +101,6 @@ def stop_test_class_outside_fixtures(config, db, cls):
 
     if files:
         db.dispose()
-
         # some sqlite file tests are not cleaning up well yet, so do this
         # just to make things simple for now
         for file_ in files:
@@ -102,19 +121,22 @@ def _reap_sqlite_dbs(url, idents):
     for ident in idents:
         # we don't have a config so we can't call _sqlite_drop_db due to the
         # decorator
-        for path in (
-            [
-                "%s.db" % ident,
-            ]
-            + [
-                "%s_test_schema.db" % (drivername,)
-                for drivername in _drivernames
-            ]
-            + [
-                "%s_%s_test_schema.db" % (ident, drivername)
-                for drivername in _drivernames
-            ]
-        ):
-            if os.path.exists(path):
-                log.info("deleting SQLite database file: %s" % path)
-                os.remove(path)
+        for ext in ("db", "db.enc"):
+            for path in (
+                ["%s.%s" % (ident, ext)]
+                + [
+                    "%s_%s.%s" % (drivername, ident, ext)
+                    for drivername in _drivernames
+                ]
+                + [
+                    "%s_test_schema.%s" % (drivername, ext)
+                    for drivername in _drivernames
+                ]
+                + [
+                    "%s_%s_test_schema.%s" % (ident, drivername, ext)
+                    for drivername in _drivernames
+                ]
+            ):
+                if os.path.exists(path):
+                    log.info("deleting SQLite database file: %s" % path)
+                    os.remove(path)