From d044f0bfed76f9bac0277fcd645b6f21eb088eaf Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Fri, 27 Sep 2013 13:38:59 -0700 Subject: [PATCH] Close the cursor for SQLite for 034 upgrade/downgrade on select The list() is needed around the table select for SQLite upgrade/downgrade to work. This forces a cursor close and prevents database locked errors. closes-bug: 1233329 Change-Id: I01aedf9d2743a86881c124c9690f10233d9966bc --- .../versions/034_add_default_project_id_column_to_user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py b/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py index face5d6052..def59d286e 100644 --- a/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py +++ b/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py @@ -23,7 +23,7 @@ def migrate_default_project_from_extra_json(meta, migrate_engine): user_table = sql.Table('user', meta, autoload=True) - user_list = user_table.select().execute() + user_list = list(user_table.select().execute()) session = sessionmaker(bind=migrate_engine)() for user in user_list: try: @@ -58,7 +58,7 @@ def migrate_default_project_from_extra_json(meta, migrate_engine): def migrate_default_project_to_extra_json(meta, migrate_engine): user_table = sql.Table('user', meta, autoload=True) - user_list = user_table.select().execute() + user_list = list(user_table.select().execute()) session = sessionmaker(bind=migrate_engine)() for user in user_list: try: