postgres oids say byebye by default, putting hooks in for engines to determine column defaults externally to it having a 'default' property, beefed up unittests to support inserts with/without defaults (will fix oracle unit tests too)

4 files changed, 33 insertions, 10 deletions

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index a06abe598..bcd20349b 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -370,18 +370,25 @@ class ANSICompiler(sql.Compiled):
         """called when visiting an Insert statement, for each column in the table that
         contains a Sequence object."""
         pass
+    
+    def visit_insert_column(selef, column):
+        """called when visiting an Insert statement, for each column in the table
+        that is a NULL insert into the table"""
+        pass
         
     def visit_insert(self, insert_stmt):
         # set up a call for the defaults and sequences inside the table
         class DefaultVisitor(schema.SchemaVisitor):
+            def visit_column(s, c):
+                self.visit_insert_column(c)
             def visit_column_default(s, cd):
                 self.visit_insert_column_default(c, cd)
             def visit_sequence(s, seq):
                 self.visit_insert_sequence(c, seq)
         vis = DefaultVisitor()
         for c in insert_stmt.table.c:
-            if (self.parameters is None or self.parameters.get(c.key, None) is None) and c.default is not None:
-                c.default.accept_visitor(vis)
+            if (self.parameters is None or self.parameters.get(c.key, None) is None):
+                c.accept_visitor(vis)
         
         self.isinsert = True
         colparams = self._get_colparams(insert_stmt)
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 0e9328a20..3ae83cb8c 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -158,6 +158,7 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
 
     def post_exec(self, proxy, compiled, parameters, **kwargs):
         if getattr(compiled, "isinsert", False) and self.context.last_inserted_ids is None:
+            raise "cant use cursor.lastrowid without OIDs enabled"
             table = compiled.statement.table
             cursor = proxy()
             if cursor.lastrowid is not None and table is not None and len(table.primary_key):
@@ -190,8 +191,12 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
 
 class PGCompiler(ansisql.ANSICompiler):
 
-    def visit_insert_sequence(self, column, sequence):
-        if self.parameters.get(column.key, None) is None and not sequence.optional:
+    def visit_insert_column(self, column):
+        # Postgres advises against OID usage and turns it off in 8.1,
+        # effectively making cursor.lastrowid
+        # useless, effectively making reliance upon SERIAL useless.  
+        # so all column primary key inserts must be explicitly present
+        if column.primary_key:
             self.parameters[column.key] = None
 
     def limit_clause(self, select):
@@ -232,6 +237,13 @@ class PGSchemaDropper(ansisql.ANSISchemaDropper):
             self.execute()
 
 class PGDefaultRunner(ansisql.ANSIDefaultRunner):
+    def get_column_default(self, column):
+        if column.primary_key and isinstance(column.type, types.Integer) and (column.default is None or (isinstance(column.default, schema.Sequence) and column.default.optional)):
+            c = self.proxy("select nextval('%s_%s_seq')" % (column.table.name, column.name))
+            return c.fetchone()[0]
+        else:
+            return ansisql.ANSIDefaultRunner.get_column_default(self, column)
+    
     def visit_sequence(self, seq):
         if not seq.optional:
             c = self.proxy("select nextval('%s')" % seq.name)
diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index f23701424..f3cc8efad 100644
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -129,6 +129,12 @@ class DefaultRunner(schema.SchemaVisitor):
         self.proxy = proxy
         self.engine = engine
 
+    def get_column_default(self, column):
+        if column.default is not None:
+            return column.default.accept_visitor(self)
+        else:
+            return None
+
     def visit_sequence(self, seq):
         """sequences are not supported by default"""
         return None
@@ -425,11 +431,7 @@ class SQLEngine(schema.SchemaEngine):
                 need_lastrowid=False
                 for c in compiled.statement.table.c:
                     if not param.has_key(c.key) or param[c.key] is None:
-                        if c.default is not None:
-                            newid = c.default.accept_visitor(drunner)
-                        else:
-                            newid = None
-                            
+                        newid = drunner.get_column_default(c)
                         if newid is not None:
                             param[c.key] = newid
                             if c.primary_key:
@@ -481,6 +483,7 @@ class SQLEngine(schema.SchemaEngine):
                        post-processing on result-set values.
 
         commit      -  if True, will automatically commit the statement after completion. """
+        
         if parameters is None:
             parameters = {}
 
@@ -545,6 +548,7 @@ class SQLEngine(schema.SchemaEngine):
                        post-processing on result-set values.
 
         commit      -  if True, will automatically commit the statement after completion. """
+        
         if parameters is None:
             parameters = {}
 
diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py
index 27479ae9d..f9b62b9f5 100644
--- a/lib/sqlalchemy/mapping/mapper.py
+++ b/lib/sqlalchemy/mapping/mapper.py
@@ -466,7 +466,7 @@ class Mapper(object):
             # for this table, in the case that the user
             # specified custom primary key cols.
             for obj in objects:
-#                print "SAVE_OBJ we are " + hash_key(self) + " obj: " +  obj.__class__.__name__ + repr(id(obj))
+                #print "SAVE_OBJ we are " + hash_key(self) + " obj: " +  obj.__class__.__name__ + repr(id(obj))
                 params = {}
 
                 isinsert = not hasattr(obj, "_instance_key")