4 files changed, 17 insertions, 39 deletions
diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py
index 7552b897d..9f4847c45 100644
--- a/lib/sqlalchemy/databases/access.py
+++ b/lib/sqlalchemy/databases/access.py
@@ -244,7 +244,7 @@ class AccessDialect(default.DefaultDialect):
             c.execute(statement, parameters)
             self.context.rowcount = c.rowcount
         except Exception, e:
-            raise exceptions.SQLError(statement, parameters, e)
+            raise exceptions.DBAPIError.instance(statement, parameters, e)
 
     def has_table(self, connection, tablename, schema=None):
         # This approach seems to be more reliable that using DAO
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 8a23ce9a3..5f07ac296 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -494,7 +494,7 @@ class MSSQLDialect(default.DefaultDialect):
             self.context.rowcount = c.rowcount
             c.DBPROP_COMMITPRESERVE = "Y"
         except Exception, e:
-            raise exceptions.SQLError(statement, parameters, e)
+            raise exceptions.DBAPIError.instance(statement, parameters, e)
 
     def table_names(self, connection, schema):
         from sqlalchemy.databases import information_schema as ischema
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 9b3ffbf23..d0122c7a4 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -236,6 +236,7 @@ class OracleDialect(default.DefaultDialect):
     supports_unicode_statements = False
     max_identifier_length = 30
     supports_sane_rowcount = True
+    supports_sane_multi_rowcount = False
 
     def __init__(self, use_ansi=True, auto_setinputsizes=True, auto_convert_lobs=True, threaded=True, allow_twophase=True, **kwargs):
         default.DefaultDialect.__init__(self, default_paramstyle='named', **kwargs)
@@ -431,8 +432,6 @@ class OracleDialect(default.DefaultDialect):
         # locate the actual name of the table, the real owner, and any dblink clause needed.
         actual_name, owner, dblink = self._resolve_table_owner(connection, self._denormalize_name(table.name), table)
 
-        print "ACTUALNAME:", actual_name
-
         c = connection.execute ("select COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, DATA_DEFAULT from ALL_TAB_COLUMNS%(dblink)s where TABLE_NAME = :table_name and OWNER = :owner" % {'dblink':dblink}, {'table_name':actual_name, 'owner':owner})
 
                 
@@ -529,14 +528,6 @@ class OracleDialect(default.DefaultDialect):
         for name, value in fks.iteritems():
             table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1], name=name))
 
-    def do_executemany(self, c, statement, parameters, context=None):
-        rowcount = 0
-        for param in parameters:
-            c.execute(statement, param)
-            rowcount += c.rowcount
-        if context is not None:
-            context._rowcount = rowcount
-
 
 OracleDialect.logger = logging.class_logger(OracleDialect)
 
@@ -606,6 +597,9 @@ class OracleCompiler(compiler.DefaultCompiler):
     def uses_sequences_for_inserts(self):
         return True
 
+    def visit_sequence(self, seq):
+        return self.dialect.identifier_preparer.format_sequence(seq) + ".nextval"
+        
     def visit_alias(self, alias, asfrom=False, **kwargs):
         """Oracle doesn't like ``FROM table AS alias``.  Is the AS standard SQL??"""
         
@@ -614,19 +608,6 @@ class OracleCompiler(compiler.DefaultCompiler):
         else:
             return self.process(alias.original, **kwargs)
 
-    def visit_insert(self, insert):
-        """``INSERT`` s are required to have the primary keys be explicitly present.
-
-         Mapper will by default not put them in the insert statement
-         to comply with autoincrement fields that require they not be
-         present.  so, put them all in for all primary key columns.
-         """
-
-        for c in insert.table.primary_key:
-            if c.key not in self.parameters:
-                self.parameters[c.key] = None
-        return compiler.DefaultCompiler.visit_insert(self, insert)
-
     def _TODO_visit_compound_select(self, select):
         """Need to determine how to get ``LIMIT``/``OFFSET`` into a ``UNION`` for Oracle."""
         pass
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index eecdcebbd..a5c77f206 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -227,6 +227,7 @@ class PGDialect(default.DefaultDialect):
     supports_unicode_statements = False
     max_identifier_length = 63
     supports_sane_rowcount = True
+    supports_sane_multi_rowcount = False
 
     def __init__(self, use_oids=False, server_side_cursors=False, **kwargs):
         default.DefaultDialect.__init__(self, default_paramstyle='pyformat', **kwargs)
@@ -297,19 +298,6 @@ class PGDialect(default.DefaultDialect):
         else:
             return None
 
-    def do_executemany(self, c, statement, parameters, context=None):
-        """We need accurate rowcounts for updates, inserts and deletes.
-
-        ``psycopg2`` is not nice enough to produce this correctly for
-        an executemany, so we do our own executemany here.
-        """
-        rowcount = 0
-        for param in parameters:
-            c.execute(statement, param)
-            rowcount += c.rowcount
-        if context is not None:
-            context._rowcount = rowcount
-
     def has_table(self, connection, table_name, schema=None):
         # seems like case gets folded in pg_class...
         if schema is None:
@@ -473,7 +461,10 @@ class PGDialect(default.DefaultDialect):
         c = connection.execute(t, table=table_oid)
         for row in c.fetchall():
             pk = row[0]
-            table.primary_key.add(table.c[pk])
+            col = table.c[pk]
+            table.primary_key.add(col)
+            if col.default is None:
+                col.autoincrement=False
 
         # Foreign keys
         FK_SQL = """
@@ -555,6 +546,12 @@ class PGCompiler(compiler.DefaultCompiler):
     def uses_sequences_for_inserts(self):
         return True
 
+    def visit_sequence(self, seq):
+        if seq.optional:
+            return None
+        else:
+            return "nextval('%s')" % self.preparer.format_sequence(seq)
+        
     def limit_clause(self, select):
         text = ""
         if select._limit is not None: