quoting facilities set up so that database-specific quoting can be

turned on for individual table, schema, and column identifiers when
used in all queries/creates/drops.  Enabled via "quote=True" in
Table or Column, as well as "quote_schema=True" in Table.  Thanks to
Aaron Spike for his excellent efforts.  [ticket:155]

5 files changed, 52 insertions, 8 deletions

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index bef185597..1cad4f37a 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -97,7 +97,10 @@ class FireBirdExecutionContext(default.DefaultExecutionContext):
  
     def defaultrunner(self, proxy):
         return FBDefaultRunner(self, proxy)
-        
+
+    def preparer(self):
+        return FBIdentifierPreparer()
+
 class FireBirdDialect(ansisql.ANSIDialect):
     def __init__(self, module = None, **params):
         global _initialized_kb
@@ -298,7 +301,7 @@ class FBCompiler(ansisql.ANSICompiler):
 
 class FBSchemaGenerator(ansisql.ANSISchemaGenerator):
     def get_column_specification(self, column, **kwargs):
-        colspec = column.name 
+        colspec = self.preparer.format_column(column) 
         colspec += " " + column.type.engine_impl(self.engine).get_col_spec()
         default = self.get_column_default_string(column)
         if default is not None:
@@ -325,5 +328,8 @@ class FBDefaultRunner(ansisql.ANSIDefaultRunner):
     def visit_sequence(self, seq):
         return self.proxy("SELECT gen_id(" + seq.name + ", 1) FROM rdb$database").fetchone()[0]
 
+class FBIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
+    def __init__(self):
+        super(FBIdentifierPreparer,self).__init__(omit_schema=True)
 
 dialect = FireBirdDialect
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 690b71863..414ca87e7 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -268,6 +268,9 @@ class MSSQLDialect(ansisql.ANSIDialect):
     def defaultrunner(self, engine, proxy):
         return MSSQLDefaultRunner(engine, proxy)
 
+    def preparer(self):
+        return MSSQLIdentifierPreparer()
+
     def get_default_schema_name(self):
         return "dbo"
         
@@ -510,7 +513,7 @@ class MSSQLCompiler(ansisql.ANSICompiler):
         
 class MSSQLSchemaGenerator(ansisql.ANSISchemaGenerator):
     def get_column_specification(self, column, **kwargs):
-        colspec = column.name + " " + column.type.engine_impl(self.engine).get_col_spec()
+        colspec = self.preparer.format_column(column) + " " + column.type.engine_impl(self.engine).get_col_spec()
 
         # install a IDENTITY Sequence if we have an implicit IDENTITY column
         if column.primary_key and isinstance(column.type, sqltypes.Integer):
@@ -538,4 +541,14 @@ class MSSQLSchemaDropper(ansisql.ANSISchemaDropper):
 class MSSQLDefaultRunner(ansisql.ANSIDefaultRunner):
     pass
 
+class MSSQLIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
+    def __init__(self):
+        super(MSSQLIdentifierPreparer, self).__init__(initial_quote='[', final_quote=']')
+    def _escape_identifier(self, value):
+        #TODO: determin MSSQL's escapeing rules
+        return value
+    def _fold_identifier_case(self, value):
+        #TODO: determin MSSQL's case folding rules
+        return value
+
 dialect = MSSQLDialect
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index df661daac..56f2125ac 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -298,6 +298,9 @@ class MySQLDialect(ansisql.ANSIDialect):
     def schemadropper(self, *args, **kwargs):
         return MySQLSchemaDropper(*args, **kwargs)
 
+    def preparer(self):
+        return MySQLIdentifierPreparer()
+
     def do_rollback(self, connection):
         # some versions of MySQL just dont support rollback() at all....
         try:
@@ -428,7 +431,7 @@ class MySQLCompiler(ansisql.ANSICompiler):
         
 class MySQLSchemaGenerator(ansisql.ANSISchemaGenerator):
     def get_column_specification(self, column, override_pk=False, first_pk=False):
