MONDRIAN: Changes for Cloudscape/Derby

[git-p4: depot-paths = "//open/mondrian/": change = 3454]
pentaho · Apr 12, 2005 · 3f5cc4d · 3f5cc4d
1 parent 7cdf656
commit 3f5cc4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/mondrian/olap/Mondrian.xml b/src/main/mondrian/olap/Mondrian.xml
@@ -710,6 +710,7 @@ Revision is $Id$
             <Value>hsqldb</Value>
             <Value>mssql</Value>
             <Value>sybase</Value>
+            <Value>cloudscape</Value>
         </Attribute>
         <CData/>
     </Element>

diff --git a/src/main/mondrian/rolap/sql/SqlQuery.java b/src/main/mondrian/rolap/sql/SqlQuery.java
@@ -318,6 +318,14 @@ public boolean isAccess() {
         return getProduct().equals("ACCESS");
     }
 
+    public boolean isDerby() {
+        return getProduct().trim().toUpperCase().equals("APACHE DERBY");
+    }
+
+    public boolean isCloudscape() {
+        return getProduct().trim().toUpperCase().equals("DBMS:CLOUDSCAPE");
+    }
+
     public boolean isDB2() {
         // DB2 on NT returns "DB2/NT"
         return getProduct().startsWith("DB2");
@@ -364,6 +372,8 @@ private String getBestName() {
             best = "postgres";
         } else if (isSybase()) {
             best = "sybase";
+        } else if (isCloudscape() || isDerby()) {
+            best = "cloudscape";
         } else {
             best = "generic";
         }
@@ -652,7 +662,11 @@ public void addHaving(final String expression)
 
     public void addOrderBy(final String expression)
     {
-        orderBy.add(expression);
+    	if (isDerby() || isCloudscape()) {
+    		orderBy.add(quoteIdentifier("c" + (select.size() - 1)));
+    	} else {
+    		orderBy.add(expression);
+    	}
     }
 
     public String toString()