[1.0.X] Removed support for passing params as dicts in the oracle backend. Wasn't documented, didn't work, isn't necessary. Backport of [9418] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
4007ac09e4
commit
aef9663625
django/db/backends/oracle
|
@ -314,34 +314,17 @@ class FormatStylePlaceholderCursor(Database.Cursor):
|
||||||
charset = 'utf-8'
|
charset = 'utf-8'
|
||||||
|
|
||||||
def _format_params(self, params):
|
def _format_params(self, params):
|
||||||
if isinstance(params, dict):
|
return tuple([OracleParam(p, self.charset, True) for p in params])
|
||||||
result = {}
|
|
||||||
for key, value in params.items():
|
|
||||||
result[smart_str(key, self.charset)] = OracleParam(param, self.charset)
|
|
||||||
return result
|
|
||||||
else:
|
|
||||||
return tuple([OracleParam(p, self.charset, True) for p in params])
|
|
||||||
|
|
||||||
def _guess_input_sizes(self, params_list):
|
def _guess_input_sizes(self, params_list):
|
||||||
if isinstance(params_list[0], dict):
|
sizes = [None] * len(params_list[0])
|
||||||
sizes = {}
|
for params in params_list:
|
||||||
iterators = [params.iteritems() for params in params_list]
|
for i, value in enumerate(params):
|
||||||
else:
|
if value.input_size: sizes[i] = value.input_size
|
||||||
sizes = [None] * len(params_list[0])
|
self.setinputsizes(*sizes)
|
||||||
iterators = [enumerate(params) for params in params_list]
|
|
||||||
for iterator in iterators:
|
|
||||||
for key, value in iterator:
|
|
||||||
if value.input_size: sizes[key] = value.input_size
|
|
||||||
if isinstance(sizes, dict):
|
|
||||||
self.setinputsizes(**sizes)
|
|
||||||
else:
|
|
||||||
self.setinputsizes(*sizes)
|
|
||||||
|
|
||||||
def _param_generator(self, params):
|
def _param_generator(self, params):
|
||||||
if isinstance(params, dict):
|
return [p.smart_str for p in params]
|
||||||
return dict([(k, p.smart_str) for k, p in params.iteritems()])
|
|
||||||
else:
|
|
||||||
return [p.smart_str for p in params]
|
|
||||||
|
|
||||||
def execute(self, query, params=None):
|
def execute(self, query, params=None):
|
||||||
if params is None:
|
if params is None:
|
||||||
|
|
Loading…
Reference in New Issue