Merge ~pappacena/launchpad:stormify-bug-task into launchpad:master

[Thiago F. Pappacena]

Stormifying BugTask class, to prepare it to receive foreign key to OCI project

This MP is quite big in terms of lines changed, but it's mostly a refactoring, and the final behavior shouldn't have changed.

[Thiago F. Pappacena (pappacena)]

The changes are all related to BugTask refactoring. Mostly:

- Using StormBase instead of SQLBase class;

- Renaming the foreign key ID attributes to match newer pattern ("foreignkey_id", instead of "foreignKeyID"). This change itself is responsible for most of the lines changed, since there were queries across the code base using BugTask attributes (like BugTask.bugID, BugTask.assigneeID, etc);

- Refactoring of the `validate_conjoined_attribute` method to keep track of the changed attributes separately, on `BugTask.passthrough_attrs` dict; currently, we are setting a `PassthroughValue` object wrapper in some attributes, but Storm doesn't allow it (an `Int` attribute only accepts ints, for example).

- Replacing `BugTask.get(id)` with `getUtility(BugTaskSet).get(id)`;

- Changing `BugTask.select`/`BugTask.selectBy` with `store.find(BugTask, ...)`

[Ioana Lasc (ilasc)]

Nicely done!

A few minor comments around make lint failures:

./lib/lp/bugs/doc/bugtask-expiration.txt
     159: source exceeds 78 characters.
./lib/lp/bugs/doc/bugtask-retrieval.txt
       1: narrative uses a moin header.
      17: narrative uses a moin header.
      26: source has trailing whitespace.
      42: narrative uses a moin header.
       8: 'NotFoundError' imported but unused
./lib/lp/bugs/doc/bugtask-search.txt
       1: narrative uses a moin header.
      27: narrative uses a moin header.
      58: narrative uses a moin header.
     116: narrative uses a moin header.
     150: narrative uses a moin header.
     155: narrative uses a moin header.
     203: narrative uses a moin header.
     222: narrative uses a moin header.
     245: narrative uses a moin header.

You can use this as an example for the moin header issues: https://code.launchpad.net/~ilasc/launchpad/+git/launchpad/+merge/390284

review: Needs Fixing

[Thiago F. Pappacena (pappacena)]

Good catch, ilasc! Thanks for the review!

It should be good now.

[Ioana Lasc (ilasc)]

review: Approve

[Colin Watson (cjwatson)]

This mostly looks fine, but I'm interested in your thoughts on my comments regarding PassthroughValue; maybe there's some other reason for the refactoring that I missed.

review: Approve

3f09d61... by Thiago F. Pappacena on 2020-11-17

Changing _defaultOrder attribute to __storm_order__ on BugTask

[Thiago F. Pappacena (pappacena)]

ctwatson, I've added a reply to your comment on PassthoughValue, and submitted a patch for the other 2 comments.

2f08d32... by Thiago F. Pappacena on 2020-11-18

Reverting the PassthroughValue wrapper removal

diff --git a/lib/lp/bugs/browser/buglisting.py b/lib/lp/bugs/browser/buglisting.py
index c0e67a6..6acbf8a 100644
--- a/lib/lp/bugs/browser/buglisting.py
+++ b/lib/lp/bugs/browser/buglisting.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """IBugTask-related browser views."""
@@ -657,8 +657,8 @@ class BugTaskListingItem:
         else:
             milestone_name = None
         assignee = None
-        if self.assigneeID is not None:
-            assignee = self.people[self.assigneeID].displayname
+        if self.assignee_id is not None:
+            assignee = self.people[self.assignee_id].displayname
         reporter = self.people[self.bug.ownerID]
 
         # the case that there is no target context (e.g. viewing bug that
