- merged inline inserts branch

- all executemany() style calls put all sequences and SQL defaults inline into a single SQL statement
and don't do any pre-execution
- regular Insert and Update objects can have inline=True, forcing all executions to be inlined.
- no last_inserted_ids(), lastrow_has_defaults() available with inline execution
- calculation of pre/post execute pushed into compiler; DefaultExecutionContext greatly simplified
- fixed postgres reflection of primary key columns with no sequence/default generator, sets autoincrement=False
- fixed postgres executemany() behavior regarding sequences present, not present, passivedefaults, etc.
- all tests pass for sqlite, mysql, postgres; oracle tests pass as well as they did previously including all
insert/update/default functionality

12 files changed, 182 insertions, 211 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:
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 496af751b..6f3badb44 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -75,6 +75,10 @@ class Dialect(object):
     supports_sane_rowcount
       Indicate whether the dialect properly implements rowcount for ``UPDATE`` and ``DELETE`` statements.
 
+    supports_sane_multi_rowcount
+      Indicate whether the dialect properly implements rowcount for ``UPDATE`` and ``DELETE`` statements
+      when executed via executemany.
+
     """
 
     def create_connect_args(self, url):
@@ -677,7 +681,7 @@ class Connection(Connectable):
             try:
                 self.__engine.dialect.do_begin(self.connection)
             except Exception, e:
-                raise exceptions.SQLError(None, None, e)
+                raise exceptions.DBAPIError.instance(None, None, e)
 
     def _rollback_impl(self):
         if self.__connection.is_valid:
@@ -686,7 +690,7 @@ class Connection(Connectable):
             try:
                 self.__engine.dialect.do_rollback(self.connection)
             except Exception, e:
-                raise exceptions.SQLError(None, None, e)
+                raise exceptions.DBAPIError.instance(None, None, e)
         self.__transaction = None
 
     def _commit_impl(self):
@@ -696,7 +700,7 @@ class Connection(Connectable):
             try:
                 self.__engine.dialect.do_commit(self.connection)
             except Exception, e:
-                raise exceptions.SQLError(None, None, e)
+                raise exceptions.DBAPIError.instance(None, None, e)
         self.__transaction = None
 
     def _savepoint_impl(self, name=None):
@@ -807,12 +811,13 @@ class Connection(Connectable):
         return self._execute_clauseelement(func.select(), multiparams, params)
 
     def _execute_clauseelement(self, elem, multiparams=None, params=None):
-        executemany = multiparams is not None and len(multiparams) > 0
-        if executemany:
+        if multiparams:
             param = multiparams[0]
+            executemany = len(multiparams) > 1
         else:
             param = params
-        return self._execute_compiled(elem.compile(dialect=self.dialect, parameters=param), multiparams, params)
+            executemany = False
+        return self._execute_compiled(elem.compile(dialect=self.dialect, parameters=param, inline=executemany), multiparams, params)
 
     def _execute_compiled(self, compiled, multiparams=None, params=None):
         """Execute a sql.Compiled object."""
@@ -856,7 +861,7 @@ class Connection(Connectable):
             self._autorollback()
             if self.__close_with_result:
                 self.close()
-            raise exceptions.SQLError(context.statement, context.parameters, e)
+            raise exceptions.DBAPIError.instance(context.statement, context.parameters, e)
 
     def __executemany(self, context):
         try:
@@ -869,7 +874,7 @@ class Connection(Connectable):
             self._autorollback()
             if self.__close_with_result:
                 self.close()
-            raise exceptions.SQLError(context.statement, context.parameters, e)
+            raise exceptions.DBAPIError.instance(context.statement, context.parameters, e)
 
     # poor man's multimethod/generic function thingy
     executors = {
@@ -1346,12 +1351,16 @@ class ResultProxy(object):
         return self.context.lastrow_has_defaults()
 
     def supports_sane_rowcount(self):
-        """Return ``supports_sane_rowcount()`` from the underlying ExecutionContext.
+        """Return ``supports_sane_rowcount`` from the dialect.
 
-        See ExecutionContext for details.
+        """
+        return self.dialect.supports_sane_rowcount
+
+    def supports_sane_multi_rowcount(self):
+        """Return ``supports_sane_multi_rowcount`` from the dialect.
         """
 
