diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-08-12 17:28:15 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-08-12 17:28:15 +0000 |
commit | 9e8fad2abcce364253352f042836bf58ce8f4f81 (patch) | |
tree | 5058c15280a2e56d454670deeb7a53dd8b6b1f67 /lib/sqlalchemy/databases/sqlite.py | |
parent | fb88b031d916ea91ce9af760a67ea27e00113c14 (diff) | |
download | sqlalchemy-9e8fad2abcce364253352f042836bf58ce8f4f81.tar.gz |
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]
Diffstat (limited to 'lib/sqlalchemy/databases/sqlite.py')
-rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 12 |
1 files changed, 9 insertions, 3 deletions
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 |