diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-10-14 21:58:04 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-10-14 21:58:04 +0000 |
commit | 8340006dd7ed34cf32bbb7f856397d1c7f13d295 (patch) | |
tree | 3429fe31b379b2ccc10e6653e33d4d6d23fd5ae4 /lib/sqlalchemy/databases/sqlite.py | |
parent | 5bb47440e03bb6ac0d3bd92eab4a6d69304ff556 (diff) | |
download | sqlalchemy-8340006dd7ed34cf32bbb7f856397d1c7f13d295.tar.gz |
- a fair amount of cleanup to the schema package, removal of ambiguous
methods, methods that are no longer needed. slightly more constrained
useage, greater emphasis on explicitness.
- table_iterator signature fixup, includes fix for [ticket:288]
- the "primary_key" attribute of Table and other selectables becomes
a setlike ColumnCollection object; is no longer ordered or numerically
indexed. a comparison clause between two pks that are derived from the
same underlying tables (i.e. such as two Alias objects) can be generated
via table1.primary_key==table2.primary_key
- append_item() methods removed from Table and Column; preferably
construct Table/Column/related objects inline, but if needed use
append_column(), append_foreign_key(), append_constraint(), etc.
- table.create() no longer returns the Table object, instead has no
return value. the usual case is that tables are created via metadata,
which is preferable since it will handle table dependencies.
- added UniqueConstraint (goes at Table level), CheckConstraint
(goes at Table or Column level) fixes [ticket:217]
- index=False/unique=True on Column now creates a UniqueConstraint,
index=True/unique=False creates a plain Index,
index=True/unique=True on Column creates a unique Index. 'index'
and 'unique' keyword arguments to column are now boolean only; for
explcit names and groupings of indexes or unique constraints, use the
UniqueConstraint/Index constructs explicitly.
- relationship of Metadata/Table/SchemaGenerator/Dropper has been
improved so that the schemavisitor receives the metadata object
for greater control over groupings of creates/drops.
- added "use_alter" argument to ForeignKey, ForeignKeyConstraint,
but it doesnt do anything yet. will utilize new generator/dropper
behavior to implement.
Diffstat (limited to 'lib/sqlalchemy/databases/sqlite.py')
-rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 80d5a7d2a..90cd66dd3 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -199,7 +199,7 @@ class SQLiteDialect(ansisql.ANSIDialect): colargs= [] if has_default: colargs.append(PassiveDefault('?')) - table.append_item(schema.Column(name, coltype, primary_key = primary_key, nullable = nullable, *colargs)) + table.append_column(schema.Column(name, coltype, primary_key = primary_key, nullable = nullable, *colargs)) if not found_table: raise exceptions.NoSuchTableError(table.name) @@ -228,7 +228,7 @@ class SQLiteDialect(ansisql.ANSIDialect): if refspec not in fk[1]: fk[1].append(refspec) for name, value in fks.iteritems(): - table.append_item(schema.ForeignKeyConstraint(value[0], value[1])) + table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1])) # check for UNIQUE indexes c = connection.execute("PRAGMA index_list(" + table.name + ")", {}) unique_indexes = [] @@ -250,8 +250,7 @@ class SQLiteDialect(ansisql.ANSIDialect): col = table.columns[row[2]] # unique index that includes the pk is considered a multiple primary key for col in cols: - column = table.columns[col] - table.columns[col]._set_primary_key() + table.primary_key.add(table.columns[col]) class SQLiteCompiler(ansisql.ANSICompiler): def visit_cast(self, cast): |