forked from pool/python-SQLAlchemy
Dirk Mueller
2ed7a610f4
- update to 1.4.13:
orm
* Fixed regression in selectinload loader strategy that would
cause it to cache its internal state incorrectly when handling
relationships that join across more than one column, such as
when using a composite foreign key. The invalid caching would
then cause other unrelated loader operations to fail.
References: #6410
* Fixed regression where Query.filter_by() would not work if the
lead entity were a SQL function or other expression derived
from the primary entity in question, rather than a simple
entity or column of that entity. Additionally, improved the
behavior of Select.filter_by() overall to work with column
expressions even in a non-ORM context. References: #6414
* Fixed regression where using selectinload() and subqueryload()
to load a two-level-deep path would lead to an attribute error.
References: #6419
* Fixed regression where using the noload() loader strategy in
conjunction with a “dynamic” relationship would lead to an
attribute error as the noload strategy would attempt to apply
itself to the dynamic loader. References: #6420
engine
* Restored a legacy transactional behavior that was inadvertently
removed from the Connection as it was never tested as a known
use case in previous versions, where calling upon the
Connection.begin_nested() method, when no transaction is
present, does not create a SAVEPOINT at all and instead starts
an outer transaction, returning a RootTransaction object
instead of a NestedTransaction object. This RootTransaction
then will emit a real COMMIT on the database connection when
OBS-URL: https://build.opensuse.org/request/show/890304
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=188
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
---
|
|
lib/sqlalchemy/engine/url.py | 14 ++++++++++----
|
|
test/dialect/mssql/test_engine.py | 3 ++-
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
--- a/lib/sqlalchemy/engine/url.py
|
|
+++ b/lib/sqlalchemy/engine/url.py
|
|
@@ -14,6 +14,7 @@ argument; alternatively, the URL is a pu
|
|
be used directly and is also accepted directly by ``create_engine()``.
|
|
"""
|
|
|
|
+import inspect
|
|
import re
|
|
|
|
from .interfaces import Dialect
|
|
@@ -218,7 +219,7 @@ class URL(object):
|
|
return translated
|
|
|
|
|
|
-def make_url(name_or_url):
|
|
+def make_url(name_or_url, separator='&'):
|
|
"""Given a string or unicode instance, produce a new URL instance.
|
|
|
|
The given string is parsed according to the RFC 1738 spec. If an
|
|
@@ -226,12 +227,12 @@ def make_url(name_or_url):
|
|
"""
|
|
|
|
if isinstance(name_or_url, util.string_types):
|
|
- return _parse_rfc1738_args(name_or_url)
|
|
+ return _parse_rfc1738_args(name_or_url, separator)
|
|
else:
|
|
return name_or_url
|
|
|
|
|
|
-def _parse_rfc1738_args(name):
|
|
+def _parse_rfc1738_args(name, qs_sep):
|
|
pattern = re.compile(
|
|
r"""
|
|
(?P<name>[\w\+]+)://
|
|
@@ -261,7 +262,12 @@ def _parse_rfc1738_args(name):
|
|
if len(tokens) > 1:
|
|
query = {}
|
|
|
|
- for key, value in util.parse_qsl(tokens[1]):
|
|
+ if 'separator' in inspect.signature(util.parse_qsl).parameters:
|
|
+ qs_dict = util.parse_qsl(tokens[1], separator=qs_sep)
|
|
+ else:
|
|
+ qs_dict = util.parse_qsl(tokens[1])
|
|
+
|
|
+ for key, value in qs_dict:
|
|
if util.py2k:
|
|
key = key.encode("ascii")
|
|
if key in query:
|
|
--- a/test/dialect/mssql/test_engine.py
|
|
+++ b/test/dialect/mssql/test_engine.py
|
|
@@ -164,7 +164,8 @@ class ParseConnectTest(fixtures.TestBase
|
|
u = url.make_url(
|
|
"mssql+pyodbc://@server_name/db_name?"
|
|
"driver=ODBC+Driver+17+for+SQL+Server&"
|
|
- "authentication=ActiveDirectoryIntegrated"
|
|
+ "authentication=ActiveDirectoryIntegrated",
|
|
+ separator='&'
|
|
)
|
|
connection = dialect.create_connect_args(u)
|
|
eq_(connection[1], {})
|