grouping/sorting on link to same class fixed [SF#1404930]

Author: Richard Jones

CHANGES.txt

@@ -30,7 +30,7 @@ Fixed:
 - french translation updated by Patrick Decat (sf patch 1397059)
 - HTTP authorization takes precedence over session cookie (sf bug 1396134)
 - enforce correct encoding of PostgreSQL backend (sf bug 1374235)
-
+- grouping/sorting on link to same class fixed (sf bug 1404930)
 
 2005-10-07 0.9.0b1
 Feature:

roundup/backends/back_mysql.py

@@ -1,4 +1,4 @@
-#$Id: back_mysql.py,v 1.64 2006-01-20 02:40:56 richard Exp $
+#$Id: back_mysql.py,v 1.65 2006-01-20 02:42:35 richard Exp $
 #
 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
 #
@@ -741,9 +741,9 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     op = link.orderprop ()
                     if op != 'id':
                         tn = '_' + lcn
-                        loj.append('LEFT OUTER JOIN %s on %s=%s.id'%(tn,
-                            o, tn))
-                        o = tn + '._%s'%op
+                        loj.append('LEFT OUTER JOIN %s as rhs_ on %s=rhs_.id'
+                                  %(tn, o))
+                        o = 'rhs_._%s'%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.161 2006-01-20 02:40:56 richard Exp $
+# $Id: rdbms_common.py,v 1.162 2006-01-20 02:42:35 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2202,9 +2202,9 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     op = link.orderprop()
                     if op != 'id':
                         tn = '_' + lcn
-                        loj.append('LEFT OUTER JOIN %s on %s=%s.id'%(tn,
-                            o, tn))
-                        o = tn + '._%s'%op
+                        loj.append('LEFT OUTER JOIN %s as rhs_ on %s=rhs_.id'
+                                  %(tn, o))
+                        o = 'rhs_._%s'%op
                     ordercols.append(o)
                 elif prop == 'id':
                     o = '_%s.id'%cn