diff options
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 49 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 49 |
2 files changed, 38 insertions, 60 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index a335b1d17..00aaca01e 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -629,24 +629,6 @@ class ExecutionContext(object): raise NotImplementedError() - def last_inserted_params(self): - """Return a dictionary of the full parameter dictionary for the last - compiled INSERT statement. - - Includes any ColumnDefaults or Sequences that were pre-executed. - """ - - raise NotImplementedError() - - def last_updated_params(self): - """Return a dictionary of the full parameter dictionary for the last - compiled UPDATE statement. - - Includes any ColumnDefaults that were pre-executed. - """ - - raise NotImplementedError() - def lastrow_has_defaults(self): """Return True if the last INSERT or UPDATE row contained inlined or database-side defaults. @@ -2467,6 +2449,7 @@ class ResultProxy(object): did not explicitly specify returning(). """ + if not self.context.isinsert: raise exc.InvalidRequestError( "Statement is not an insert() expression construct.") @@ -2475,31 +2458,33 @@ class ResultProxy(object): "Can't call inserted_primary_key when returning() " "is used.") - return self.context._inserted_primary_key + return self.context.inserted_primary_key @util.deprecated("0.6", "Use :attr:`.ResultProxy.inserted_primary_key`") def last_inserted_ids(self): """Return the primary key for the row just inserted.""" return self.inserted_primary_key - + def last_updated_params(self): - """Return ``last_updated_params()`` from the underlying - ExecutionContext. - - See ExecutionContext for details. + """Return the collection of updated parameters from this + execution. + """ - - return self.context.last_updated_params() + if self.context.executemany: + return self.context.compiled_parameters + else: + return self.context.compiled_parameters[0] def last_inserted_params(self): - """Return ``last_inserted_params()`` from the underlying - ExecutionContext. - - See ExecutionContext for details. + """Return the collection of inserted parameters from this + execution. + """ - - return self.context.last_inserted_params() + if self.context.executemany: + return self.context.compiled_parameters + else: + return self.context.compiled_parameters[0] def lastrow_has_defaults(self): """Return ``lastrow_has_defaults()`` from the underlying diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 0717a8fef..21603b258 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -400,7 +400,9 @@ class DefaultExecutionContext(base.ExecutionContext): self.cursor = self.create_cursor() if self.isinsert or self.isupdate: self.__process_defaults() - + self.postfetch_cols = self.compiled.postfetch + self.prefetch_cols = self.compiled.prefetch + processors = dict( (key, value) for key, value in ( (compiled.bind_names[bindparam], @@ -541,7 +543,8 @@ class DefaultExecutionContext(base.ExecutionContext): """ conn = self._connection - if isinstance(stmt, unicode) and not self.dialect.supports_unicode_statements: + if isinstance(stmt, unicode) and \ + not self.dialect.supports_unicode_statements: stmt = stmt.encode(self.dialect.encoding) if self.dialect.positional: @@ -614,13 +617,14 @@ class DefaultExecutionContext(base.ExecutionContext): def post_insert(self): if self.dialect.postfetch_lastrowid and \ - (not len(self._inserted_primary_key) or \ - None in self._inserted_primary_key): + (not len(self.inserted_primary_key) or \ + None in self.inserted_primary_key): table = self.compiled.statement.table lastrowid = self.get_lastrowid() - self._inserted_primary_key = [c is table._autoincrement_column and lastrowid or v - for c, v in zip(table.primary_key, self._inserted_primary_key) + self.inserted_primary_key = [ + c is table._autoincrement_column and lastrowid or v + for c, v in zip(table.primary_key, self.inserted_primary_key) ] def _fetch_implicit_returning(self, resultproxy): @@ -628,22 +632,17 @@ class DefaultExecutionContext(base.ExecutionContext): row = resultproxy.fetchone() ipk = [] - for c, v in zip(table.primary_key, self._inserted_primary_key): + for c, v in zip(table.primary_key, self.inserted_primary_key): if v is not None: ipk.append(v) else: ipk.append(row[c]) - self._inserted_primary_key = ipk - - def last_inserted_params(self): - return self._last_inserted_params - - def last_updated_params(self): - return self._last_updated_params - + self.inserted_primary_key = ipk + def lastrow_has_defaults(self): - return hasattr(self, 'postfetch_cols') and len(self.postfetch_cols) + return (self.isinsert or self.isupdate) and \ + bool(self.postfetch_cols) def set_input_sizes(self, translate=None, exclude_types=None): """Given a cursor and ClauseParameters, call the appropriate @@ -714,7 +713,7 @@ class DefaultExecutionContext(base.ExecutionContext): return None else: return self._exec_default(column.onupdate) - + def __process_defaults(self): """Generate default values for compiled insert/update statements, and generate inserted_primary_key collection. @@ -745,7 +744,6 @@ class DefaultExecutionContext(base.ExecutionContext): if val is not None: param[c.key] = val del self.current_parameters - else: self.current_parameters = compiled_parameters = \ self.compiled_parameters[0] @@ -759,18 +757,13 @@ class DefaultExecutionContext(base.ExecutionContext): if val is not None: compiled_parameters[c.key] = val del self.current_parameters - + if self.isinsert: - self._inserted_primary_key = [ - compiled_parameters.get(c.key, None) - for c in self.compiled.\ + self.inserted_primary_key = [ + self.compiled_parameters[0].get(c.key, None) + for c in self.compiled.\ statement.table.primary_key - ] - self._last_inserted_params = compiled_parameters - else: - self._last_updated_params = compiled_parameters + ] - self.postfetch_cols = self.compiled.postfetch - self.prefetch_cols = self.compiled.prefetch DefaultDialect.execution_ctx_cls = DefaultExecutionContext |