-        return self.context.supports_sane_rowcount()
+        return self.dialect.supports_sane_multi_rowcount
 
     def _get_col(self, row, key):
         rec = self._key_cache[key]
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 3322753bb..deea34da3 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -30,6 +30,7 @@ class DefaultDialect(base.Dialect):
     supports_unicode_statements = False
     max_identifier_length = 9999
     supports_sane_rowcount = True
+    supports_sane_multi_rowcount = True
 
     def __init__(self, convert_unicode=False, encoding='utf-8', default_paramstyle='named', paramstyle=None, dbapi=None, **kwargs):
         self.convert_unicode = convert_unicode
@@ -249,6 +250,9 @@ class DefaultExecutionContext(base.ExecutionContext):
     def supports_sane_rowcount(self):
         return self.dialect.supports_sane_rowcount
 
+    def supports_sane_multi_rowcount(self):
+        return self.dialect.supports_sane_multi_rowcount
+
     def last_inserted_ids(self):
         return self._last_inserted_ids
 
@@ -297,67 +301,45 @@ class DefaultExecutionContext(base.ExecutionContext):
         """generate default values for compiled insert/update statements,
         and generate last_inserted_ids() collection."""
 
-        if self.isinsert:
-            drunner = self.dialect.defaultrunner(self)
-            if self.executemany:
-                # executemany doesn't populate last_inserted_ids()
-                firstparam = self.compiled_parameters[0]
-                processors = firstparam.get_processors()
-                for c in self.compiled.statement.table.c:
-                    if c.default is not None:
-                        params = self.compiled_parameters
-                        for param in params:
-                            if not c.key in param or param.get_original(c.key) is None:
-                                self.compiled_parameters = param
-                                newid = drunner.get_column_default(c)
-                                if newid is not None:
-                                    param.set_value(c.key, newid)
-                        self.compiled_parameters = params
-            else:
-                param = self.compiled_parameters
-                processors = param.get_processors()
-                last_inserted_ids = []
-                for c in self.compiled.statement.table.c:
-                    if c in self.compiled.inline_params:
-                        self._postfetch_cols.add(c)
-                        if c.primary_key:
-                            last_inserted_ids.append(None)
-                    elif not c.key in param or param.get_original(c.key) is None:
-                        if isinstance(c.default, schema.PassiveDefault):
-                            self._postfetch_cols.add(c)
-                        newid = drunner.get_column_default(c)
-                        if newid is not None:
-                            param.set_value(c.key, newid)
-                            if c.primary_key:
-                                last_inserted_ids.append(param.get_processed(c.key, processors))
-                        elif c.primary_key:
-                            last_inserted_ids.append(None)
-                    elif c.primary_key:
-                        last_inserted_ids.append(param.get_processed(c.key, processors))
-                self._last_inserted_ids = last_inserted_ids
-                self._last_inserted_params = param
-
-
-        elif self.isupdate:
-            drunner = self.dialect.defaultrunner(self)
+        if self.isinsert or self.isupdate:
             if self.executemany:
-                for c in self.compiled.statement.table.c:
-                    if c.onupdate is not None:
-                        params = self.compiled_parameters
-                        for param in params:
-                            if not c.key in param or param.get_original(c.key) is None:
-                                self.compiled_parameters = param
-                                value = drunner.get_column_onupdate(c)
-                                if value is not None:
-                                    param.set_value(c.key, value)
-                        self.compiled_parameters = params
+                if len(self.compiled.prefetch):
+                    drunner = self.dialect.defaultrunner(self)
+                    params = self.compiled_parameters
+                    for param in params:
+                        self.compiled_parameters = param
+                        for c in self.compiled.prefetch:
+                            if self.isinsert:
+                                val = drunner.get_column_default(c)
+                            else:
+                                val = drunner.get_column_onupdate(c)
+                            if val is not None:
+                                param.set_value(c.key, val)
+                    self.compiled_parameters = params
+                    
             else:
