Firebird now uses dialect.preparer to format sequences names.

UnicodeTest (reflection.py) runs ok now.

diff --git a/CHANGES b/CHANGES
index c0b559baf778cc5465ed7b47a3180b260ffc9d44..9fd4b82ca619401a07d22db60bbbf1795385fa6f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,9 @@ CHANGES
 
 - Firebird dialect now uses SingletonThreadPool as poolclass.
 
+- Firebird now uses dialect.preparer to format sequences names
+
+
 0.4.0beta6
 ----------
 

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index b71e47e9bffd6e3c05b051d2a76038bd038c8e31..22537d7ba8f5b227a865159966ca7bdab138051f 100644 (file)
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -324,7 +324,7 @@ class FBCompiler(compiler.DefaultCompiler):
         return " FROM rdb$database"
 
     def visit_sequence(self, seq):
-        return "gen_id(" + seq.name + ", 1)"
+        return "gen_id(%s, 1)" % self.preparer.format_sequence(seq)
 
     def get_select_precolumns(self, select):
         """Called when building a ``SELECT`` statement, position is just
@@ -361,19 +361,20 @@ class FBSchemaGenerator(compiler.SchemaGenerator):
         return colspec
 
     def visit_sequence(self, sequence):
-        self.append("CREATE GENERATOR %s" % sequence.name)
+        self.append("CREATE GENERATOR %s" % self.preparer.format_sequence(sequence))
         self.execute()
 
 
 class FBSchemaDropper(compiler.SchemaDropper):
     def visit_sequence(self, sequence):
-        self.append("DROP GENERATOR %s" % sequence.name)
+        self.append("DROP GENERATOR %s" % self.preparer.format_sequence(sequence))
         self.execute()
 
 
 class FBDefaultRunner(base.DefaultRunner):
     def visit_sequence(self, seq):
-        return self.execute_string("SELECT gen_id(" + seq.name + ", 1) FROM rdb$database")
+        return self.execute_string("SELECT gen_id(%s, 1) FROM rdb$database" % \
+            self.dialect.identifier_preparer.format_sequence(seq))
 
 
 RESERVED_WORDS = util.Set(