OpenStack Compute (nova)

Merge lp:~dan-prince/nova/postgres_db_api_fixes into lp:~hudson-openstack/nova/trunk

  1. postgres_db_api_fixes
  2. Merge into trunk
Proposed by Dan Prince
Status: Merged
Approved by: Ed Leafe
Approved revision: 1157
Merged at revision: 1157
Proposed branch: lp:~dan-prince/nova/postgres_db_api_fixes
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 74 lines (+9/-9)
1 file modified
nova/db/sqlalchemy/api.py (+9/-9)
To merge this branch: bzr merge lp:~dan-prince/nova/postgres_db_api_fixes
Reviewer Review Type Date Requested Status
Ed Leafe (community) Approve
Devin Carlen (community) Approve
Review via email: mp+63605@code.launchpad.net

Description of the change

Use True/False instead of 1/0 when setting updating 'deleted' column attributes. Fixes casting issues when running nova with Postgres.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Ed Leafe (ed-leafe) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/db/sqlalchemy/api.py'
2--- nova/db/sqlalchemy/api.py 2011-06-06 16:42:27 +0000
3+++ nova/db/sqlalchemy/api.py 2011-06-06 20:16:27 +0000
4@@ -1127,7 +1127,7 @@
5 with session.begin():
6 session.query(models.KeyPair).\
7 filter_by(user_id=user_id).\
8- update({'deleted': 1,
9+ update({'deleted': True,
10 'deleted_at': utils.utcnow(),
11 'updated_at': literal_column('updated_at')})
12
13@@ -1659,7 +1659,7 @@
14 with session.begin():
15 session.query(models.Volume).\
16 filter_by(id=volume_id).\
17- update({'deleted': 1,
18+ update({'deleted': True,
19 'deleted_at': utils.utcnow(),
20 'updated_at': literal_column('updated_at')})
21 session.query(models.ExportDevice).\
22@@ -1817,7 +1817,7 @@
23 with session.begin():
24 session.query(models.Snapshot).\
25 filter_by(id=snapshot_id).\
26- update({'deleted': 1,
27+ update({'deleted': True,
28 'deleted_at': utils.utcnow(),
29 'updated_at': literal_column('updated_at')})
30
31@@ -1972,17 +1972,17 @@
32 with session.begin():
33 session.query(models.SecurityGroup).\
34 filter_by(id=security_group_id).\
35- update({'deleted': 1,
36+ update({'deleted': True,
37 'deleted_at': utils.utcnow(),
38 'updated_at': literal_column('updated_at')})
39 session.query(models.SecurityGroupInstanceAssociation).\
40 filter_by(security_group_id=security_group_id).\
41- update({'deleted': 1,
42+ update({'deleted': True,
43 'deleted_at': utils.utcnow(),
44 'updated_at': literal_column('updated_at')})
45 session.query(models.SecurityGroupIngressRule).\
46 filter_by(group_id=security_group_id).\
47- update({'deleted': 1,
48+ update({'deleted': True,
49 'deleted_at': utils.utcnow(),
50 'updated_at': literal_column('updated_at')})
51
52@@ -1993,11 +1993,11 @@
53 session = get_session()
54 with session.begin():
55 session.query(models.SecurityGroup).\
56- update({'deleted': 1,
57+ update({'deleted': True,
58 'deleted_at': utils.utcnow(),
59 'updated_at': literal_column('updated_at')})
60 session.query(models.SecurityGroupIngressRule).\
61- update({'deleted': 1,
62+ update({'deleted': True,
63 'deleted_at': utils.utcnow(),
64 'updated_at': literal_column('updated_at')})
65
66@@ -2678,7 +2678,7 @@
67 meta_ref = models.InstanceMetadata()
68 meta_ref.update({"key": key, "value": value,
69 "instance_id": instance_id,
70- "deleted": 0})
71+ "deleted": False})
72 meta_ref.save(session=session)
73
74 return metadata