-                param = self.compiled_parameters
-                for c in self.compiled.statement.table.c:
-                    if c in self.compiled.inline_params:
-                        self._postfetch_cols.add(c)
-                    elif c.onupdate is not None and (not c.key in param or param.get_original(c.key) is None):
-                        value = drunner.get_column_onupdate(c)
-                        if value is not None:
-                            param.set_value(c.key, value)
-                self._last_updated_params = param
+                drunner = self.dialect.defaultrunner(self)
+                if self.isinsert:
+                    self._last_inserted_ids = []
+                for c in self.compiled.prefetch:
+                    print "PREFETCH COL", c.key
+                    if self.isinsert:
+                        val = drunner.get_column_default(c)
+                    else:
+                        val = drunner.get_column_onupdate(c)
+                    if val is not None:
+                        self.compiled_parameters.set_value(c.key, val)
+
+                if self.isinsert:
+                    processors = self.compiled_parameters.get_processors()
+                    for c in self.compiled.statement.table.primary_key:
+                        if c.key in self.compiled_parameters:
+                            self._last_inserted_ids.append(self.compiled_parameters.get_processed(c.key, processors))
+                        else:
+                            self._last_inserted_ids.append(None)
+                            
+                self._postfetch_cols = self.compiled.postfetch
+                if self.isinsert:
+                    self._last_inserted_params = self.compiled_parameters
+                else:
+                    self._last_updated_params = self.compiled_parameters
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 7fa5d4366..524c4b0d5 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -74,7 +74,7 @@ class DefaultEngineStrategy(EngineStrategy):
                 try:
                     return dbapi.connect(*cargs, **cparams)
                 except Exception, e:
