diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/ansisql.py | 29 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql.py | 17 |
3 files changed, 19 insertions, 31 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 36ae93bc6..031c63328 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -74,6 +74,7 @@ class ANSICompiler(sql.Compiled): self.bindtemplate = ":%s" self.paramstyle = dialect.paramstyle self.positional = dialect.positional + self.positiontup = [] self.preparer = dialect.preparer() def after_compile(self): @@ -84,7 +85,6 @@ class ANSICompiler(sql.Compiled): if self.paramstyle=='pyformat': self.strings[self.statement] = re.sub(match, lambda m:'%(' + m.group(1) +')s', self.strings[self.statement]) elif self.positional: - self.positiontup = [] params = re.finditer(match, self.strings[self.statement]) for p in params: self.positiontup.append(p.group(1)) @@ -128,15 +128,10 @@ class ANSICompiler(sql.Compiled): bindparams = {} bindparams.update(params) - d = sql.ClauseParameters(self.dialect) - if self.positional: - for k in self.positiontup: - b = self.binds[k] - d.set_parameter(k, b.value, b) - else: - for b in self.binds.values(): - d.set_parameter(b.key, b.value, b) - + d = sql.ClauseParameters(self.dialect, self.positiontup) + for b in self.binds.values(): + d.set_parameter(b.key, b.value, b) + for key, value in bindparams.iteritems(): try: b = self.binds[key] @@ -146,20 +141,6 @@ class ANSICompiler(sql.Compiled): return d - def get_named_params(self, parameters): - """given the results of the get_params method, returns the parameters - in dictionary format. For a named paramstyle, this just returns the - same dictionary. For a positional paramstyle, the given parameters are - assumed to be in list format and are converted back to a dictionary. - """ - if self.positional: - p = {} - for i in range(0, len(self.positiontup)): - p[self.positiontup[i]] = parameters[i] - return p - else: - return parameters - def default_from(self): """called when a SELECT statement has no froms, and no FROM clause is to be appended. gives Oracle a chance to tack on a "FROM DUAL" to the string output. """ diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index f0ffd7797..6bef1fabd 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -98,9 +98,9 @@ class DefaultDialect(base.Dialect): if parameters is not None: if self.positional: if executemany: - parameters = [p.values() for p in parameters] + parameters = [p.get_raw_list() for p in parameters] else: - parameters = parameters.values() + parameters = parameters.get_raw_list() else: if executemany: parameters = [p.get_raw_dict() for p in parameters] diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 18591c24c..2aa1342ca 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -273,12 +273,19 @@ class AbstractDialect(object): """represents the behavior of a particular database. Used by Compiled objects.""" pass -class ClauseParameters(util.OrderedDict): - """represents a dictionary/iterator of bind parameter key names/values. Includes parameters compiled with a Compiled object as well as additional arguments passed to the Compiled object's get_params() method. Parameter values will be converted as per the TypeEngine objects present in the bind parameter objects. The non-converted value can be retrieved via the get_original method. For Compiled objects that compile positional parameters, the values() iteration of the object will return the parameter values in the correct order.""" - def __init__(self, dialect): +class ClauseParameters(dict): + """represents a dictionary/iterator of bind parameter key names/values. + + Tracks the original BindParam objects as well as the keys/position of each + parameter, and can return parameters as a dictionary or a list. + Will process parameter values according to the TypeEngine objects present in + the BindParams. + """ + def __init__(self, dialect, positional=None): super(ClauseParameters, self).__init__(self) self.dialect=dialect self.binds = {} + self.positional = positional or [] def set_parameter(self, key, value, bindparam): self[key] = value self.binds[key] = bindparam @@ -290,10 +297,10 @@ class ClauseParameters(util.OrderedDict): if self.binds.has_key(key): v = self.binds[key].typeprocess(v, self.dialect) return v - def values(self): - return [self[key] for key in self] def get_original_dict(self): return self.copy() + def get_raw_list(self): + return [self[key] for key in self.positional] def get_raw_dict(self): d = {} for k in self: |