Launchpad itself

Merge lp:~stevenk/launchpad/no-more-id-for-bsfs into lp:launchpad

  1. no-more-id-for-bsfs
  2. Merge into devel
Proposed by Steve Kowalik
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 15718
Proposed branch: lp:~stevenk/launchpad/no-more-id-for-bsfs
Merge into: lp:launchpad
Diff against target: 71 lines (+12/-21)
4 files modified
lib/lp/bugs/model/bugsubscriptionfilterimportance.py (+1/-2)
lib/lp/bugs/model/bugsubscriptionfilterstatus.py (+1/-2)
lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py (+6/-10)
lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py (+4/-7)
To merge this branch: bzr merge lp:~stevenk/launchpad/no-more-id-for-bsfs
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+117374@code.launchpad.net

Commit message

Prepare to drop the id columns of BugSubscriptionFilter{Status,Importance} for being useless.

Description of the change

Prepare to drop the id columns of BugSubscriptionFilter{Status,Importance} for being useless.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/model/bugsubscriptionfilterimportance.py'
2--- lib/lp/bugs/model/bugsubscriptionfilterimportance.py 2011-12-30 06:14:56 +0000
3+++ lib/lp/bugs/model/bugsubscriptionfilterimportance.py 2012-07-31 05:38:19 +0000
4@@ -20,8 +20,7 @@
5 """Importances to filter."""
6
7 __storm_table__ = "BugSubscriptionFilterImportance"
8-
9- id = Int(primary=True)
10+ __storm_primary__ = ('filter_id', 'importance')
11
12 filter_id = Int("filter", allow_none=False)
13 filter = Reference(filter_id, "BugSubscriptionFilter.id")
14
15=== modified file 'lib/lp/bugs/model/bugsubscriptionfilterstatus.py'
16--- lib/lp/bugs/model/bugsubscriptionfilterstatus.py 2011-12-30 06:14:56 +0000
17+++ lib/lp/bugs/model/bugsubscriptionfilterstatus.py 2012-07-31 05:38:19 +0000
18@@ -20,8 +20,7 @@
19 """Statuses to filter."""
20
21 __storm_table__ = "BugSubscriptionFilterStatus"
22-
23- id = Int(primary=True)
24+ __storm_primary__ = ('filter_id', 'status')
25
26 filter_id = Int("filter", allow_none=False)
27 filter = Reference(filter_id, "BugSubscriptionFilter.id")
28
29=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py'
30--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py 2012-01-01 02:58:52 +0000
31+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py 2012-07-31 05:38:19 +0000
32@@ -42,13 +42,9 @@
33 IStore(bug_sub_filter_importance).flush()
34 IStore(bug_sub_filter_importance).reload(bug_sub_filter_importance)
35 # Check.
36- self.assertIsNot(None, bug_sub_filter_importance.id)
37- self.assertEqual(
38- self.subscription_filter.id,
39- bug_sub_filter_importance.filter_id)
40- self.assertEqual(
41- self.subscription_filter,
42- bug_sub_filter_importance.filter)
43- self.assertEqual(
44- BugTaskImportance.HIGH,
45- bug_sub_filter_importance.importance)
46+ self.assertEqual(
47+ self.subscription_filter.id, bug_sub_filter_importance.filter_id)
48+ self.assertEqual(
49+ self.subscription_filter, bug_sub_filter_importance.filter)
50+ self.assertEqual(
51+ BugTaskImportance.HIGH, bug_sub_filter_importance.importance)
52
53=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py'
54--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py 2012-01-01 02:58:52 +0000
55+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py 2012-07-31 05:38:19 +0000
56@@ -42,11 +42,8 @@
57 IStore(bug_sub_filter_status).flush()
58 IStore(bug_sub_filter_status).reload(bug_sub_filter_status)
59 # Check.
60- self.assertIsNot(None, bug_sub_filter_status.id)
61- self.assertEqual(
62- self.subscription_filter.id,
63- bug_sub_filter_status.filter_id)
64- self.assertEqual(
65- self.subscription_filter,
66- bug_sub_filter_status.filter)
67+ self.assertEqual(
68+ self.subscription_filter.id, bug_sub_filter_status.filter_id)
69+ self.assertEqual(
70+ self.subscription_filter, bug_sub_filter_status.filter)
71 self.assertEqual(BugTaskStatus.NEW, bug_sub_filter_status.status)