-                    raise exceptions.DBAPIError(None, None, e)
+                    raise exceptions.DBAPIError.instance(None, None, e)
             creator = kwargs.pop('creator', connect)
 
             poolclass = (kwargs.pop('poolclass', None) or
diff --git a/lib/sqlalchemy/exceptions.py b/lib/sqlalchemy/exceptions.py
index 709b0a3da..9c7caedd0 100644
--- a/lib/sqlalchemy/exceptions.py
+++ b/lib/sqlalchemy/exceptions.py
@@ -81,20 +81,20 @@ class DBAPIError(SQLAlchemyError):
     Its type and properties are DB-API implementation specific.  
     """
 
-    def __new__(cls, statement, params, orig, *args, **kw):
+    def instance(cls, statement, params, orig):
         # Don't ever wrap these, just return them directly as if
         # DBAPIError didn't exist.
         if isinstance(orig, (KeyboardInterrupt, SystemExit)):
             return orig
         
         if orig is not None:
-            name, glob = type(orig).__name__, globals()
+            name, glob = orig.__class__.__name__, globals()
             if name in glob and issubclass(glob[name], DBAPIError):
                 cls = glob[name]
             
-        return SQLAlchemyError.__new__(cls, statement, params, orig,
-                                       *args, **kw)
-
+        return cls(statement, params, orig)
+    instance = classmethod(instance)
+    
     def __init__(self, statement, params, orig):
         SQLAlchemyError.__init__(self, "(%s) %s" %
                                  (orig.__class__.__name__, str(orig)))
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 88c689a87..3b837d275 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -374,7 +374,7 @@ class ManyToManyDP(DependencyProcessor):
             # TODO: precompile the delete/insert queries?
             statement = self.secondary.delete(sql.and_(*[c == sql.bindparam(c.key, type_=c.type) for c in self.secondary.c if c.key in associationrow]))
             result = connection.execute(statement, secondary_delete)
-            if result.supports_sane_rowcount() and result.rowcount != len(secondary_delete):
+            if result.supports_sane_multi_rowcount() and result.rowcount != len(secondary_delete):
                 raise exceptions.ConcurrentModificationError("Deleted rowcount %d does not match number of objects deleted %d" % (result.rowcount, len(secondary_delete)))
 
         if secondary_insert:
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 51853ddca..76676e4e5 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1102,6 +1102,8 @@ class Mapper(object):
                             if value is NO_ATTRIBUTE:
                                 continue
                             if col.default is None or value is not None:
+                                # TODO: clauseelments as bind params should 
+                                # be handled by Insert/Update expression upon execute()
                                 if isinstance(value, sql.ClauseElement):
                                     value_params[col] = value
                                 else:
@@ -1152,6 +1154,7 @@ class Mapper(object):
                     (obj, params, mapper, connection, value_params) = rec
                     c = connection.execute(statement.values(value_params), params)
                     primary_key = c.last_inserted_ids()
+
                     if primary_key is not None:
                         i = 0
                         for col in mapper.pks_by_table[table]:
@@ -1268,8 +1271,8 @@ class Mapper(object):
                     clause.clauses.append(mapper.version_id_col == sql.bindparam(mapper.version_id_col.key, type_=mapper.version_id_col.type, unique=True))
                 statement = table.delete(clause)
                 c = connection.execute(statement, del_objects)
-                if c.supports_sane_rowcount() and c.rowcount != len(del_objects):
-                    raise exceptions.ConcurrentModificationError("Updated rowcount %d does not match number of objects updated %d" % (c.rowcount, len(delete)))
+                if c.supports_sane_multi_rowcount() and c.rowcount != len(del_objects):
+                    raise exceptions.ConcurrentModificationError("Deleted rowcount %d does not match number of objects deleted %d" % (c.rowcount, len(del_objects)))
 
         for obj, connection in deleted_objects:
             for mapper in object_mapper(obj).iterate_to_root():
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 6aab22a79..e8cc3378e 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -90,7 +90,7 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
 
     operators = OPERATORS
     
-    def __init__(self, dialect, statement, parameters=None, **kwargs):
+    def __init__(self, dialect, statement, parameters=None, inline=False, **kwargs):
         """Construct a new ``DefaultCompiler`` object.
 
         dialect
@@ -113,6 +113,9 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
         # if we are insert/update.  set to true when we visit an INSERT or UPDATE
         self.isinsert = self.isupdate = False
         
+        # compile INSERT/UPDATE defaults/sequences inlined (no pre-execute)
+        self.inline = inline or getattr(statement, 'inline', False)
+        
         # a dictionary of bind parameter keys to _BindParamClause instances.
         self.binds = {}
         
@@ -151,12 +154,6 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
         # an IdentifierPreparer that formats the quoting of identifiers
         self.preparer = self.dialect.identifier_preparer
         
-        # for UPDATE and INSERT statements, a set of columns whos values are being set
-        # from a SQL expression (i.e., not one of the bind parameter values).  if present,
-        # default-value logic in the Dialect knows not to fire off column defaults
-        # and also knows postfetching will be needed to get the values represented by these
-        # parameters.
-        self.inline_params = None
         
     def after_compile(self):
         # this re will search for params like :param
@@ -615,26 +612,14 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
 
     def uses_sequences_for_inserts(self):
         return False
-        
-    def visit_insert(self, insert_stmt):
 
-        # search for columns who will be required to have an explicit bound value.
-        # for inserts, this includes Python-side defaults, columns with sequences for dialects
-        # that support sequences, and primary key columns for dialects that explicitly insert
-        # pre-generated primary key values
-        required_cols = [
-            c for c in insert_stmt.table.c
-            if \
-                isinstance(c, schema.SchemaItem) and \
-                (self.parameters is None or self.parameters.get(c.key, None) is None) and \
-                (
-                    ((c.primary_key or isinstance(c.default, schema.Sequence)) and self.uses_sequences_for_inserts()) or 
-                    isinstance(c.default, schema.ColumnDefault)
-                )
-        ]
+    def visit_sequence(self, seq):
+        raise NotImplementedError()
+
+    def visit_insert(self, insert_stmt):
 
         self.isinsert = True
-        colparams = self._get_colparams(insert_stmt, required_cols)
+        colparams = self._get_colparams(insert_stmt)
 
         return ("INSERT INTO " + self.preparer.format_table(insert_stmt.table) + " (" + string.join([self.preparer.format_column(c[0]) for c in colparams], ', ') + ")" +
          " VALUES (" + string.join([c[1] for c in colparams], ', ') + ")")
@@ -642,17 +627,8 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
     def visit_update(self, update_stmt):
         self.stack.append({'from':util.Set([update_stmt.table])})
         
-        # search for columns who will be required to have an explicit bound value.
-        # for updates, this includes Python-side "onupdate" defaults.
-        required_cols = [c for c in update_stmt.table.c 
-            if
-            isinstance(c, schema.SchemaItem) and \
-            (self.parameters is None or self.parameters.get(c.key, None) is None) and
-            isinstance(c.onupdate, schema.ColumnDefault)
-        ]
-
         self.isupdate = True
-        colparams = self._get_colparams(update_stmt, required_cols)
+        colparams = self._get_colparams(update_stmt)
 
         text = "UPDATE " + self.preparer.format_table(update_stmt.table) + " SET " + string.join(["%s=%s" % (self.preparer.format_column(c[0]), c[1]) for c in colparams], ', ')
 
@@ -663,13 +639,10 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
         
         return text
 
-    def _get_colparams(self, stmt, required_cols):
+    def _get_colparams(self, stmt):
         """create a set of tuples representing column/string pairs for use 
         in an INSERT or UPDATE statement.
         
-        This method may generate new bind params within this compiled
-        based on the given set of "required columns", which are required
-        to have a value set in the statement.
         """
 
         def create_bind_param(col, value):
@@ -677,8 +650,9 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
             self.binds[col.key] = bindparam
             return self.bindparam_string(self._truncate_bindparam(bindparam))
 
-        self.inline_params = util.Set()
-
+        self.postfetch = util.Set()
+        self.prefetch = util.Set()
+        
         def to_col(key):
             if not isinstance(key, sql._ColumnClause):
                 return stmt.table.columns.get(unicode(key), key)
@@ -701,23 +675,53 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor):
             for k, v in stmt.parameters.iteritems():
                 parameters.setdefault(getattr(k, 'key', k), v)
 
