From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 17 Dec 2005 19:35:00 +0000 (+0000)
Subject: fix to oracle function select, users table in test should be non-sequence
X-Git-Tag: rel_0_1_0~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e4b0d17a9f4d9dd1ba293dac3e0966f7b80f69c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix to oracle function select, users table in test should be non-sequence
---

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 163d387bc4..ae1445759d 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -230,6 +230,9 @@ class OracleSchemaDropper(ansisql.ANSISchemaDropper):
         self.execute()
 
 class OracleDefaultRunner(ansisql.ANSIDefaultRunner):
+    def exec_default_sql(self, default):
+        c = sql.select([default.arg], from_obj=["DUAL"], engine=self.engine).compile()
+        return self.proxy(str(c), c.get_params()).fetchone()[0]
+    
     def visit_sequence(self, seq):
-        c = self.proxy("select %s.nextval from dual" % seq.name)
-        return c.fetchone()[0]
+        return self.exec_default_sql(seq.name + ".nextval")
diff --git a/test/tables.py b/test/tables.py
index 807ecf7648..d0d0692488 100644
--- a/test/tables.py
+++ b/test/tables.py
@@ -12,7 +12,7 @@ db = testbase.db
 
 
 users = Table('users', db,
-    Column('user_id', Integer, Sequence('user_id_seq', optional=False), primary_key = True),
+    Column('user_id', Integer, Sequence('user_id_seq', optional=True), primary_key = True),
     Column('user_name', String(40)),
 )