diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-23 00:33:50 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-23 00:33:50 -0400 |
| commit | 085cb74edfbcfbb95a6c10f702aa717d997ea395 (patch) | |
| tree | 131233244ab88c074aa08840a2ecd290356390ce /lib | |
| parent | 88773096645736e3957594f4b50cd446f344fd37 (diff) | |
| parent | ae495c69adacdd341d4ab22df4eedbbc6cb9df8e (diff) | |
| download | sqlalchemy-085cb74edfbcfbb95a6c10f702aa717d997ea395.tar.gz | |
merge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index fc49c62fa..a8c336336 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -576,9 +576,14 @@ class DefaultExecutionContext(base.ExecutionContext): table = self.compiled.statement.table row = resultproxy.fetchone() - self._inserted_primary_key = [v is not None and v or row[c] - for c, v in zip(table.primary_key, self._inserted_primary_key) - ] + ipk = [] + 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 |