-        colspec = column.name + " " + column.type.engine_impl(self.engine).get_col_spec()
+        colspec = self.preparer.format_column(column) + " " + column.type.engine_impl(self.engine).get_col_spec()
         default = self.get_column_default_string(column)
         if default is not None:
             colspec += " DEFAULT " + default
@@ -452,4 +455,14 @@ class MySQLSchemaDropper(ansisql.ANSISchemaDropper):
         self.append("\nDROP INDEX " + index.name + " ON " + index.table.name)
         self.execute()
 
+class MySQLIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
+    def __init__(self):
+        super(MySQLIdentifierPreparer, self).__init__(initial_quote='`')
+    def _escape_identifier(self, value):
+        #TODO: determin MySQL's escaping rules
+        return value
+    def _fold_identifier_case(self, value):
+        #TODO: determin MySQL's case folding rules
+        return value
+
 dialect = MySQLDialect
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 8368c8931..4efe0e162 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -245,6 +245,8 @@ class PGDialect(ansisql.ANSIDialect):
         return PGSchemaDropper(*args, **kwargs)
     def defaultrunner(self, engine, proxy):
         return PGDefaultRunner(engine, proxy)
+    def preparer(self):
+        return PGIdentifierPreparer()
         
     def get_default_schema_name(self, connection):
         if not hasattr(self, '_default_schema_name'):
@@ -331,7 +333,7 @@ class PGCompiler(ansisql.ANSICompiler):
 class PGSchemaGenerator(ansisql.ANSISchemaGenerator):
         
     def get_column_specification(self, column, **kwargs):
-        colspec = column.name
+        colspec = self.preparer.format_column(column)
         if column.primary_key and not column.foreign_key and isinstance(column.type, sqltypes.Integer) and (column.default is None or (isinstance(column.default, schema.Sequence) and column.default.optional)):
             colspec += " SERIAL"
         else:
@@ -382,4 +384,8 @@ class PGDefaultRunner(ansisql.ANSIDefaultRunner):
         else:
             return None
 
+class PGIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
+    def _fold_identifier_case(self, value):
+        return value.lower()
+
 dialect = PGDialect
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 192b90561..1727dce94 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -139,6 +139,8 @@ class SQLiteDialect(ansisql.ANSIDialect):
         return SQLiteCompiler(self, statement, bindparams, **kwargs)
     def schemagenerator(self, *args, **kwargs):
         return SQLiteSchemaGenerator(*args, **kwargs)
+    def preparer(self):
+        return SQLiteIdentifierPreparer()
     def create_connect_args(self, url):
         filename = url.database or ':memory:'
         return ([filename], url.query)
@@ -148,7 +150,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
         return SQLiteExecutionContext(self)
     def last_inserted_ids(self):
         return self.context.last_inserted_ids
-
+    
     def oid_column_name(self):
         return "oid"
 
@@ -276,7 +278,7 @@ class SQLiteCompiler(ansisql.ANSICompiler):
 
 class SQLiteSchemaGenerator(ansisql.ANSISchemaGenerator):
     def get_column_specification(self, column, **kwargs):
-        colspec = column.name + " " + column.type.engine_impl(self.engine).get_col_spec()
+        colspec = self.preparer.format_column(column) + " " + column.type.engine_impl(self.engine).get_col_spec()
         default = self.get_column_default_string(column)
         if default is not None:
             colspec += " DEFAULT " + default
@@ -294,6 +296,10 @@ class SQLiteSchemaGenerator(ansisql.ANSISchemaGenerator):
     #        self.append("\tUNIQUE (%s)" % string.join([c.name for c in constraint],', '))
     #    else:
     #        super(SQLiteSchemaGenerator, self).visit_primary_key_constraint(constraint)
-            
+
+class SQLiteIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
+    def __init__(self):
+        super(SQLiteIdentifierPreparer, self).__init__(omit_schema=True)
+
 dialect = SQLiteDialect
 poolclass = pool.SingletonThreadPool