Commit 4ef7615d authored by pthiben's avatar pthiben

Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into...

Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view

# Conflicts:
#	cps/ub.py
parents 77c2783a 5b1dfc12
......@@ -458,9 +458,9 @@ def migrate_Database(session):
"UNIQUE (nickname),"
"UNIQUE (email))")
conn.execute("INSERT INTO user_id(id, nickname, email, role, password, kindle_mail,locale,"
"sidebar_view, default_language, series_view) "
"sidebar_view, default_language, series_view) "
"SELECT id, nickname, email, role, password, kindle_mail, locale,"
"sidebar_view, default_language FROM user")
"sidebar_view, default_language FROM user")
# delete old user table and rename new user_id table to user:
conn.execute("DROP TABLE user")
conn.execute("ALTER TABLE user_id RENAME TO user")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment