Django

Code

Changeset 9418

Show
Ignore:
Timestamp:
11/13/08 18:54:16 (2 months ago)
Author:
ikelly
Message:

Refs #9408: Removed support for passing params as dicts in the oracle backend. Wasn't documented, didn't work, isn't necessary.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/backends/oracle/base.py

    r8965 r9418  
    315315 
    316316    def _format_params(self, params): 
    317         if isinstance(params, dict): 
    318             result = {} 
    319             for key, value in params.items(): 
    320                 result[smart_str(key, self.charset)] = OracleParam(param, self.charset) 
    321             return result 
    322         else: 
    323             return tuple([OracleParam(p, self.charset, True) for p in params]) 
     317        return tuple([OracleParam(p, self.charset, True) for p in params]) 
    324318 
    325319    def _guess_input_sizes(self, params_list): 
    326         if isinstance(params_list[0], dict): 
    327             sizes = {} 
    328             iterators = [params.iteritems() for params in params_list] 
    329         else: 
    330             sizes = [None] * len(params_list[0]) 
    331             iterators = [enumerate(params) for params in params_list] 
    332         for iterator in iterators: 
    333             for key, value in iterator: 
    334                 if value.input_size: sizes[key] = value.input_size 
    335         if isinstance(sizes, dict): 
    336             self.setinputsizes(**sizes) 
    337         else: 
    338             self.setinputsizes(*sizes) 
     320        sizes = [None] * len(params_list[0]) 
     321        for params in params_list: 
     322            for i, value in enumerate(params): 
     323                if value.input_size: sizes[i] = value.input_size 
     324        self.setinputsizes(*sizes) 
    339325 
    340326    def _param_generator(self, params): 
    341         if isinstance(params, dict): 
    342             return dict([(k, p.smart_str) for k, p in params.iteritems()]) 
    343         else: 
    344             return [p.smart_str for p in params] 
     327        return [p.smart_str for p in params] 
    345328 
    346329    def execute(self, query, params=None):