aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-02-18 11:00:13 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-02-18 19:34:11 +0100
commita45631e3f3791071571da3a59bf6d3ecad42033f (patch)
treef1527cbe0ece99e67ab2352f16132501d4d9a262 /mediagoblin/db
parent6456cefa0ded3d442a7bdd7e84e2ffae248ce065 (diff)
downloadmediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.tar.lz
mediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.tar.xz
mediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.zip
Start having useful defaults for SQL
Mostly this means: Havintg a config_spec.ini that has a local (relative to mediagoblin.ini) sqlite db with the name "mediagoblin.db". Also: - Add to .gitignore - Add a notice to mediagoblin.ini about the db
Diffstat (limited to 'mediagoblin/db')
-rw-r--r--mediagoblin/db/sql/convert.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 14a0b911..36d6fc7f 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -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)