diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 15:33:29 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 15:33:29 -0600 |
| commit | 4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2 (patch) | |
| tree | b9be37aef8bb0284f011fe56e0c6d02cf404aba7 /mediagoblin/db/sql/convert.py | |
| parent | 63352aaf70d97a37b6277fab0f9b957d34dcb9df (diff) | |
| parent | a45631e3f3791071571da3a59bf6d3ecad42033f (diff) | |
| download | mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.tar.lz mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.tar.xz mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.zip | |
Merge branch 'master' into sqlmigrate
Diffstat (limited to 'mediagoblin/db/sql/convert.py')
| -rw-r--r-- | mediagoblin/db/sql/convert.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py index a46d62ea..36d6fc7f 100644 --- a/mediagoblin/db/sql/convert.py +++ b/mediagoblin/db/sql/convert.py @@ -79,7 +79,7 @@ def convert_media_entries(mk_db): ('title', 'slug', 'created', 'description', 'media_type', 'state', 'license', - 'fail_error', + 'fail_error', 'fail_metadata', 'queued_task_id',)) copy_reference_attr(entry, new_entry, "uploader") @@ -148,8 +148,7 @@ def convert_media_comments(mk_db): def main(): global_config, app_config = setup_global_and_app_config("mediagoblin.ini") - sql_conn, sql_db = sql_connect({'sql_engine': 'sqlite:///mediagoblin.db'}) - + sql_conn, sql_db = sql_connect(app_config) mk_conn, mk_db = mongo_connect(app_config) Base.metadata.create_all(sql_db.engine) |