diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-03-19 15:27:49 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-03-19 15:27:49 +0000 |
commit | 3757c246074d98663396c9f9633cf308bd6c0f08 (patch) | |
tree | 6678754879cd72785395a650e55c0262c06fce12 | |
parent | 1a0dd5515f19a3a8db2ed5d929e2e682a15beccb (diff) | |
parent | 975af8d709b91f6cc9e4f9c74cc9b4a36f49537e (diff) | |
download | keystone-3757c246074d98663396c9f9633cf308bd6c0f08.tar.gz keystone-3757c246074d98663396c9f9633cf308bd6c0f08.tar.xz keystone-3757c246074d98663396c9f9633cf308bd6c0f08.zip |
Merge "Pass project membership as dict in migration 015."
-rw-r--r-- | keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py index 5b3c2ac0..a024eb0e 100644 --- a/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py +++ b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py @@ -58,8 +58,8 @@ def upgrade_with_copy(meta, migrate_engine): meta, autoload=True) insert = user_project_membership_table.insert() - for membership in session.query(user_tenant_membership_table): - insert.execute(membership) + for user_id, tenant_id in session.query(user_tenant_membership_table): + insert.execute({'user_id': user_id, 'tenant_id': tenant_id}) session.commit() session.close() |