Changeset 5046

Timestamp:

Aug 12, 2009, 11:12:48 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1357: Incorrect HQL is generated when sorting on an aliased property that is followed by an association path

File:

• trunk/src/core/net/sf/basedb/core/ItemContext.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -1039 +1039 @@
           {
             String toJoin = sortProperty.substring(0, dotIndex);
+            if (alias != null) toJoin = "$" + alias + "." + toJoin;
             leftJoins.add(toJoin);
             sortedProperties.add(toJoin);
@@ -1117 +1118 @@
       {
         boolean fetch = selectOrderBy && sortedProperties.contains(property);
+        String alias = null;
         if (property.startsWith("@") || property.startsWith("£") || property.startsWith("&")) 
         {
           property = property.substring(1);
         }
+        if (property.startsWith("$"))
+        {
+          int dotIndex = property.indexOf('.');
+          alias = property.substring(1, dotIndex);
+          property = property.substring(dotIndex+1);
+        }
         i++;
-        query.join(Hql.leftJoin(null, property, "alj"+i, null, fetch));
+        query.join(Hql.leftJoin(alias, property, "alj"+i, null, fetch));
       }
     }