diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-09-03 22:26:16 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-09-03 22:26:16 +0000 |
| commit | ebcdb289d9dea98ac57fa6d2e410decb86febc7f (patch) | |
| tree | effdec4a06fd0ea8d322e53aed58b84674ca9732 /lib/sqlalchemy/engine/default.py | |
| parent | ef8c8d21cd1e1b04722308f7c4d900b75c5f91b7 (diff) | |
| download | sqlalchemy-ebcdb289d9dea98ac57fa6d2e410decb86febc7f.tar.gz | |
- distill contextual parameters for the purpose of default functions into context.current_parameters
- metadata docs continued
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 78164e459..e062abce6 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -470,10 +470,7 @@ class DefaultExecutionContext(base.ExecutionContext): drunner = self.dialect.defaultrunner(self) params = self.compiled_parameters for param in params: - # assign each dict of params to self.compiled_parameters; - # this allows user-defined default generators to access the full - # set of bind params for the row - self.compiled_parameters = param + self.current_parameters = param for c in self.compiled.prefetch: if self.isinsert: val = drunner.get_column_default(c) @@ -481,10 +478,10 @@ class DefaultExecutionContext(base.ExecutionContext): val = drunner.get_column_onupdate(c) if val is not None: param[c.key] = val - self.compiled_parameters = params + del self.current_parameters else: - compiled_parameters = self.compiled_parameters[0] + self.current_parameters = compiled_parameters = self.compiled_parameters[0] drunner = self.dialect.defaultrunner(self) for c in self.compiled.prefetch: @@ -495,6 +492,7 @@ 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) @@ -505,5 +503,5 @@ class DefaultExecutionContext(base.ExecutionContext): self.postfetch_cols = self.compiled.postfetch self.prefetch_cols = self.compiled.prefetch - + DefaultDialect.execution_ctx_cls = DefaultExecutionContext |