From fab4615d6dbc4bae26254aab061dde074f462309 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 1 Sep 2007 22:46:16 +0000 Subject: [PATCH] adjusting firebird, obviously needs someone to test --- lib/sqlalchemy/databases/firebird.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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( -- 2.47.3