p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27632 -- Unified query parameters by their types and values on Oracle. 

Fixed Python 2 regression in 6dbe56ed78.

Thanks Simon Charette for the implementation idea.
This commit is contained in:
Mariusz Felisiak 2016-12-28 23:20:42 +01:00 committed by Tim Graham
parent 6a74950513
commit 4579c3f6b8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/db/backends/oracle/base.py
View File

@ -464,17 +464,22 @@ class FormatStylePlaceholderCursor(object):
# Handle params as dict # Handle params as dict
args = {k: ":%s" % k for k in params.keys()} args = {k: ":%s" % k for k in params.keys()}
query = convert_unicode(query % args, self.charset) query = convert_unicode(query % args, self.charset)
elif unify_by_values: elif unify_by_values and len(params) > 0:
# Handle params as a dict with unified query parameters by their # Handle params as a dict with unified query parameters by their
# values. It can be used only in single query execute() because # values. It can be used only in single query execute() because
# executemany() shares the formatted query with each of the params # executemany() shares the formatted query with each of the params
# list. e.g. for input params = [0.75, 2, 0.75, 'sth', 0.75] # list. e.g. for input params = [0.75, 2, 0.75, 'sth', 0.75]
# params_dict = {0.75: ':arg0', 2: ':arg1', 'sth': ':arg2'} # params_dict = {
# (2, <type 'int'>): ':arg2',
# (0.75, <type 'float'>): ':arg1',
# ('sth', <type 'str'>): ':arg0',
# }
# args = [':arg0', ':arg1', ':arg0', ':arg2', ':arg0'] # args = [':arg0', ':arg1', ':arg0', ':arg2', ':arg0']
# params = {':arg0': 0.75, ':arg1': 2, ':arg2': 'sth'} # params = {':arg0': 0.75, ':arg1': 2, ':arg2': 'sth'}
params = [(param, type(param)) for param in params]
params_dict = {param: ':arg%d' % i for i, param in enumerate(set(params))} params_dict = {param: ':arg%d' % i for i, param in enumerate(set(params))}
args = [params_dict[param] for param in params] args = [params_dict[param] for param in params]
params = dict(zip(params_dict.values(), params_dict.keys())) params = dict(zip(params_dict.values(), list(zip(*params_dict.keys()))[0]))
query = convert_unicode(query % tuple(args), self.charset) query = convert_unicode(query % tuple(args), self.charset)
else: else:
# Handle params as sequence # Handle params as sequence