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
=== modified file 'lib/lp/bugs/model/bugsubscriptionfilterimportance.py'
--- lib/lp/bugs/model/bugsubscriptionfilterimportance.py 2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilterimportance.py 2012-07-31 05:38:19 +0000
@@ -20,8 +20,7 @@
20 """Importances to filter."""20 """Importances to filter."""
2121
22 __storm_table__ = "BugSubscriptionFilterImportance"22 __storm_table__ = "BugSubscriptionFilterImportance"
2323 __storm_primary__ = ('filter_id', 'importance')
24 id = Int(primary=True)
2524
26 filter_id = Int("filter", allow_none=False)25 filter_id = Int("filter", allow_none=False)
27 filter = Reference(filter_id, "BugSubscriptionFilter.id")26 filter = Reference(filter_id, "BugSubscriptionFilter.id")
2827
=== modified file 'lib/lp/bugs/model/bugsubscriptionfilterstatus.py'
--- lib/lp/bugs/model/bugsubscriptionfilterstatus.py 2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilterstatus.py 2012-07-31 05:38:19 +0000
@@ -20,8 +20,7 @@
20 """Statuses to filter."""20 """Statuses to filter."""
2121
22 __storm_table__ = "BugSubscriptionFilterStatus"22 __storm_table__ = "BugSubscriptionFilterStatus"
2323 __storm_primary__ = ('filter_id', 'status')
24 id = Int(primary=True)
2524
26 filter_id = Int("filter", allow_none=False)25 filter_id = Int("filter", allow_none=False)
27 filter = Reference(filter_id, "BugSubscriptionFilter.id")26 filter = Reference(filter_id, "BugSubscriptionFilter.id")
2827
=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py 2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py 2012-07-31 05:38:19 +0000
@@ -42,13 +42,9 @@
42 IStore(bug_sub_filter_importance).flush()42 IStore(bug_sub_filter_importance).flush()
43 IStore(bug_sub_filter_importance).reload(bug_sub_filter_importance)43 IStore(bug_sub_filter_importance).reload(bug_sub_filter_importance)
44 # Check.44 # Check.
45 self.assertIsNot(None, bug_sub_filter_importance.id)45 self.assertEqual(
46 self.assertEqual(46 self.subscription_filter.id, bug_sub_filter_importance.filter_id)
47 self.subscription_filter.id,47 self.assertEqual(
48 bug_sub_filter_importance.filter_id)48 self.subscription_filter, bug_sub_filter_importance.filter)
49 self.assertEqual(49 self.assertEqual(
50 self.subscription_filter,50 BugTaskImportance.HIGH, bug_sub_filter_importance.importance)
51 bug_sub_filter_importance.filter)
52 self.assertEqual(
53 BugTaskImportance.HIGH,
54 bug_sub_filter_importance.importance)
5551
=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py 2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py 2012-07-31 05:38:19 +0000
@@ -42,11 +42,8 @@
42 IStore(bug_sub_filter_status).flush()42 IStore(bug_sub_filter_status).flush()
43 IStore(bug_sub_filter_status).reload(bug_sub_filter_status)43 IStore(bug_sub_filter_status).reload(bug_sub_filter_status)
44 # Check.44 # Check.
45 self.assertIsNot(None, bug_sub_filter_status.id)45 self.assertEqual(
46 self.assertEqual(46 self.subscription_filter.id, bug_sub_filter_status.filter_id)
47 self.subscription_filter.id,47 self.assertEqual(
48 bug_sub_filter_status.filter_id)48 self.subscription_filter, bug_sub_filter_status.filter)
49 self.assertEqual(
50 self.subscription_filter,
51 bug_sub_filter_status.filter)
52 self.assertEqual(BugTaskStatus.NEW, bug_sub_filter_status.status)49 self.assertEqual(BugTaskStatus.NEW, bug_sub_filter_status.status)