From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 13 Oct 2005 00:24:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~564
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=811648d460b5e2577570b13df67ff829af9f170b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index f6d56d207e..375f3c1778 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -61,12 +61,13 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
             last_inserted_ids = []
             for primary_key in compiled.statement.table.primary_keys:
                 # pseudocode
-                if echo is True or self._echo:
-                    self.log(primary_key.sequence.text)
-                res = cursor.execute(primary_key.sequence.text)
-                newid = res.fetchrow()[0]
-                parameters[primary_key.key] = newid
-                last_inserted_ids.append(newid)
+                if parameters[primary_key.key] is None:
+                    if echo is True:
+                        self.log(primary_key.sequence.text)
+                    res = cursor.execute(primary_key.sequence.text)
+                    newid = res.fetchrow()[0]
+                    parameters[primary_key.key] = newid
+                    last_inserted_ids.append(newid)
             self.context.last_inserted_ids = last_inserted_ids
 
     def dbapi(self):
diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index ef585b6a21..7f090139d5 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -93,6 +93,7 @@ class UOWAttributeManager(attributes.AttributeManager):
         if hasattr(obj, '_instance_key'):
             self.uow.register_dirty(obj)
         else:
+            #raise "hi"
             self.uow.register_new(obj)
 
     def create_prop(self, key, uselist, **kwargs):