From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 1 Sep 2007 22:46:16 +0000 (+0000)
Subject: adjusting firebird, obviously needs someone to test
X-Git-Tag: rel_0_4beta6~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fab4615d6dbc4bae26254aab061dde074f462309;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjusting firebird, obviously needs someone to test
---

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index b25a8de022..5f258a0296 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -307,6 +307,9 @@ class FBCompiler(compiler.DefaultCompiler):
         else:
             return func.name
 
+    def default_from(self):
+        return " FROM rdb$database"
+
     def visit_sequence(self, seq):
         return "gen_id(" + seq.name + ", 1)"
         
@@ -356,12 +359,8 @@ class FBSchemaDropper(compiler.SchemaDropper):
 
 
 class FBDefaultRunner(base.DefaultRunner):
-    def exec_default_sql(self, default):
-        c = sql.select([default.arg], from_obj=["rdb$database"]).compile(bind=self.connection)
-        return self.connection.execute_compiled(c).scalar()
-
     def visit_sequence(self, seq):
-        return self.connection.execute_text("SELECT gen_id(" + seq.name + ", 1) FROM rdb$database").scalar()
+        return self.execute_string("SELECT gen_id(" + seq.name + ", 1) FROM rdb$database")
 
 
 RESERVED_WORDS = util.Set(