(no commit message)

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index f6d56d207ece94ef86f89dd39c081b7aed2a1578..375f3c177863c4dbead4081bafb05c3fdd056c58 100644 (file)
--- 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 ef585b6a213f54e1645e84b4e096cf4ca91e2c7c..7f090139d5a5f52220daa11e4febbee13344942c 100644 (file)
--- 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):