diff options
| author | Michael Trier <mtrier@gmail.com> | 2009-01-02 22:40:45 +0000 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2009-01-02 22:40:45 +0000 |
| commit | 6ea3521b45c17b9575232b5a76e9ef76699bcd01 (patch) | |
| tree | 5d99da7a7a352750eda360020599e161daa6042f /lib/sqlalchemy/databases/sqlite.py | |
| parent | 5bc1f17cb53248e7cea609693a3b2a9bb702545b (diff) | |
| download | sqlalchemy-6ea3521b45c17b9575232b5a76e9ef76699bcd01.tar.gz | |
sqlite reflection now stores the actual DefaultClause value for the column.
Diffstat (limited to 'lib/sqlalchemy/databases/sqlite.py')
| -rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 270e067f4..1d89d1147 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -122,7 +122,7 @@ always represented by an actual database result string. import datetime, re, time -from sqlalchemy import schema, exc, pool, DefaultClause +from sqlalchemy import sql, schema, exc, pool, DefaultClause from sqlalchemy.engine import default import sqlalchemy.types as sqltypes import sqlalchemy.util as util @@ -465,7 +465,7 @@ class SQLiteDialect(default.DefaultDialect): break found_table = True - (name, type_, nullable, has_default, primary_key) = (row[1], row[2].upper(), not row[3], row[4] is not None, row[5]) + (name, type_, nullable, default, has_default, primary_key) = (row[1], row[2].upper(), not row[3], row[4], row[4] is not None, row[5]) name = re.sub(r'^\"|\"$', '', name) if include_columns and name not in include_columns: continue @@ -490,7 +490,7 @@ class SQLiteDialect(default.DefaultDialect): colargs = [] if has_default: - colargs.append(DefaultClause('?')) + colargs.append(DefaultClause(sql.text(default))) table.append_column(schema.Column(name, coltype, primary_key = primary_key, nullable = nullable, *colargs)) if not found_table: @@ -616,4 +616,4 @@ dialect.poolclass = pool.SingletonThreadPool dialect.statement_compiler = SQLiteCompiler dialect.schemagenerator = SQLiteSchemaGenerator dialect.preparer = SQLiteIdentifierPreparer -dialect.execution_ctx_cls = SQLiteExecutionContext
\ No newline at end of file +dialect.execution_ctx_cls = SQLiteExecutionContext |