From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 22 Oct 2005 04:43:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89fea7423b1f45373050a90e8928fd29e0ec71f7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index f64074b8bb..3cee340d41 100644
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -430,15 +430,12 @@ class Mapper(object):
                 for rec in insert:
                     (obj, params) = rec
                     statement.execute(**params)
-                    primary_key = table.engine.last_inserted_ids()[0]
-                    found = False
+                    primary_keys = table.engine.last_inserted_ids()
+                    i = 0
                     for col in self.primary_keys[table]:
                         if self._getattrbycolumn(obj, col) is None:
-                            if found:
-                                raise "Only one primary key per inserted row can be set via autoincrement/sequence"
-                            else:
-                                self._setattrbycolumn(obj, col, primary_key)
-                                found = True
+                            self._setattrbycolumn(obj, col, primary_keys[i])
+                        i+=1
                     self.extension.after_insert(self, obj)
                     
     def delete_obj(self, objects, uow):