From ae495c69adacdd341d4ab22df4eedbbc6cb9df8e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 22 Apr 2010 11:24:25 -0400 Subject: - Fixed bug that prevented implicit RETURNING from functioning properly with composite primary key that contained zeroes. [ticket:1778] --- lib/sqlalchemy/engine/default.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy') 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 -- cgit v1.2.1