diff --git a/lib/lp/bugs/browser/cvereport.py b/lib/lp/bugs/browser/cvereport.py
index 9626295..e799288 100644
--- a/lib/lp/bugs/browser/cvereport.py
+++ b/lib/lp/bugs/browser/cvereport.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Views to generate CVE reports (as in distro & distroseries/+cve pages)."""
@@ -122,7 +122,7 @@ class CVEReportView(LaunchpadView):
 
         # The page contains links to the bug task assignees:
         # Pre-load the related Person and ValidPersonCache records
-        assignee_ids = [task.assigneeID for task in bugtasks]
+        assignee_ids = [task.assignee_id for task in bugtasks]
         list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
             assignee_ids, need_validity=True))
 
diff --git a/lib/lp/bugs/browser/person.py b/lib/lp/bugs/browser/person.py
index c25219d..b3f4fae 100644
--- a/lib/lp/bugs/browser/person.py
+++ b/lib/lp/bugs/browser/person.py
@@ -1,4 +1,4 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """IPerson browser views related to bugs."""
@@ -132,7 +132,7 @@ class RelevantMilestonesMixin:
         """Return data used to render the milestone checkboxes."""
         tasks = self.searchUnbatched()
         milestones = sorted(
-            load_related(Milestone, tasks, ['milestoneID']),
+            load_related(Milestone, tasks, ['milestone_id']),
             key=milestone_sort_key, reverse=True)
         return [
             dict(title=milestone.title, value=milestone.id, checked=False)
diff --git a/lib/lp/bugs/browser/tests/bugs-views.txt b/lib/lp/bugs/browser/tests/bugs-views.txt
index 54baf33..59fce27 100644
--- a/lib/lp/bugs/browser/tests/bugs-views.txt
+++ b/lib/lp/bugs/browser/tests/bugs-views.txt
@@ -22,8 +22,11 @@ Launchpad currently.
 
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
     >>> from lp.bugs.model.bugtask import BugTask
+    >>> from lp.services.database.interfaces import IStore
+    >>> store = IStore(BugTask)
     >>> [bugtask.bug.id
-    ...  for bugtask in BugTask.selectBy(_status=BugTaskStatus.FIXRELEASED)]
+    ...  for bugtask in store.find(
+    ...     BugTask, BugTask._status == BugTaskStatus.FIXRELEASED)]
     [8]
     >>> for bug in bugs_view.most_recently_fixed_bugs:
     ...     print("%s: %s" % (bug.id, bug.title))
diff --git a/lib/lp/bugs/browser/tests/test_bugtask.py b/lib/lp/bugs/browser/tests/test_bugtask.py
index dd33206..cb98e74 100644
--- a/lib/lp/bugs/browser/tests/test_bugtask.py
+++ b/lib/lp/bugs/browser/tests/test_bugtask.py
@@ -129,7 +129,7 @@ class TestBugTaskView(TestCaseWithFactory):
             0, 10, login_method=lambda: login(ADMIN_EMAIL))
         # This may seem large: it is; there is easily another 25% fat in
         # there.
-        self.assertThat(recorder1, HasQueryCount(LessThan(85)))
+        self.assertThat(recorder1, HasQueryCount(LessThan(86)))
         self.assertThat(recorder2, HasQueryCount.byEquality(recorder1))
 
     def test_rendered_query_counts_constant_with_attachments(self):
@@ -140,7 +140,7 @@ class TestBugTaskView(TestCaseWithFactory):
             lambda: self.getUserBrowser(url, person),
             lambda: self.factory.makeBugAttachment(bug=task.bug),
             1, 9, login_method=lambda: login(ADMIN_EMAIL))
-        self.assertThat(recorder1, HasQueryCount(LessThan(86)))
+        self.assertThat(recorder1, HasQueryCount(LessThan(87)))
         self.assertThat(recorder2, HasQueryCount.byEquality(recorder1))
 
     def makeLinkedBranchMergeProposal(self, sourcepackage, bug, owner):
@@ -175,7 +175,7 @@ class TestBugTaskView(TestCaseWithFactory):
         recorder1, recorder2 = record_two_runs(
             lambda: self.getUserBrowser(url, owner),
             make_merge_proposals, 0, 1)
-        self.assertThat(recorder1, HasQueryCount(LessThan(93)))
+        self.assertThat(recorder1, HasQueryCount(LessThan(94)))
         # Ideally this should be much fewer, but this tries to keep a win of
         # removing more than half of these.
         self.assertThat(
@@ -221,7 +221,7 @@ class TestBugTaskView(TestCaseWithFactory):
             lambda: self.getUserBrowser(url, person),
             lambda: add_activity("description", self.factory.makePerson()),
             1, 20, login_method=lambda: login(ADMIN_EMAIL))
-        self.assertThat(recorder1, HasQueryCount(LessThan(86)))
+        self.assertThat(recorder1, HasQueryCount(LessThan(87)))
         self.assertThat(recorder2, HasQueryCount.byEquality(recorder1))
 
     def test_rendered_query_counts_constant_with_milestones(self):
@@ -231,7 +231,7 @@ class TestBugTaskView(TestCaseWithFactory):
 
         with celebrity_logged_in('admin'):
             browses_under_limit = BrowsesWithQueryLimit(
-                86, self.factory.makePerson())
+                87, self.factory.makePerson())
 
         self.assertThat(bug, browses_under_limit)
 
diff --git a/lib/lp/bugs/configure.zcml b/lib/lp/bugs/configure.zcml
index 7edae44..3e4544b 100644
--- a/lib/lp/bugs/configure.zcml
+++ b/lib/lp/bugs/configure.zcml
@@ -167,9 +167,9 @@
             <allow
                 attributes="
                     id
-                    assigneeID
+                    assignee_id
                     bug
-                    bugID
+                    bug_id
                     target
                     date_assigned
                     datecreated
@@ -182,12 +182,12 @@
                     date_fix_released
                     date_left_closed
                     date_closed
-                    distributionID
-                    distroseriesID
-                    milestoneID
-                    productID
-                    productseriesID
-                    sourcepackagenameID
+                    distribution_id
+                    distroseries_id
+                    milestone_id
+                    product_id
+                    productseries_id
+                    sourcepackagename_id
                     task_age
                     bug_subscribers
                     is_complete
diff --git a/lib/lp/bugs/doc/bugtask-expiration.txt b/lib/lp/bugs/doc/bugtask-expiration.txt
index 4d4e82b..11b755e 100644
--- a/lib/lp/bugs/doc/bugtask-expiration.txt
+++ b/lib/lp/bugs/doc/bugtask-expiration.txt
@@ -156,7 +156,8 @@ Let's also make some bugs that almost qualify for expiration.
     >>> ubuntu_alsa = ubuntu.getSourcePackage('alsa-utils')
     >>> another_assigned_bugtask = create_old_bug(
     ...     'assigned', 61, ubuntu, assignee=sample_person)
-    >>> another_assigned_bugtask.transitionToTarget(ubuntu_alsa, sample_person)
+    >>> another_assigned_bugtask.transitionToTarget(
+    ...     ubuntu_alsa, sample_person)
     >>> ubuntu_evolution = ubuntu.getSourcePackage('evolution')
     >>> invalid_bugtask = bugtaskset.createTask(
     ...     another_assigned_bugtask.bug, sample_person, ubuntu_evolution,
@@ -472,7 +473,9 @@ Running the script
 There are no Expired Bugtasks in sampledata, from the tests above.
 
     >>> from lp.bugs.model.bugtask import BugTask
-    >>> BugTask.selectBy(status=BugTaskStatus.EXPIRED).count()
+    >>> from lp.services.database.interfaces import IStore
+    >>> store = IStore(BugTask)
+    >>> store.find(BugTask, BugTask.status == BugTaskStatus.EXPIRED).count()
     0
 
 We want to check the hoary bugtask messages later.
@@ -510,7 +513,7 @@ config.malone.expiration_dbuser.
     >>> process.returncode
     0
 
-    >>> bugtasks = [BugTask.get(bugtask.id) for bugtask in bugtasks]
+    >>> bugtasks = [bugtaskset.get(bugtask.id) for bugtask in bugtasks]
 
 
 After the script has run
diff --git a/lib/lp/bugs/doc/bugtask-retrieval.txt b/lib/lp/bugs/doc/bugtask-retrieval.txt
index e78c433..5fac87c 100644
--- a/lib/lp/bugs/doc/bugtask-retrieval.txt
+++ b/lib/lp/bugs/doc/bugtask-retrieval.txt
@@ -1,19 +1,21 @@
-= Retrieving bug tasks =
+Retrieving bug tasks
+*********************
 
 The IBugTaskSet interface provide a couple of methods for retrieving
 IBugTask instances. For convenience, Launchpad provides a default
 implementation of IBugTaskSet, allowing retrieval of any bug task in
 Launchpad. We'll use this implementation for demonstration purposes:
 
-    >>> from lp.app.errors import NotFoundError
     >>> from lp.bugs.interfaces.bugtask import (
     ...     IBugTask,
     ...     IBugTaskSet,
     ...     )
+    >>> from lp.services.database.interfaces import IStore
     >>> task_set = getUtility(IBugTaskSet)
 
 
-== Retrieving a single bug task ==
+Retrieving a single bug task
+*****************************
 
 The IBugTaskSet get method retrieves a single bug task matching a given
 ID:
@@ -22,7 +24,7 @@ ID:
     >>> retrieved_task
     <BugTask ...>
 
-    >>> from lp.testing import verifyObject 
+    >>> from lp.testing import verifyObject
     >>> verifyObject(IBugTask, retrieved_task)
     True
 
@@ -38,15 +40,17 @@ raises a NotFoundError:
     NotFoundError: ...
 
 
-== Retrieving multiple bug tasks ==
+Retrieving multiple bug tasks
+******************************
 
 The IBugTaskSet getMultiple method can retrieve multiple bug tasks in a
 single operation. To demonstrate, we'll begin by generating a list of
 sample bug tasks:
 
     >>> from lp.bugs.model.bugtask import BugTask
+    >>> store = IStore(BugTask)
     >>> sample_task_count = 10
-    >>> sample_tasks = BugTask.select(limit=sample_task_count)
+    >>> sample_tasks = store.find(BugTask)[:sample_task_count]
     >>> sample_task_ids = [task.id for task in sample_tasks]
 
 When given a sequence of bug task IDs, the method returns a dictionary
diff --git a/lib/lp/bugs/doc/bugtask-search.txt b/lib/lp/bugs/doc/bugtask-search.txt
index 750b3c5..1e45abe 100644
--- a/lib/lp/bugs/doc/bugtask-search.txt
+++ b/lib/lp/bugs/doc/bugtask-search.txt
@@ -1,4 +1,5 @@
-= Searching BugTasks =
+Searching BugTasks
+*******************
 
 BugTasks are usually searched through an IBugTarget's searchTasks()
 method, but they all delegate the search to IBugTaskSet.search(). That
@@ -6,19 +7,26 @@ method accepts a single parameter; an BugTaskSearchParams instance.
 
     >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
     >>> from lp.bugs.interfaces.bugtasksearch import BugTaskSearchParams
+    >>> from lp.services.database.interfaces import IStore
     >>> bugtask_set = getUtility(IBugTaskSet)
     >>> all_public = BugTaskSearchParams(user=None)
     >>> found_bugtasks = bugtask_set.search(all_public)
 
+    >>> from lp.app.enums import InformationType
+    >>> from lp.bugs.model.bug import Bug
     >>> from lp.bugs.model.bugtask import BugTask
-    >>> all_public_bugtasks = BugTask.select(
-    ...     "BugTask.bug = Bug.id AND Bug.information_type IN (1, 2)",
-    ...     clauseTables=['Bug'])
+    >>> store = IStore(BugTask)
+    >>> info_types = [InformationType.PUBLIC, InformationType.PUBLICSECURITY]
+    >>> all_public_bugtasks = store.find(
+    ...     BugTask,
+    ...     BugTask.bug_id == Bug.id,
+    ...     Bug.information_type.is_in(info_types))
     >>> found_bugtasks.count() == all_public_bugtasks.count()
     True
 
 
-== Searching using bug full-text index ==
+Searching using bug full-text index
+************************************
 
 The searchtext parameter does an extensive and expensive search (it
 looks through the bug's full text index, bug comments, bugtask
@@ -49,7 +57,8 @@ But if we put that word in the bug #4 description, it will be found.
     ...     print("#%s" % bugtask.bug.id)
     #4
 
-=== BugTaskSearchParams' parameters searchtext and fast_searchtext ===
+BugTaskSearchParams' parameters searchtext and fast_searchtext
+***************************************************************
 
 Normally, the parameter searchtext should be used. The alternative
 parameter fast_searchtext requires a syntactically correct tsquery
@@ -107,7 +116,8 @@ Passing invalid tsquery expressions as fast_searchtext raises an exception.
     >>> transaction.abort()
 
 
-== Bugs with partner packages ==
+Bugs with partner packages
+***************************
 
 Bugs may also be targeted to partner packages.  First turn "cdrkit" into
 a partner package:
@@ -141,12 +151,14 @@ We can file a bug against it and see that show up in a search:
     1
 
 
-== Ordering search results ==
+Ordering search results
+************************
 
 The result returned by bugtask searches can come sorted by a specified order
 
 
-=== Ordering by number of duplicates ===
+Ordering by number of duplicates
+*********************************
 
 It is possible to sort the results by the number of duplicates each bag has.
 
@@ -194,7 +206,8 @@ a duplicate.
     cdrkit (Ubuntu) Bug to be fixed in trunk
 
 
-=== Ordering by number of comments ===
+Ordering by number of comments
+*******************************
 
 It is also possible to sort the results by the number of comments on a bug.
 
@@ -213,7 +226,8 @@ Here is the list of bugs for Ubuntu, sorted by their number of comments.
     Bug to be fixed in trunk [1 comments]
 
 
-=== Ordering by bug heat ===
+Ordering by bug heat
+*********************
 
 Another way of sorting searches is by bug heat.
 
@@ -236,7 +250,8 @@ Another way of sorting searches is by bug heat.
     Firefox does not support SVG [heat: 1]
 
 
-=== Ordering by patch age ===
+Ordering by patch age
+**********************
 
 We can also sort search results by the creation time of the youngest
 patch attached to a bug.
diff --git a/lib/lp/bugs/feed/bug.py b/lib/lp/bugs/feed/bug.py
index 218f199..3f443b0 100644
--- a/lib/lp/bugs/feed/bug.py
+++ b/lib/lp/bugs/feed/bug.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Bug feed (syndication) views."""
@@ -147,9 +147,9 @@ class BugsFeedBase(FeedBase):
         """
         bug_ids = []
         for task in tasks:
-            if task.bugID in bug_ids:
+            if task.bug_id in bug_ids:
                 continue
-            bug_ids.append(task.bugID)
+            bug_ids.append(task.bug_id)
             if len(bug_ids) >= self.quantity:
                 break
         # XXX: BradCrittenden 2008-03-26 bug=TBD:
diff --git a/lib/lp/bugs/interfaces/bugtask.py b/lib/lp/bugs/interfaces/bugtask.py
index f7c1600..7051df8 100644
--- a/lib/lp/bugs/interfaces/bugtask.py
+++ b/lib/lp/bugs/interfaces/bugtask.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Bug task interfaces."""
@@ -374,6 +374,9 @@ class IllegalTarget(Exception):
 
 class IBugTaskDelete(Interface):
     """An interface for operations allowed with the Delete permission."""
