Fixed SQL generation for sort/group by separate Link properties [SF#1417565]

Metakit fails the new test. I have no idea why.

Author: Richard Jones

CHANGES.txt

@@ -1,7 +1,12 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2005-01-27 1.0
+2006-??-?? 1.0.1
+Fixed:
+- SQL generation for sort/group by separate Link properties (sf bug
+  1417565)
+
+2006-01-27 1.0
 Feature:
 - Lithuanian translation by Aiste Kesminaite
 - Web User Interface language selection by form variable @language,

roundup/backends/back_mysql.py

@@ -1,4 +1,4 @@
-#$Id: back_mysql.py,v 1.65 2006-01-20 02:42:35 richard Exp $
+#$Id: back_mysql.py,v 1.66 2006-01-30 00:36:26 richard Exp $
 #
 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
 #
@@ -723,6 +723,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         orderby = []
         ordercols = []
         mlsort = []
+        rhsnum = 0
         for sortby in group, sort:
             sdir, prop = sortby
             if sdir and prop:
@@ -741,9 +742,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     op = link.orderprop ()
                     if op != 'id':
                         tn = '_' + lcn
-                        loj.append('LEFT OUTER JOIN %s as rhs_ on %s=rhs_.id'
-                                  %(tn, o))
-                        o = 'rhs_._%s'%op
+                        rhs = 'rhs%s_'%rhsnum
+                        rhsnum += 1
+                        loj.append('LEFT OUTER JOIN %s as %s on %s=%s.id'%(
+                            tn, rhs, o, rhs))
+                        o = '%s._%s'%(rhs, op)
                     ordercols.append(o)
                 elif prop == 'id':
                     o = '_%s.id'%cn

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.163 2006-01-24 08:27:54 a1s Exp $
+# $Id: rdbms_common.py,v 1.164 2006-01-30 00:36:26 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2158,6 +2158,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         orderby = []
         ordercols = []
         mlsort = []
+        rhsnum = 0
         for sortby in group, sort:
             sdir, prop = sortby
             if sdir and prop:
@@ -2176,9 +2177,11 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     op = link.orderprop()
                     if op != 'id':
                         tn = '_' + lcn
-                        loj.append('LEFT OUTER JOIN %s as rhs_ on %s=rhs_.id'
-                                  %(tn, o))
-                        o = 'rhs_._%s'%op
+                        rhs = 'rhs%s_'%rhsnum
+                        rhsnum += 1
+                        loj.append('LEFT OUTER JOIN %s as %s on %s=%s.id'%(
+                            tn, rhs, o, rhs))
+                        o = '%s._%s'%(rhs, op)
                     ordercols.append(o)
                 elif prop == 'id':
                     o = '_%s.id'%cn

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.63 2006-01-23 05:24:33 richard Exp $
+# $Id: db_test_base.py,v 1.64 2006-01-30 00:36:26 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -1021,6 +1021,15 @@ def testFilteringMultilinkSort(self):
         ae(filt(None, {}, ('+','nosy'), (None,None)), ['1', '2', '4', '3'])
         ae(filt(None, {}, ('-','nosy'), (None,None)), ['3', '4', '1', '2'])
 
+    def testFilteringLinkSortGroup(self):
+        # 1: status: 2, priority: 3
+        # 2: status: 1, priority: 3
+        # 3: status: 1, priority: 2,
+        # 4: status: 3, priority: 2,
+        ae, filt = self.filteringSetup()
+        ae(filt(None, {}, ('+','status'), ('+','priority')),
+            ['1', '2', '4', '3'])
+
     def testFilteringDateSort(self):
         # '1': '2003-02-16.22:50'
         # '2': '2003-01-01.00:00'