adjusting firebird, obviously needs someone to test

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index b25a8de0224de81db5174a53032bb42dadda6093..5f258a0296813128cdd2483ecc9e132308ac6b6c 100644 (file)
--- 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(