diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/base.py | 28 | ||||
| -rw-r--r-- | test/dialect/test_sqlite.py | 14 |
3 files changed, 43 insertions, 3 deletions
@@ -792,6 +792,10 @@ CHANGES - The cursor associated with connection pool connections (i.e. _CursorFairy) now proxies `__iter__()` to the underlying cursor correctly. [ticket:1632] + +- sqlite + - sqlite dialect properly generates CREATE INDEX for a table + that is in an alternate schema. [ticket:1439] - postgresql - Added support for reflecting the DOUBLE PRECISION type, diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index d83eb4b86..235a17a66 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -239,11 +239,25 @@ class SQLiteDDLCompiler(compiler.DDLCompiler): if not column.nullable: colspec += " NOT NULL" return colspec - + + def visit_create_index(self, create): + index = create.element + preparer = self.preparer + text = "CREATE " + if index.unique: + text += "UNIQUE " + text += "INDEX %s ON %s (%s)" \ + % (preparer.format_index(index, + name=self._validate_identifier(index.name, True)), + preparer.format_table(index.table, use_schema=False), + ', '.join(preparer.quote(c.name, c.quote) + for c in index.columns)) + return text + class SQLiteTypeCompiler(compiler.GenericTypeCompiler): def visit_binary(self, type_): return self.visit_BLOB(type_) - + class SQLiteIdentifierPreparer(compiler.IdentifierPreparer): reserved_words = set([ 'add', 'after', 'all', 'alter', 'analyze', 'and', 'as', 'asc', @@ -265,6 +279,16 @@ class SQLiteIdentifierPreparer(compiler.IdentifierPreparer): 'vacuum', 'values', 'view', 'virtual', 'when', 'where', ]) + def format_index(self, index, use_schema=True, name=None): + """Prepare a quoted index and schema name.""" + + if name is None: + name = index.name + result = self.quote(name, index.quote) + if not self.omit_schema and use_schema and getattr(index.table, "schema", None): + result = self.quote_schema(index.table.schema, index.table.quote_schema) + "." + result + return result + class SQLiteDialect(default.DefaultDialect): name = 'sqlite' supports_alter = False diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py index 2d5cb1805..7fced60d9 100644 --- a/test/dialect/test_sqlite.py +++ b/test/dialect/test_sqlite.py @@ -69,7 +69,7 @@ class TestTypes(TestBase, AssertsExecutionResults): bindproc = t.dialect_impl(dialect).bind_processor(dialect) assert not bindproc or isinstance(bindproc(u"some string"), unicode) - + def test_type_reflection(self): # (ask_for, roundtripped_as_if_different) specs = [( String(), String(), ), @@ -324,6 +324,18 @@ class DialectTest(TestBase, AssertsExecutionResults): isolation_level="FOO") + def test_create_index_with_schema(self): + """Test creation of index with explicit schema""" + + meta = MetaData(testing.db) + t = Table('foo', meta, Column('bar', String, index=True), schema='main') + + try: + meta.create_all() + finally: + meta.drop_all() + + class SQLTest(TestBase, AssertsCompiledSQL): """Tests SQLite-dialect specific compilation.""" |