+    def destroySelf():
+        """Removes this BugTask from the database."""
+
     @export_destructor_operation()
     @call_with(who=REQUEST_USER)
     @operation_for_version('devel')
@@ -395,30 +398,31 @@ class IBugTask(IHasBug, IBugTaskDelete):
     id = Int(title=_("Bug Task #"))
     bug = exported(
         BugField(title=_("Bug"), readonly=True))
+    bug_id = Int(title=_("The bug ID for this bug task"))
     product = Choice(
         title=_('Project'), required=False, vocabulary='Product')
-    productID = Attribute('The product ID')
+    product_id = Attribute('The product ID')
     productseries = Choice(
         title=_('Series'), required=False, vocabulary='ProductSeries')
-    productseriesID = Attribute('The product series ID')
+    productseries_id = Attribute('The product series ID')
     sourcepackagename = Choice(
         title=_("Package"), required=False,
         vocabulary='SourcePackageName')
-    sourcepackagenameID = Attribute('The sourcepackagename ID')
+    sourcepackagename_id = Attribute('The sourcepackagename ID')
     distribution = Choice(
         title=_("Distribution"), required=False, vocabulary='Distribution')
-    distributionID = Attribute('The distribution ID')
+    distribution_id = Attribute('The distribution ID')
     distroseries = Choice(
         title=_("Series"), required=False,
         vocabulary='DistroSeries')
-    distroseriesID = Attribute('The distroseries ID')
+    distroseries_id = Attribute('The distroseries ID')
     milestone = exported(ReferenceChoice(
         title=_('Milestone'),
         required=False,
         readonly=True,
         vocabulary='BugTaskMilestone',
         schema=Interface))  # IMilestone
-    milestoneID = Attribute('The id of the milestone.')
+    milestone_id = Attribute('The id of the milestone.')
 
     # The status and importance's vocabularies do not
     # contain an UNKNOWN item in bugtasks that aren't linked to a remote
@@ -440,7 +444,7 @@ class IBugTask(IHasBug, IBugTaskDelete):
             title=_('Assigned to'), required=False,
             vocabulary='ValidAssignee',
             readonly=True))
