Fix bug in SQL generation

Fix subtle bug when sorting by a Link that contains a Multilink from
which we also search for an attribute. In that case the LEFT OUTER JOIN
clause was missing in generated SQL.

Author: schlatterbeck

CHANGES.txt

@@ -43,6 +43,9 @@ Fixed:
   (James Mack)
 - Fix String search with special SQL wildcard characters in LIKE/ILIKE
   clause and add testcase (Ralf Schlatterbeck)
+- Fix subtle bug when sorting by a Link that contains a Multilink from
+  which we also search for an attribute. In that case the LEFT OUTER
+  JOIN clause was missing in generated SQL. (Ralf Schlatterbeck)
 
 
 2013-07-06: 1.5.0

roundup/hyperdb.py

@@ -372,9 +372,9 @@ def compute_sort_done(self, mlseen=False):
         ('sort' in self.need_for) or all children have tree_sort_done set and
         sort_ids_needed unset: set self.tree_sort_done if one of the conditions
         holds. Also remove sort_ids_needed recursively once having seen a
-        Multilink.
+        Multilink that is used for sorting.
         """
-        if isinstance (self.propclass, Multilink):
+        if isinstance (self.propclass, Multilink) and 'sort' in self.need_for:
             mlseen = True
         if mlseen:
             self.sort_ids_needed = False

test/db_test_base.py

@@ -73,7 +73,9 @@ def setupTracker(dirname, backend="anydbm"):
     return tracker
 
 def setupSchema(db, create, module):
-    status = module.Class(db, "status", name=String())
+    mls = module.Class(db, "mls", name=String())
+    mls.setkey("name")
+    status = module.Class(db, "status", name=String(), mls=Multilink("mls"))
     status.setkey("name")
     priority = module.Class(db, "priority", name=String(), order=String())
     priority.setkey("name")
@@ -104,7 +106,9 @@ def setupSchema(db, create, module):
             password=password.Password('sekrit'))
         user.create(username="fred", roles='User',
             password=password.Password('sekrit'), address='[email protected]')
-        status.create(name="unread")
+        u1 = mls.create(name="unread_1")
+        u2 = mls.create(name="unread_2")
+        status.create(name="unread",mls=[u1, u2])
         status.create(name="in-progress")
         status.create(name="testing")
         status.create(name="resolved")
@@ -1280,6 +1284,14 @@ def testFilteringLink(self):
             ae(filt(None, {a: ['-1', None]}, ('+','id'), grp), ['3','4'])
             ae(filt(None, {a: ['1', None]}, ('+','id'), grp), ['1', '3','4'])
 
+    def testFilteringLinkSortSearchMultilink(self):
+        ae, filter, filter_iter = self.filteringSetup()
+        a = 'assignedto'
+        grp = (None, None)
+        for filt in filter, filter_iter:
+            ae(filt(None, {'status.mls': '1'}, ('+','status')), ['2','3'])
+            ae(filt(None, {'status.mls': '2'}, ('+','status')), ['2','3'])
+
     def testFilteringMultilinkAndGroup(self):
         """testFilteringMultilinkAndGroup:
         See roundup Bug 1541128: apparently grouping by something and