launchpad-reviewers team mailing list archive

[Ioana Lasc <ioana.lasc@xxxxxxxxxxxxx>]

Ioana Lasc has proposed merging ~ilasc/launchpad:stormify-bug-tracker-alias into launchpad:master.

Commit message:
Stormify BugTrackerAlias

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ilasc/launchpad/+git/launchpad/+merge/390351
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilasc/launchpad:stormify-bug-tracker-alias into launchpad:master.

diff --git a/lib/lp/bugs/model/bugtracker.py b/lib/lp/bugs/model/bugtracker.py
index 21375c7..5a92614 100644
--- a/lib/lp/bugs/model/bugtracker.py
+++ b/lib/lp/bugs/model/bugtracker.py
@@ -16,6 +16,7 @@ from itertools import chain
 
 from lazr.uri import URI
 from pytz import timezone
+import six
 from six.moves.urllib.parse import (
     quote,
     urlsplit,
@@ -33,13 +34,13 @@ from storm.expr import (
     Count,
     Desc,
     Not,
-    SQL,
     )
 from storm.locals import (
     Bool,
     Int,
     Reference,
     ReferenceSet,
+    SQL,
     Unicode,
     )
 from storm.store import Store
@@ -552,8 +553,9 @@ class BugTracker(SQLBase):
 
     # Join to return a list of BugTrackerAliases relating to this
     # BugTracker.
-    _bugtracker_aliases = SQLMultipleJoin(
-        'BugTrackerAlias', joinColumn='bugtracker')
+    _bugtracker_aliases = ReferenceSet(
+        '<primary key>',
+        'BugTrackerAlias.bugtracker_id')
 
     def _get_aliases(self):
         """See `IBugTracker.aliases`."""
@@ -585,7 +587,7 @@ class BugTracker(SQLBase):
             BugTrackerAlias(bugtracker=self, base_url=url)
         for url in to_del:
             alias = current_aliases_by_url[url]
-            alias.destroySelf()
+            alias.delete()
 
     aliases = property(
         _get_aliases, _set_aliases, None,
@@ -785,9 +787,10 @@ class BugTrackerSet:
                      for url in permutations))),
             # Search for any permutation in BugTrackerAlias.
             (alias.bugtracker for alias in
-             BugTrackerAlias.select(
-                    OR(*(BugTrackerAlias.q.base_url == url
-                         for url in permutations)))))
+             IStore(BugTrackerAlias).find(
+                 BugTrackerAlias,
+                 OR(*(BugTrackerAlias.base_url == six.ensure_text(url)
+                      for url in permutations)))))
         # Return the first match.
         for bugtracker in matching_bugtrackers:
             return bugtracker
@@ -866,12 +869,22 @@ class BugTrackerSet:
 
 
 @implementer(IBugTrackerAlias)
-class BugTrackerAlias(SQLBase):
+class BugTrackerAlias(StormBase):
     """See `IBugTrackerAlias`."""
+    __storm_table__ = 'BugTrackerAlias'
+    id = Int(primary=True)
+
+    bugtracker_id = Int(name='bugtracker', allow_none=False)
+    bugtracker = Reference(bugtracker_id, 'BugTracker.id')
+
+    base_url = Unicode(allow_none=False)
+
+    def __init__(self, bugtracker, base_url):
+        self.bugtracker = bugtracker
+        self.base_url = six.ensure_text(base_url)
 
-    bugtracker = ForeignKey(
-        foreignKey="BugTracker", dbName="bugtracker", notNull=True)
-    base_url = StringCol(notNull=True)
+    def delete(self):
+        Store.of(self).remove(self)
 
 
 @implementer(IBugTrackerAliasSet)
@@ -882,4 +895,6 @@ class BugTrackerAliasSet:
 
     def queryByBugTracker(self, bugtracker):
         """See IBugTrackerSet."""
-        return self.table.selectBy(bugtracker=bugtracker.id)
+        return IStore(BugTrackerAlias).find(
+            BugTrackerAlias,
+            bugtracker=bugtracker.id)