-        for col in required_cols:
-            parameters.setdefault(col.key, None)
-
         # create a list of column assignment clauses as tuples
         values = []
         for c in stmt.table.columns:
             if c.key in parameters:
                 value = parameters[c.key]
-            else:
-                continue
-            if sql._is_literal(value):
-                value = create_bind_param(c, value)
-            else:
-                self.inline_params.add(c)
-                value = self.process(value)
-            values.append((c, value))
-        
+                if sql._is_literal(value):
+                    value = create_bind_param(c, value)
+                else:
+                    self.postfetch.add(c)
+                    value = self.process(value.self_group())
+                values.append((c, value))
+            elif isinstance(c, schema.Column):
+                if self.isinsert:
+                    if isinstance(c.default, schema.ColumnDefault):
+                        if self.inline and isinstance(c.default.arg, sql.ClauseElement):
+                            values.append((c, self.process(c.default.arg)))
+                            self.postfetch.add(c)
+                        else:
+                            values.append((c, create_bind_param(c, None)))
+                            self.prefetch.add(c)
+                    elif isinstance(c.default, schema.PassiveDefault):
+                        if c.primary_key and self.uses_sequences_for_inserts() and not self.inline:
+                            values.append((c, create_bind_param(c, None)))
+                            self.prefetch.add(c)
+                        else:
+                            self.postfetch.add(c)
+                    elif (c.primary_key or isinstance(c.default, schema.Sequence)) and self.uses_sequences_for_inserts():
+                        if self.inline:
+                            if c.default is not None:
+                                proc = self.process(c.default)
+                                if proc is not None:
+                                    values.append((c, proc))
+                                    self.postfetch.add(c)
+                        else:
+                            print "ISINSERT, HAS A SEQUENCE, IS PRIMARY KEY, ADDING PREFETCH:", c.key
+                            values.append((c, create_bind_param(c, None)))
+                            self.prefetch.add(c)
+                elif self.isupdate:
+                    if isinstance(c.onupdate, schema.ColumnDefault):
+                        if self.inline and isinstance(c.onupdate.arg, sql.ClauseElement):
+                            values.append((c, self.process(c.onupdate.arg)))
+                            self.postfetch.add(c)
+                        else:
+                            values.append((c, create_bind_param(c, None)))
+                            self.prefetch.add(c)
+                    elif isinstance(c.onupdate, schema.PassiveDefault):
+                        self.postfetch.add(c)
         return values
 
     def visit_delete(self, delete_stmt):
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index b31ccbe44..ac56289e8 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -249,7 +249,7 @@ def subquery(alias, *args, **kwargs):
 
     return Select(*args, **kwargs).alias(alias)
 
