Changeset 3777

Timestamp:

Sep 25, 2007, 11:35:01 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #785: ItemContext?.configureQuery() should use fetch join if a non-selected column is used in ORDER BY

File:

• branches/2.4-stable/src/core/net/sf/basedb/core/ItemContext.java (modified) (3 diffs)

branches/2.4-stable/src/core/net/sf/basedb/core/ItemContext.java

@@ -898 +898 @@
     // Tempoarary storage for all associations that must be left joined
     Set<String> leftJoins = autoLeftJoin ? new HashSet<String>() : null;
+    Set<String> sortedProperties = autoLeftJoin ? new HashSet<String>() : null;
     
     // Add sort order information
@@ -930 +931 @@
           if (dotIndex >= 0)
           {
-            leftJoins.add(sortProperty.substring(0, dotIndex));
+            String toJoin = sortProperty.substring(0, dotIndex);
+            leftJoins.add(toJoin);
+            sortedProperties.add(toJoin);
           }
         }
@@ -995 +998 @@
     {
       int i = 0;
+      // Use fetch joins for columns appearing in the ORDER BY clause
+      // if the query is distinct and the database requires it
+      boolean selectOrderBy = query.isDistinct() && 
+        HibernateUtil.getDbEngine().selectOrderByColumnsIfDistinct();
       for (String property : leftJoins)
       {
+        boolean fetch = selectOrderBy && sortedProperties.contains(property);
         if (property.startsWith("@")) property = property.substring(1);
         i++;
-        query.join(Hql.leftJoin(property, "alj"+i));
+        query.join(Hql.leftJoin(null, property, "alj"+i, null, fetch));
       }
     }