diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-06-06 15:15:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-06-06 15:15:56 +0000 |
| commit | 0b33c250a8b78297690c74870a245aada5d5374e (patch) | |
| tree | 648aca826890f00fc2729094e28da1258c4646d0 /lib/sqlalchemy | |
| parent | b2cd9aca54d1625dde31abebf7f11149c9b7c636 (diff) | |
| parent | 03633a6462ee16a1348acb98fe0323c74eb9ba85 (diff) | |
| download | sqlalchemy-0b33c250a8b78297690c74870a245aada5d5374e.tar.gz | |
Merge "Pass URL object, not the string, to on_connect_url"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/pysqlcipher.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/create.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py index ff02d4dee..1a9337671 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py @@ -9,7 +9,7 @@ .. dialect:: sqlite+pysqlcipher :name: pysqlcipher :dbapi: sqlcipher 3 or pysqlcipher - :connectstring: sqlite+pysqlcipher://:passphrase/file_path[?kdf_iter=<iter>] + :connectstring: sqlite+pysqlcipher://:passphrase@/file_path[?kdf_iter=<iter>] Dialect for support of DBAPIs that make use of the `SQLCipher <https://www.zetetic.net/sqlcipher>`_ backend. diff --git a/lib/sqlalchemy/engine/create.py b/lib/sqlalchemy/engine/create.py index 0351f2ebc..3cf339cfc 100644 --- a/lib/sqlalchemy/engine/create.py +++ b/lib/sqlalchemy/engine/create.py @@ -649,8 +649,7 @@ def create_engine(url, **kwargs): engine = engineclass(pool, dialect, u, **engine_args) if _initialize: - - do_on_connect = dialect.on_connect_url(url) + do_on_connect = dialect.on_connect_url(u) if do_on_connect: if _wrap_do_on_connect: do_on_connect = _wrap_do_on_connect(do_on_connect) |