-    assigneeID = Int(title=_('The assignee ID (for eager loading)'))
+    assignee_id = Int(title=_('The assignee ID (for eager loading)'))
     bugtargetdisplayname = exported(
         Text(title=_("The short, descriptive name of the target"),
              readonly=True),
diff --git a/lib/lp/bugs/interfaces/bugtaskfilter.py b/lib/lp/bugs/interfaces/bugtaskfilter.py
index 898c955..4ecccfb 100644
--- a/lib/lp/bugs/interfaces/bugtaskfilter.py
+++ b/lib/lp/bugs/interfaces/bugtaskfilter.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2011-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Fiter bugtasks based on context."""
@@ -67,7 +67,7 @@ def filter_bugtasks_by_context(context, bugtasks):
 
     bug_mapping = defaultdict(list)
     for task in bugtasks:
-        bug_mapping[task.bugID].append(weight_calculator(task))
+        bug_mapping[task.bug_id].append(weight_calculator(task))
 
     filtered = [sorted(tasks)[0].task for tasks in six.itervalues(bug_mapping)]
-    return sorted(filtered, key=attrgetter('bugID'))
+    return sorted(filtered, key=attrgetter('bug_id'))
diff --git a/lib/lp/bugs/model/bug.py b/lib/lp/bugs/model/bug.py
index c1e35a1..12f9e72 100644
--- a/lib/lp/bugs/model/bug.py
+++ b/lib/lp/bugs/model/bug.py
@@ -659,14 +659,14 @@ class Bug(SQLBase, InformationTypeMixin):
         from lp.registry.model.productseries import ProductSeries
         from lp.registry.model.sourcepackagename import SourcePackageName
         store = Store.of(self)
-        tasks = list(store.find(BugTask, BugTask.bugID == self.id))
+        tasks = list(store.find(BugTask, BugTask.bug_id == self.id))
         # The bugtasks attribute is iterated in the API and web
         # services, so it needs to preload all related data otherwise
         # late evaluation is triggered in both places. Separately,
         # bugtask_sort_key requires the related products, series,
         # distros, distroseries and source package names to be loaded.
-        ids = set(map(operator.attrgetter('assigneeID'), tasks))
-        ids.update(map(operator.attrgetter('ownerID'), tasks))
+        ids = set(map(operator.attrgetter('assignee_id'), tasks))
+        ids.update(map(operator.attrgetter('owner_id'), tasks))
         ids.discard(None)
         if ids:
             list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
@@ -678,11 +678,11 @@ class Bug(SQLBase, InformationTypeMixin):
             if not ids:
                 return
             list(store.find(klass, klass.id.is_in(ids)))
-        load_something('productID', Product)
-        load_something('productseriesID', ProductSeries)
-        load_something('distributionID', Distribution)
-        load_something('distroseriesID', DistroSeries)
-        load_something('sourcepackagenameID', SourcePackageName)
+        load_something('product_id', Product)
+        load_something('productseries_id', ProductSeries)
+        load_something('distribution_id', Distribution)
+        load_something('distroseries_id', DistroSeries)
+        load_something('sourcepackagename_id', SourcePackageName)
         list(store.find(BugWatch, BugWatch.bugID == self.id))
         return sorted(tasks, key=bugtask_sort_key)
 
@@ -692,7 +692,7 @@ class Bug(SQLBase, InformationTypeMixin):
         from lp.registry.model.product import Product
         return Store.of(self).using(
                 BugTask,
-                LeftJoin(Product, Product.id == BugTask.productID)
+                LeftJoin(Product, Product.id == BugTask.product_id)
             ).find(
                 BugTask, bug=self
             ).order_by(
@@ -2619,10 +2619,10 @@ class BugSubscriptionInfo:
         """
         if self.bugtask is None:
             assignees = load_people(
-                Person.id.is_in(Select(BugTask.assigneeID,
+                Person.id.is_in(Select(BugTask.assignee_id,
                     BugTask.bug == self.bug)))
         else:
-            assignees = load_people(Person.id == self.bugtask.assigneeID)
+            assignees = load_people(Person.id == self.bugtask.assignee_id)
         if self.bug.private:
             return IStore(Person).find(Person,
                 Person.id.is_in([a.id for a in assignees]),
diff --git a/lib/lp/bugs/model/bugtask.py b/lib/lp/bugs/model/bugtask.py
index fb2bfee..32440f1 100644
--- a/lib/lp/bugs/model/bugtask.py
+++ b/lib/lp/bugs/model/bugtask.py
@@ -33,11 +33,6 @@ import re
 from lazr.lifecycle.event import ObjectDeletedEvent
 import pytz
 import six
-from sqlobject import (
-    ForeignKey,
-    SQLObjectNotFound,
-    StringCol,
-    )
 from storm.expr import (
     And,
     Cast,
@@ -51,6 +46,12 @@ from storm.expr import (
     Sum,
     )
 from storm.info import ClassAlias
+from storm.properties import (
+    DateTime,
+    Int,
+    Unicode,
+    )
+from storm.references import Reference
 from storm.store import (
     EmptyResultSet,
     Store,
@@ -124,18 +125,17 @@ from lp.services.database.bulk import (
     load_related,
     )
 from lp.services.database.constants import UTC_NOW
-from lp.services.database.datetimecol import UtcDateTimeCol
 from lp.services.database.decoratedresultset import DecoratedResultSet
-from lp.services.database.enumcol import EnumCol
+from lp.services.database.enumcol import DBEnum
 from lp.services.database.interfaces import IStore
 from lp.services.database.nl_search import nl_phrase_search
 from lp.services.database.sqlbase import (
     block_implicit_flushes,
     cursor,
     quote,
-    SQLBase,
     sqlvalues,
     )
+from lp.services.database.stormbase import StormBase
 from lp.services.helpers import shortlist
 from lp.services.propertycache import get_property_cache
 from lp.services.searchbuilder import any
@@ -263,23 +263,18 @@ class PassthroughValue:
 
 @block_implicit_flushes
 def validate_conjoined_attribute(self, attr, value):
+    # If this is a conjoined slave then call setattr on the master.
+    # Effectively this means that making a change to the slave will
+    # actually make the change to the master (which will then be passed
+    # down to the slave, of course). This helps to prevent OOPSes when
+    # people try to update the conjoined slave via the API.
+
     # If the value has been wrapped in a _PassthroughValue instance,
     # then we are being updated by our conjoined master: pass the
     # value through without any checking.
     if isinstance(value, PassthroughValue):
         return value.value
 
-    # Check to see if the object is being instantiated.  This test is specific
-    # to SQLBase.  Checking for specific attributes (like self.bug) is
-    # insufficient and fragile.
-    if self._SO_creating:
-        return value
-
-    # If this is a conjoined slave then call setattr on the master.
-    # Effectively this means that making a change to the slave will
-    # actually make the change to the master (which will then be passed
-    # down to the slave, of course). This helps to prevent OOPSes when
-    # people try to update the conjoined slave via the API.
     conjoined_master = self.conjoined_master
     if conjoined_master is not None:
         setattr(conjoined_master, attr, value)
@@ -409,13 +404,13 @@ def validate_new_target(bug, target, check_source_package=True):
 
 
 @implementer(IBugTask)
-class BugTask(SQLBase):
+class BugTask(StormBase):
     """See `IBugTask`."""
-    _table = "BugTask"
-    _defaultOrder = ['distribution', 'product', 'productseries',
-                     'distroseries', 'milestone', 'sourcepackagename']
+    __storm_table__ = "BugTask"
+    __storm_order__ = ['distribution', 'product', 'productseries',
+                       'distroseries', 'milestone', 'sourcepackagename']
     _CONJOINED_ATTRIBUTES = (
-        "_status", "importance", "assigneeID", "milestoneID",
+        "_status", "importance", "assignee_id", "milestone_id",
         "date_assigned", "date_confirmed", "date_inprogress",
         "date_closed", "date_incomplete", "date_left_new",
         "date_triaged", "date_fix_committed", "date_fix_released",
@@ -424,66 +419,84 @@ class BugTask(SQLBase):
 
     _inhibit_target_check = False
 
-    bug = ForeignKey(dbName='bug', foreignKey='Bug', notNull=True)
-    product = ForeignKey(
-        dbName='product', foreignKey='Product',
-        notNull=False, default=None)
-    productseries = ForeignKey(
-        dbName='productseries', foreignKey='ProductSeries',
-        notNull=False, default=None)
-    sourcepackagename = ForeignKey(
-        dbName='sourcepackagename', foreignKey='SourcePackageName',
-        notNull=False, default=None)
-    distribution = ForeignKey(
-        dbName='distribution', foreignKey='Distribution',
-        notNull=False, default=None)
-    distroseries = ForeignKey(
-        dbName='distroseries', foreignKey='DistroSeries',
-        notNull=False, default=None)
-    milestone = ForeignKey(
-        dbName='milestone', foreignKey='Milestone',
-        notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    _status = EnumCol(
-        dbName='status', notNull=True,
-        schema=(BugTaskStatus, BugTaskStatusSearch),
+    id = Int(primary=True)
+
+    bug_id = Int(name='bug', allow_none=False)
+    bug = Reference(bug_id, 'Bug.id')
+
+    product_id = Int(name="product", allow_none=True)
+    product = Reference(product_id, 'Product.id')
+
+    productseries_id = Int(name="productseries", allow_none=True)
+    productseries = Reference(productseries_id, 'ProductSeries.id')
+
+    sourcepackagename_id = Int(name="sourcepackagename", allow_none=True)
+    sourcepackagename = Reference(sourcepackagename_id, "SourcePackageName.id")
+
+    distribution_id = Int(name="distribution", allow_none=True)
+    distribution = Reference(distribution_id, "Distribution.id")
+
+    distroseries_id = Int(name="distroseries", allow_none=True)
+    distroseries = Reference(distroseries_id, "DistroSeries.id")
+
+    milestone_id = Int(
+        name="milestone", allow_none=True,
+        validator=validate_conjoined_attribute)
+    milestone = Reference(milestone_id, "Milestone.id")
+
+    _status = DBEnum(
+        name='status', allow_none=False,
+        enum=(BugTaskStatus, BugTaskStatusSearch),
         default=BugTaskStatus.NEW,
-        storm_validator=validate_status)
-    importance = EnumCol(
-        dbName='importance', notNull=True,
-        schema=BugTaskImportance,
+        validator=validate_status)
+    importance = DBEnum(
+        name='importance', allow_none=False,
+        enum=BugTaskImportance,
         default=BugTaskImportance.UNDECIDED,
-        storm_validator=validate_conjoined_attribute)
-    assignee = ForeignKey(
-        dbName='assignee', foreignKey='Person',
-        storm_validator=validate_assignee,
-        notNull=False, default=None)
-    bugwatch = ForeignKey(dbName='bugwatch', foreignKey='BugWatch',
-        notNull=False, default=None)
-    date_assigned = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    datecreated = UtcDateTimeCol(notNull=False, default=UTC_NOW)
-    date_confirmed = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_inprogress = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_closed = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_incomplete = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_left_new = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_triaged = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_fix_committed = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_fix_released = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    date_left_closed = UtcDateTimeCol(notNull=False, default=None,
-        storm_validator=validate_conjoined_attribute)
-    owner = ForeignKey(
-        dbName='owner', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
+        validator=validate_conjoined_attribute)
+
+    assignee_id = Int(
+        name="assignee", allow_none=True, validator=validate_assignee)
+    assignee = Reference(assignee_id, "Person.id")
+
+    bugwatch_id = Int(name="bugwatch", allow_none=True)
+    bugwatch = Reference(bugwatch_id, "BugWatch.id")
+
+    date_assigned = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    datecreated = DateTime(tzinfo=pytz.UTC, allow_none=True, default=UTC_NOW)
+    date_confirmed = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_inprogress = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_closed = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_incomplete = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_left_new = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_triaged = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_fix_committed = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_fix_released = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+    date_left_closed = DateTime(
+        tzinfo=pytz.UTC, allow_none=True, default=None,
+        validator=validate_conjoined_attribute)
+
+    owner_id = Int(
+        name="owner", allow_none=False, validator=validate_public_person)
+    owner = Reference(owner_id, "Person.id")
     # The targetnamecache is a value that is only supposed to be set
     # when a bugtask is created/modified or by the
     # update-bugtask-targetnamecaches cronscript. For this reason it's
@@ -492,8 +505,8 @@ class BugTask(SQLBase):
     #
     # This field is actually incorrectly named, since it currently
     # stores the bugtargetdisplayname.
-    targetnamecache = StringCol(
-        dbName='targetnamecache', notNull=False, default=None)
+    targetnamecache = Unicode(
+        name='targetnamecache', allow_none=True, default=None)
 
     @property
     def status(self):
@@ -596,6 +609,9 @@ class BugTask(SQLBase):
                 "Cannot delete only bugtask affecting: %s."
                 % self.target.bugtargetdisplayname)
 
+    def destroySelf(self):
+        Store.of(self).remove(self)
+
     def delete(self, who=None):
         """See `IBugTask`."""
         if who is None:
@@ -644,7 +660,7 @@ class BugTask(SQLBase):
             matching_bugtasks, user, limit)
 
         # Make sure to exclude the bug of the current bugtask.
-        return [bug for bug in matching_bugs if bug.id != self.bugID]
+        return [bug for bug in matching_bugs if bug.id != self.bug_id]
 
     def subscribe(self, person, subscribed_by):
         """See `IBugTask`."""
@@ -716,7 +732,7 @@ class BugTask(SQLBase):
                 'A product should always have a development series.')
             devel_focusID = self.product.development_focusID
             for bugtask in bugtasks:
-                if bugtask.productseriesID == devel_focusID:
+                if bugtask.productseries_id == devel_focusID:
                     conjoined_master = bugtask
                     break
 
@@ -1089,8 +1105,8 @@ class BugTask(SQLBase):
                 # series have tasks on this bug.
                 if not Store.of(self).find(
                     BugTask,
-                    BugTask.bugID == self.bugID,
-                    BugTask.distroseriesID == DistroSeries.id,
+                    BugTask.bug_id == self.bug_id,
+                    BugTask.distroseries_id == DistroSeries.id,
                     DistroSeries.distributionID.is_in(
                         distro.id for distro in distros if distro),
                     ).is_empty():
@@ -1324,7 +1340,7 @@ class BugTask(SQLBase):
         return self.userHasBugSupervisorPrivilegesContext(self.target, user)
 
     def __repr__(self):
-        return "<BugTask for bug %s on %r>" % (self.bugID, self.target)
+        return "<BugTask for bug %s on %r>" % (self.bug_id, self.target)
 
 
 @implementer(IBugTaskSet)
@@ -1346,9 +1362,8 @@ class BugTaskSet:
         # XXX: JSK: 2007-12-19: This method should probably return
         # None when task_id is not present. See:
         # https://bugs.launchpad.net/launchpad/+bug/123592
-        try:
-            bugtask = BugTask.get(task_id)
-        except SQLObjectNotFound:
+        bugtask = IStore(BugTask).find(BugTask, BugTask.id == task_id).one()
+        if bugtask is None:
             raise NotFoundError("BugTask with ID %s does not exist." %
                                 str(task_id))
         return bugtask
@@ -1358,7 +1373,7 @@ class BugTaskSet:
         # Import locally to avoid circular imports.
         from lp.bugs.model.bug import Bug, BugTag
         bugtask_ids = set(bugtask.id for bugtask in bugtasks)
-        bug_ids = set(bugtask.bugID for bugtask in bugtasks)
+        bug_ids = set(bugtask.bug_id for bugtask in bugtasks)
         tags = IStore(BugTag).find(
             (BugTag.tag, BugTask.id),
             BugTask.bug == Bug.id,
@@ -1375,7 +1390,7 @@ class BugTaskSet:
         # Avoid circular imports.
         from lp.registry.interfaces.person import IPersonSet
         people_ids = set(
-            [bugtask.assigneeID for bugtask in bugtasks] +
+            [bugtask.assignee_id for bugtask in bugtasks] +
             [bugtask.bug.ownerID for bugtask in bugtasks])
         people = getUtility(IPersonSet).getPrecachedPersonsFromIDs(people_ids)
         return dict(
@@ -1387,7 +1402,7 @@ class BugTaskSet:
         from lp.bugs.model.bug import Bug
         from lp.bugs.model.bugbranch import BugBranch
 
-        bug_ids = set(bugtask.bugID for bugtask in bugtasks)
+        bug_ids = set(bugtask.bug_id for bugtask in bugtasks)
         bug_ids_with_specifications = set(
             int(id) for _, id in getUtility(IXRefSet).findFromMany(
                 [(u'bug', six.text_type(bug_id)) for bug_id in bug_ids],
@@ -1397,7 +1412,7 @@ class BugTaskSet:
         # Badging looks up milestones too : eager load into the storm cache.
         milestoneset = getUtility(IMilestoneSet)
         # And trigger a load:
-        milestone_ids = set(map(attrgetter('milestoneID'), bugtasks))
+        milestone_ids = set(map(attrgetter('milestone_id'), bugtasks))
         milestone_ids.discard(None)
         if milestone_ids:
             list(milestoneset.getByIds(milestone_ids))
@@ -1415,7 +1430,7 @@ class BugTaskSet:
 
         badge_properties = {}
         for bugtask in bugtasks:
-            bug = bugs[bugtask.bugID]
+            bug = bugs[bugtask.bug_id]
             badge_properties[bugtask] = {
                 'has_specification':
                     bug.id in bug_ids_with_specifications,
@@ -1433,7 +1448,7 @@ class BugTaskSet:
         task_ids = [int(task_id) for task_id in task_ids]
         # Query the database, returning the results in a dictionary:
         if len(task_ids) > 0:
-            tasks = BugTask.select('id in %s' % sqlvalues(task_ids))
+            tasks = IStore(BugTask).find(BugTask, BugTask.id.is_in(task_ids))
             return dict([(task.id, task) for task in tasks])
         else:
             return {}
@@ -1486,12 +1501,12 @@ class BugTaskSet:
             eager_load = None
         else:
             def eager_load(rows):
-                load_related(Bug, rows, ['bugID'])
-                load_related(Product, rows, ['productID'])
-                load_related(ProductSeries, rows, ['productseriesID'])
-                load_related(Distribution, rows, ['distributionID'])
-                load_related(DistroSeries, rows, ['distroseriesID'])
-                load_related(SourcePackageName, rows, ['sourcepackagenameID'])
+                load_related(Bug, rows, ['bug_id'])
+                load_related(Product, rows, ['product_id'])
+                load_related(ProductSeries, rows, ['productseries_id'])
+                load_related(Distribution, rows, ['distribution_id'])
+                load_related(DistroSeries, rows, ['distroseries_id'])
+                load_related(SourcePackageName, rows, ['sourcepackagename_id'])
         return search_bugs(eager_load, (params,) + args)
 
     def searchBugIds(self, params):
@@ -1757,7 +1772,7 @@ class BugTaskSet:
             ids = ids[:limit]
 
         return DecoratedResultSet(
-            ids, lambda id: BugTask.get(id),
+            ids, lambda id: getUtility(IBugTaskSet).get(id),
             pre_iter_hook=lambda rows: load(BugTask, rows))
 
     def _getTargetJoinAndClause(self, target):
@@ -1946,12 +1961,12 @@ class BugTaskSet:
         # for the milestone vocabulary
         for task in bugtasks:
             task = removeSecurityProxy(task)
-            distro_ids.add(task.distributionID)
-            distro_series_ids.add(task.distroseriesID)
-            product_ids.add(task.productID)
+            distro_ids.add(task.distribution_id)
+            distro_series_ids.add(task.distroseries_id)
+            product_ids.add(task.product_id)
             if task.productseries:
                 product_ids.add(task.productseries.productID)
-            product_series_ids.add(task.productseriesID)
+            product_series_ids.add(task.productseries_id)
 
         distro_ids.discard(None)
         distro_series_ids.discard(None)
diff --git a/lib/lp/bugs/model/bugtasksearch.py b/lib/lp/bugs/model/bugtasksearch.py
index 15a489d..9ceb517 100644
--- a/lib/lp/bugs/model/bugtasksearch.py
+++ b/lib/lp/bugs/model/bugtasksearch.py
@@ -957,9 +957,9 @@ def _build_exclude_conjoined_clause(milestone):
         current_series = milestone.distribution.currentseries
         join = LeftJoin(
             ConjoinedMaster,
-            And(ConjoinedMaster.bugID == BugTaskFlat.bug_id,
+            And(ConjoinedMaster.bug_id == BugTaskFlat.bug_id,
                 BugTaskFlat.distribution_id == milestone.distribution.id,
-                ConjoinedMaster.distroseriesID == current_series.id,
+                ConjoinedMaster.distroseries_id == current_series.id,
                 Not(ConjoinedMaster._status.is_in(
                         BugTask._NON_CONJOINED_STATUSES))))
         join_tables = [(ConjoinedMaster, join)]
@@ -974,8 +974,8 @@ def _build_exclude_conjoined_clause(milestone):
                 LeftJoin(Product, BugTaskFlat.product_id == Product.id),
                 LeftJoin(
                     ConjoinedMaster,
-                    And(ConjoinedMaster.bugID == BugTaskFlat.bug_id,
-                        ConjoinedMaster.productseriesID
+                    And(ConjoinedMaster.bug_id == BugTaskFlat.bug_id,
+                        ConjoinedMaster.productseries_id
                             == Product.development_focusID,
                         Not(ConjoinedMaster._status.is_in(
                                 BugTask._NON_CONJOINED_STATUSES)))),
@@ -987,9 +987,9 @@ def _build_exclude_conjoined_clause(milestone):
                 milestone.product.development_focusID)
             join = LeftJoin(
                 ConjoinedMaster,
-                And(ConjoinedMaster.bugID == BugTaskFlat.bug_id,
+                And(ConjoinedMaster.bug_id == BugTaskFlat.bug_id,
                     BugTaskFlat.product_id == milestone.product.id,
-                    ConjoinedMaster.productseriesID == dev_focus_id,
+                    ConjoinedMaster.productseries_id == dev_focus_id,
                     Not(ConjoinedMaster._status.is_in(
                             BugTask._NON_CONJOINED_STATUSES))))
             join_tables = [(ConjoinedMaster, join)]
@@ -1054,9 +1054,9 @@ def _build_pending_bugwatch_elsewhere_clause(params):
         # Restrict the target to params.upstream_target.
         target = params.upstream_target
         if IProduct.providedBy(target):
-            target_col = RelatedBugTask.productID
+            target_col = RelatedBugTask.product_id
         elif IDistribution.providedBy(target):
-            target_col = RelatedBugTask.distributionID
+            target_col = RelatedBugTask.distribution_id
         else:
             raise AssertionError(
                 'params.upstream_target must be a Distribution or '
@@ -1070,10 +1070,10 @@ def _build_pending_bugwatch_elsewhere_clause(params):
         extra_joins = [
             LeftJoin(
                 OtherDistribution,
-                OtherDistribution.id == RelatedBugTask.distributionID),
+                OtherDistribution.id == RelatedBugTask.distribution_id),
             LeftJoin(
                 OtherProduct,
-                OtherProduct.id == RelatedBugTask.productID),
+                OtherProduct.id == RelatedBugTask.product_id),
             ]
         target_clause = Or(
             OtherDistribution.official_malone == False,
@@ -1091,9 +1091,9 @@ def _build_pending_bugwatch_elsewhere_clause(params):
         1,
         tables=[RelatedBugTask] + extra_joins,
         where=And(
-            RelatedBugTask.bugID == BugTaskFlat.bug_id,
+            RelatedBugTask.bug_id == BugTaskFlat.bug_id,
             task_match_clause,
-            RelatedBugTask.bugwatchID == None,
+            RelatedBugTask.bugwatch_id == None,
             RelatedBugTask._status != BugTaskStatus.INVALID,
             target_clause)))
 
@@ -1102,18 +1102,18 @@ def _build_no_upstream_bugtask_clause(params):
     """Return a clause for BugTaskSearchParams.has_no_upstream_bugtask."""
     OtherBugTask = ClassAlias(BugTask)
     if params.upstream_target is None:
-        target = OtherBugTask.productID != None
+        target = OtherBugTask.product_id != None
     elif IProduct.providedBy(params.upstream_target):
-        target = OtherBugTask.productID == params.upstream_target.id
+        target = OtherBugTask.product_id == params.upstream_target.id
     elif IDistribution.providedBy(params.upstream_target):
-        target = OtherBugTask.distributionID == params.upstream_target.id
+        target = OtherBugTask.distribution_id == params.upstream_target.id
     else:
         raise AssertionError(
             'params.upstream_target must be a Distribution or '
             'a Product')
     return Not(Exists(Select(
         1, tables=[OtherBugTask],
-        where=And(OtherBugTask.bugID == BugTaskFlat.bug_id, target))))
+        where=And(OtherBugTask.bug_id == BugTaskFlat.bug_id, target))))
 
 
 def _build_open_or_resolved_upstream_clause(params,
@@ -1128,12 +1128,12 @@ def _build_open_or_resolved_upstream_clause(params,
         RelatedBugTask._status, any(*statuses_for_upstream_tasks))
     if params.upstream_target is None:
         watch_target_clause = True
-        no_watch_target_clause = RelatedBugTask.productID != None
+        no_watch_target_clause = RelatedBugTask.product_id != None
     else:
         if IProduct.providedBy(params.upstream_target):
-            target_col = RelatedBugTask.productID
+            target_col = RelatedBugTask.product_id
         elif IDistribution.providedBy(params.upstream_target):
-            target_col = RelatedBugTask.distributionID
+            target_col = RelatedBugTask.distribution_id
         else:
             raise AssertionError(
                 'params.upstream_target must be a Distribution or '
@@ -1144,14 +1144,14 @@ def _build_open_or_resolved_upstream_clause(params,
         1,
         tables=[RelatedBugTask],
         where=And(
-            RelatedBugTask.bugID == BugTaskFlat.bug_id,
+            RelatedBugTask.bug_id == BugTaskFlat.bug_id,
             RelatedBugTask.id != BugTaskFlat.bugtask_id,
             Or(
                 And(watch_target_clause,
-                    RelatedBugTask.bugwatchID != None,
+                    RelatedBugTask.bugwatch_id != None,
                     watch_status_clause),
                 And(no_watch_target_clause,
-                    RelatedBugTask.bugwatchID == None,
+                    RelatedBugTask.bugwatch_id == None,
                     no_watch_status_clause)))))
 
 
diff --git a/lib/lp/bugs/model/cve.py b/lib/lp/bugs/model/cve.py
index 05b5fa8..553bff3 100644
--- a/lib/lp/bugs/model/cve.py
+++ b/lib/lp/bugs/model/cve.py
@@ -203,7 +203,7 @@ class CveSet:
 
     def getBugCvesForBugTasks(self, bugtasks, cve_mapper=None):
         """See ICveSet."""
-        bugs = bulk.load_related(Bug, bugtasks, ('bugID', ))
+        bugs = bulk.load_related(Bug, bugtasks, ('bug_id', ))
         if len(bugs) == 0:
             return []
         store = Store.of(bugtasks[0])
diff --git a/lib/lp/bugs/model/personsubscriptioninfo.py b/lib/lp/bugs/model/personsubscriptioninfo.py
index 3767e6b..1d82c22 100644
--- a/lib/lp/bugs/model/personsubscriptioninfo.py
+++ b/lib/lp/bugs/model/personsubscriptioninfo.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2011-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -184,8 +184,8 @@ class PersonSubscriptions(object):
         list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
             [bug.ownerID for bug in bugs]))
         all_tasks = [task for task in bug.bugtasks for bug in bugs]
-        load_related(Product, all_tasks, ['productID'])
-        load_related(Distribution, all_tasks, ['distributionID'])
+        load_related(Product, all_tasks, ['product_id'])
+        load_related(Distribution, all_tasks, ['distribution_id'])
         for bug in bugs:
             # indicate the reporter and bug_supervisor
             duplicates.annotateReporter(bug, bug.owner)
diff --git a/lib/lp/bugs/scripts/bugsummaryrebuild.py b/lib/lp/bugs/scripts/bugsummaryrebuild.py
index 3537a98..ab89e7b 100644
--- a/lib/lp/bugs/scripts/bugsummaryrebuild.py
+++ b/lib/lp/bugs/scripts/bugsummaryrebuild.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -69,9 +69,9 @@ def get_bugsummary_targets():
 def get_bugtask_targets():
     """Get the current set of targets represented in BugTask."""
     new_targets = set(IStore(BugTask).find(
-        (BugTask.productID, BugTask.productseriesID,
-         BugTask.distributionID, BugTask.distroseriesID,
-         BugTask.sourcepackagenameID)).config(distinct=True))
+        (BugTask.product_id, BugTask.productseries_id,
+         BugTask.distribution_id, BugTask.distroseries_id,
+         BugTask.sourcepackagename_id)).config(distinct=True))
     # BugSummary counts package tasks in the packageless totals, so
     # ensure that there's also a packageless total for each distro(series).
     new_targets.update(set(
diff --git a/lib/lp/bugs/scripts/bugtasktargetnamecaches.py b/lib/lp/bugs/scripts/bugtasktargetnamecaches.py
index 429ff49..5e4cb1e 100644
--- a/lib/lp/bugs/scripts/bugtasktargetnamecaches.py
+++ b/lib/lp/bugs/scripts/bugtasktargetnamecaches.py
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """A utility module for the update-bugtasktargetnamecaches.py cronscript."""
@@ -32,8 +32,8 @@ from lp.services.looptuner import (
 # These two tuples must be in the same order. They specify the ID
 # columns to get from BugTask, and the classes that they correspond to.
 target_columns = (
-    BugTask.productID, BugTask.productseriesID, BugTask.distributionID,
-    BugTask.distroseriesID, BugTask.sourcepackagenameID,
+    BugTask.product_id, BugTask.productseries_id, BugTask.distribution_id,
+    BugTask.distroseries_id, BugTask.sourcepackagename_id,
     BugTask.targetnamecache)
 target_classes = (
     Product, ProductSeries, Distribution, DistroSeries, SourcePackageName)
diff --git a/lib/lp/code/model/branchcollection.py b/lib/lp/code/model/branchcollection.py
index f07416a..0ab5fd8 100644
--- a/lib/lp/code/model/branchcollection.py
+++ b/lib/lp/code/model/branchcollection.py
@@ -550,7 +550,7 @@ class GenericBranchCollection:
             store = IStore(BugBranch)
             rs = store.using(
                 BugBranch,
-                Join(BugTask, BugTask.bugID == BugBranch.bug_id),
+                Join(BugTask, BugTask.bug_id == BugBranch.bug_id),
             ).find(
                 (BugTask, BugBranch),
                 BugBranch.bug_id.is_in(bug_ids),
diff --git a/lib/lp/registry/browser/milestone.py b/lib/lp/registry/browser/milestone.py
index 936967a..263bd8a 100644
--- a/lib/lp/registry/browser/milestone.py
+++ b/lib/lp/registry/browser/milestone.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Milestone views."""
@@ -234,7 +234,7 @@ class MilestoneViewMixin(object):
         # We want the assignees loaded as we show them in the milestone home
         # page.
         list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
-            [bug.assigneeID for bug in non_conjoined_slaves],
+            [bug.assignee_id for bug in non_conjoined_slaves],
             need_validity=True))
         return non_conjoined_slaves
 
diff --git a/lib/lp/registry/model/distribution.py b/lib/lp/registry/model/distribution.py
index b9baba7..0f07325 100644
--- a/lib/lp/registry/model/distribution.py
+++ b/lib/lp/registry/model/distribution.py
@@ -1473,7 +1473,7 @@ class Distribution(SQLBase, BugTargetBase, MakesAnnouncements,
         distributionID = self.id
 
         def weight_function(bugtask):
-            if bugtask.distributionID == distributionID:
+            if bugtask.distribution_id == distributionID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
             return OrderedBugTask(2, bugtask.id, bugtask)
 
diff --git a/lib/lp/registry/model/distroseries.py b/lib/lp/registry/model/distroseries.py
index 9f0fc8c..2811a42 100644
--- a/lib/lp/registry/model/distroseries.py
+++ b/lib/lp/registry/model/distroseries.py
@@ -1454,9 +1454,9 @@ class DistroSeries(SQLBase, BugTargetBase, HasSpecificationsMixin,
         distributionID = self.distributionID
 
         def weight_function(bugtask):
-            if bugtask.distroseriesID == seriesID:
+            if bugtask.distroseries_id == seriesID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
-            elif bugtask.distributionID == distributionID:
+            elif bugtask.distribution_id == distributionID:
                 return OrderedBugTask(2, bugtask.id, bugtask)
             else:
                 return OrderedBugTask(3, bugtask.id, bugtask)
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 6f96764..197fd84 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -1477,8 +1477,8 @@ class Person(
         tasks = list(getUtility(IBugTaskSet).search(search_params))
         # Eager load the things we need that are not already eager loaded by
         # BugTaskSet.search().
-        bulk.load_related(Person, tasks, ['assigneeID'])
-        bulk.load_related(Milestone, tasks, ['milestoneID'])
+        bulk.load_related(Person, tasks, ['assignee_id'])
+        bulk.load_related(Milestone, tasks, ['milestone_id'])
 
         for task in tasks:
             # We skip masters (instead of slaves) from conjoined relationships
@@ -1821,7 +1821,7 @@ class Person(
                 Bug.id,
                 tables=(
                     Bug,
-                    Join(BugTask, BugTask.bugID == Bug.id)),
+                    Join(BugTask, BugTask.bug_id == Bug.id)),
                 where=And(Bug.information_type.is_in(
                     PRIVATE_INFORMATION_TYPES),
                     BugTask.assignee == self.id)),
diff --git a/lib/lp/registry/model/product.py b/lib/lp/registry/model/product.py
index ae43ede..07d652e 100644
--- a/lib/lp/registry/model/product.py
+++ b/lib/lp/registry/model/product.py
@@ -1470,7 +1470,7 @@ class Product(SQLBase, BugTargetBase, MakesAnnouncements,
         productID = self.id
 
         def weight_function(bugtask):
-            if bugtask.productID == productID:
+            if bugtask.product_id == productID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
             return OrderedBugTask(2, bugtask.id, bugtask)
 
diff --git a/lib/lp/registry/model/productseries.py b/lib/lp/registry/model/productseries.py
index 416577e..3459214 100644
--- a/lib/lp/registry/model/productseries.py
+++ b/lib/lp/registry/model/productseries.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Models for `IProductSeries`."""
@@ -575,9 +575,9 @@ class ProductSeries(SQLBase, BugTargetBase, HasMilestonesMixin,
         productID = self.productID
 
         def weight_function(bugtask):
-            if bugtask.productseriesID == seriesID:
+            if bugtask.productseries_id == seriesID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
-            elif bugtask.productID == productID:
+            elif bugtask.product_id == productID:
                 return OrderedBugTask(2, bugtask.id, bugtask)
             else:
                 return OrderedBugTask(3, bugtask.id, bugtask)
diff --git a/lib/lp/registry/model/sourcepackage.py b/lib/lp/registry/model/sourcepackage.py
index 9e40417..61b66e4 100644
--- a/lib/lp/registry/model/sourcepackage.py
+++ b/lib/lp/registry/model/sourcepackage.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Database classes that implement SourcePackage items."""
@@ -774,14 +774,14 @@ class SourcePackage(BugTargetBase, HasCodeImportsMixin,
         distributionID = self.distroseries.distributionID
 
         def weight_function(bugtask):
-            if bugtask.sourcepackagenameID == sourcepackagenameID:
-                if bugtask.distroseriesID == seriesID:
+            if bugtask.sourcepackagename_id == sourcepackagenameID:
+                if bugtask.distroseries_id == seriesID:
                     return OrderedBugTask(1, bugtask.id, bugtask)
-                elif bugtask.distributionID == distributionID:
+                elif bugtask.distribution_id == distributionID:
                     return OrderedBugTask(2, bugtask.id, bugtask)
-            elif bugtask.distroseriesID == seriesID:
+            elif bugtask.distroseries_id == seriesID:
                 return OrderedBugTask(3, bugtask.id, bugtask)
-            elif bugtask.distributionID == distributionID:
+            elif bugtask.distribution_id == distributionID:
                 return OrderedBugTask(4, bugtask.id, bugtask)
             # Catch the default case, and where there is a task for the same
             # sourcepackage on a different distro.
diff --git a/lib/lp/registry/scripts/closeaccount.py b/lib/lp/registry/scripts/closeaccount.py
index fba057f..9949b95 100644
--- a/lib/lp/registry/scripts/closeaccount.py
+++ b/lib/lp/registry/scripts/closeaccount.py
@@ -235,7 +235,7 @@ def close_account(username, log):
 
     # Reassign their bugs
     table_notification('BugTask')
-    store.find(BugTask, BugTask.assigneeID == person.id).set(assigneeID=None)
+    store.find(BugTask, BugTask.assignee_id == person.id).set(assignee_id=None)
 
     # Reassign questions assigned to the user, and close all their questions
     # in non-final states since nobody else can.