-def insert(table, values = None, **kwargs):
+def insert(table, values=None, inline=False):
     """Return an [sqlalchemy.sql#Insert] clause element.
 
     Similar functionality is available via the ``insert()`` method on
@@ -266,6 +266,10 @@ def insert(table, values = None, **kwargs):
       bind parameters also are None during the compile phase, then the
       column specifications will be generated from the full list of
       table columns.
+      
+    inline
+      if True, SQL defaults will be compiled 'inline' into the statement
+      and not pre-executed.
 
     If both `values` and compile-time bind parameters are present, the
     compile-time bind parameters override the information specified
@@ -283,9 +287,9 @@ def insert(table, values = None, **kwargs):
     against the ``INSERT`` statement.
     """
 
-    return Insert(table, values, **kwargs)
+    return Insert(table, values, inline=inline)
 
-def update(table, whereclause = None, values = None, **kwargs):
+def update(table, whereclause=None, values=None, inline=False):
     """Return an [sqlalchemy.sql#Update] clause element.
 
     Similar functionality is available via the ``update()`` method on
@@ -307,6 +311,11 @@ def update(table, whereclause = None, values = None, **kwargs):
       ``SET`` conditions will be generated from the full list of table
       columns.
 
+    inline
+      if True, SQL defaults will be compiled 'inline' into the statement
+      and not pre-executed.
+
+
     If both `values` and compile-time bind parameters are present, the
     compile-time bind parameters override the information specified
     within `values` on a per-key basis.
@@ -323,7 +332,7 @@ def update(table, whereclause = None, values = None, **kwargs):
     against the ``UPDATE`` statement.
     """
 
-    return Update(table, whereclause, values, **kwargs)
+    return Update(table, whereclause=whereclause, values=values, inline=inline)
 
 def delete(table, whereclause = None, **kwargs):
     """Return a [sqlalchemy.sql#Delete] clause element.
@@ -959,14 +968,14 @@ class ClauseElement(object):
             compile_params = multiparams[0]
         else:
             compile_params = params
-        return self.compile(bind=self.bind, parameters=compile_params).execute(*multiparams, **params)
+        return self.compile(bind=self.bind, parameters=compile_params, inline=(len(multiparams) > 1)).execute(*multiparams, **params)
 
     def scalar(self, *multiparams, **params):
         """Compile and execute this ``ClauseElement``, returning the result's scalar representation."""
 
         return self.execute(*multiparams, **params).scalar()
 
