summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-08 00:11:46 +0000
committerGerrit Code Review <review@openstack.org>2012-09-08 00:11:46 +0000
commitc30d1c814c2700d64d86c4557bc3c7c6d7a25bcd (patch)
tree2e4febd51a53309602c0d9f12b0c88906a42b128
parent8ee8a91470a4960eebcbd3d54815608bcb1fcfd5 (diff)
parent43ae413da583509448d82ce4ab48f8c8a66a9eb5 (diff)
downloadnova-c30d1c814c2700d64d86c4557bc3c7c6d7a25bcd.tar.gz
nova-c30d1c814c2700d64d86c4557bc3c7c6d7a25bcd.tar.xz
nova-c30d1c814c2700d64d86c4557bc3c7c6d7a25bcd.zip
Merge "Execute attach_time query earlier in migration 98"
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/098_update_volume_attach_time.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/098_update_volume_attach_time.py b/nova/db/sqlalchemy/migrate_repo/versions/098_update_volume_attach_time.py
index 1d16f093b..680b27df7 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/098_update_volume_attach_time.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/098_update_volume_attach_time.py
@@ -32,7 +32,7 @@ def upgrade(migrate_engine):
volumes_list = list(volumes.select().execute())
for v in volumes_list:
attach_time = select([volumes.c.attach_time],
- volumes.c.id == v['id'])
+ volumes.c.id == v['id']).execute().fetchone()[0]
volumes.update().\
where(volumes.c.id == v['id']).\
values(attachtime_datetime=attach_time).execute()
@@ -59,7 +59,7 @@ def downgrade(migrate_engine):
volumes_list = list(volumes.select().execute())
for v in volumes_list:
attach_time = select([volumes.c.attach_time],
- volumes.c.id == v['id'])
+ volumes.c.id == v['id']).execute().fetchone()[0]
volumes.update().\
where(volumes.c.id == v['id']).\
values(attachtime_string=attach_time).execute()