From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 23 Oct 2005 18:21:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d857f6e365bf755c1507e808d490f2086b60279d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 9b8d103edc..5d6265dbf2 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -109,13 +109,13 @@ class OracleSQLEngine(ansisql.ANSISQLEngine):
 
     def pre_exec(self, connection, cursor, statement, parameters, echo = None, compiled = None, **kwargs):
         # if a sequence was explicitly defined we do it here
-        if compiled is None: return
+        if compiled is None or isinstance(parameters, list): return
         if getattr(compiled, "isinsert", False):
             last_inserted_ids = []
             for primary_key in compiled.statement.table.primary_keys:
                 if not parameters.has_key(primary_key.key) or parameters[primary_key.key] is None:
                     if primary_key.sequence is None:
-                        raise "Oracle primary key columns require schema.Sequence to create ids"
+                        raise "Column '%s.%s': Oracle primary key columns require schema.Sequence to create ids" % (primary_key.table.name, primary_key.name)
                     if echo is True or self.echo:
                         self.log("select %s.nextval from dual" % primary_key.sequence.name)
                     cursor.execute("select %s.nextval from dual" % primary_key.sequence.name)