-    def compile(self, bind=None, parameters=None, compiler=None, dialect=None):
+    def compile(self, bind=None, parameters=None, compiler=None, dialect=None, inline=False):
         """Compile this SQL expression.
 
         Uses the given ``Compiler``, or the given ``AbstractDialect``
@@ -995,16 +1004,16 @@ class ClauseElement(object):
 
         if compiler is None:
             if dialect is not None:
-                compiler = dialect.statement_compiler(dialect, self, parameters)
+                compiler = dialect.statement_compiler(dialect, self, parameters, inline=inline)
             elif bind is not None:
-                compiler = bind.statement_compiler(self, parameters)
+                compiler = bind.statement_compiler(self, parameters, inline=inline)
             elif self.bind is not None:
-                compiler = self.bind.statement_compiler(self, parameters)
+                compiler = self.bind.statement_compiler(self, parameters, inline=inline)
 
         if compiler is None:
             from sqlalchemy.engine.default import DefaultDialect
             dialect = DefaultDialect()
-            compiler = dialect.statement_compiler(dialect, self, parameters=parameters)
+            compiler = dialect.statement_compiler(dialect, self, parameters=parameters, inline=inline)
         compiler.compile()
         return compiler
     
@@ -2705,13 +2714,13 @@ class TableClause(FromClause):
     def select(self, whereclause = None, **params):
         return select([self], whereclause, **params)
 
-    def insert(self, values = None):
-        return insert(self, values=values)
+    def insert(self, values=None, inline=False):
+        return insert(self, values=values, inline=inline)
 
-    def update(self, whereclause = None, values = None):
-        return update(self, whereclause, values)
+    def update(self, whereclause=None, values=None, inline=False):
+        return update(self, whereclause=whereclause, values=values, inline=inline)
 
-    def delete(self, whereclause = None):
+    def delete(self, whereclause=None):
         return delete(self, whereclause)
 
     def _get_from_objects(self, **modifiers):
@@ -3213,41 +3222,26 @@ class _UpdateBase(ClauseElement):
         return iter([self.table])
 
     def _process_colparams(self, parameters):
-        """Receive the *values* of an ``INSERT`` or ``UPDATE`` statement and construct appropriate bind parameters."""
 
         if parameters is None:
             return None
 
         if isinstance(parameters, (list, tuple)):
             pp = {}
-            i = 0
-            for c in self.table.c:
+            for i, c in enumerate(self.table.c):
                 pp[c.key] = parameters[i]
-                i +=1
-            parameters = pp
-
-        for key in parameters.keys():
-            value = parameters[key]
-            if isinstance(value, ClauseElement):
-                parameters[key] = value.self_group()
-            elif _is_literal(value):
-                if _is_literal(key):
-                    col = self.table.c[key]
-                else:
-                    col = key
-                try:
-                    parameters[key] = bindparam(col, value, unique=True)
-                except KeyError:
-                    del parameters[key]
-        return parameters
-
+            return pp
+        else:
+            return parameters
+            
     def _find_engine(self):
         return self.table.bind
 
 class Insert(_UpdateBase):
-    def __init__(self, table, values=None):
+    def __init__(self, table, values=None, inline=False):
         self.table = table
         self.select = None
+        self.inline=inline
         self.parameters = self._process_colparams(values)
 
     def get_children(self, **kwargs):
@@ -3271,9 +3265,10 @@ class Insert(_UpdateBase):
         return u
 
 class Update(_UpdateBase):
-    def __init__(self, table, whereclause, values=None):
+    def __init__(self, table, whereclause, values=None, inline=False):
         self.table = table
         self._whereclause = whereclause
+        self.inline = inline
         self.parameters = self._process_colparams(values)
 
     def get_children(self, **kwargs):