From 909758df8edf5e319127216bc2c4ce0fe780de21 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 17 Jun 2007 00:49:08 +0000 Subject: - result.last_inserted_ids() should return a list that is identically sized to the primary key constraint of the table. values that were "passively" created and not available via cursor.lastrowid will be None. - sqlite: string PK column inserts dont get overwritten with OID [ticket:603] --- lib/sqlalchemy/databases/mssql.py | 15 ++++++++------- lib/sqlalchemy/databases/mysql.py | 5 +++-- lib/sqlalchemy/databases/sqlite.py | 4 +++- 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'lib/sqlalchemy/databases') diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 4336296dd..2b6808eac 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -271,13 +271,14 @@ class MSSQLExecutionContext(default.DefaultExecutionContext): self.cursor.execute("SET IDENTITY_INSERT %s OFF" % self.compiled.statement.table.fullname) self.IINSERT = False elif self.HASIDENT: - if self.dialect.use_scope_identity: - self.cursor.execute("SELECT scope_identity() AS lastrowid") - else: - self.cursor.execute("SELECT @@identity AS lastrowid") - row = self.cursor.fetchone() - self._last_inserted_ids = [int(row[0])] - # print "LAST ROW ID", self._last_inserted_ids + if not len(self._last_inserted_ids) or self._last_inserted_ids[0] is None: + if self.dialect.use_scope_identity: + self.cursor.execute("SELECT scope_identity() AS lastrowid") + else: + self.cursor.execute("SELECT @@identity AS lastrowid") + row = self.cursor.fetchone() + self._last_inserted_ids = [int(row[0])] + self._last_inserted_ids[1:] + # print "LAST ROW ID", self._last_inserted_ids self.HASIDENT = False super(MSSQLExecutionContext, self).post_exec() diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py index 09825bef0..91d59f1e2 100644 --- a/lib/sqlalchemy/databases/mysql.py +++ b/lib/sqlalchemy/databases/mysql.py @@ -945,8 +945,9 @@ def descriptor(): class MySQLExecutionContext(default.DefaultExecutionContext): def post_exec(self): if self.compiled.isinsert: - self._last_inserted_ids = [self.cursor.lastrowid] - + if not len(self._last_inserted_ids) or self._last_inserted_ids[0] is None: + self._last_inserted_ids = [self.cursor.lastrowid] + self._last_inserted_ids[1:] + class MySQLDialect(ansisql.ANSIDialect): def __init__(self, **kwargs): ansisql.ANSIDialect.__init__(self, default_paramstyle='format', **kwargs) diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index aaaf55697..8e776fb26 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -148,7 +148,9 @@ def descriptor(): class SQLiteExecutionContext(default.DefaultExecutionContext): def post_exec(self): if self.compiled.isinsert: - self._last_inserted_ids = [self.cursor.lastrowid] + if not len(self._last_inserted_ids) or self._last_inserted_ids[0] is None: + self._last_inserted_ids = [self.cursor.lastrowid] + self._last_inserted_ids[1:] + super(SQLiteExecutionContext, self).post_exec() class SQLiteDialect(ansisql.ANSIDialect): -- cgit v1.2.1