Changeset 2812

Timestamp:

Oct 27, 2006, 12:58:29 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #414: Experiment explorer not working in Postgres

Location:

trunk/src/core/net/sf/basedb/core

Files:

• ItemContext.java (modified) (2 diffs)
• dbengine/AbstractDbEngine.java (modified) (1 diff)
• dbengine/DbEngine.java (modified) (1 diff)
• dbengine/PostgresDbEngine.java (modified) (1 diff)

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

@@ -1054 +1054 @@
     if (sortProperties != null)
     {
+      boolean selectSortProperties = 
+        query.isDistinct() && HibernateUtil.getDbEngine().selectOrderByColumnsIfDistinct();
+      int sortIndex = 0;
       String[] sp = sortProperties.split(",");
       for (String sortProperty : sp)
@@ -1061 +1064 @@
         {
           query.order(SortDirection.ASC == getSortDirection() ? Orders.asc(sortby) : Orders.desc(sortby));
+          if (selectionList == null || !selectionList.contains(sortProperty))
+          {
+            // We must add the sort property to the selection list
+            query.select(Selects.expression(sortby, "sorted" + sortIndex));
+          }
         }
+        sortIndex++;
       }
     }

trunk/src/core/net/sf/basedb/core/dbengine/AbstractDbEngine.java

@@ -93 +93 @@
   }
   /**
+    Returns FALSE.
+  */
+  public boolean selectOrderByColumnsIfDistinct()
+  {
+    return false;
+  }
+
+  /**
     Return <code>LN(&lt;value&gt;)</code>.
   */

trunk/src/core/net/sf/basedb/core/dbengine/DbEngine.java

@@ -179 +179 @@
   
   /**
+    If the database requires that columns appearing in the
+    ORDER BY part of the query must also be part of the SELECT
+    list when using the DISTINCT keyword.
+    @return TRUE if order by columns must be selected, FALSE otherwise
+  */
+  public boolean selectOrderByColumnsIfDistinct();
+  
+  /**
     If we need to check for invalid arguments to numerical
     functions to avoid exceptions from the database. Postgres,

trunk/src/core/net/sf/basedb/core/dbengine/PostgresDbEngine.java

@@ -186 +186 @@
     return true;
   }
+  /**
+    Returns TRUE.
+  */
+  public boolean selectOrderByColumnsIfDistinct()
+  {
+    return true;
+  }
   // -------------------------------------------