MONDRIAN: support db2 as sql dialect. added test for captions.

[git-p4: depot-paths = "//open/mondrian/": change = 3481]
pentaho · Apr 20, 2005 · dadc728 · dadc728
1 parent fcb42ff
commit dadc728
Show file tree

Hide file tree

Showing 6 changed files with 648 additions and 0 deletions.
diff --git a/demo/FoodMart.xml b/demo/FoodMart.xml
@@ -149,6 +149,9 @@ fname + ' ' + lname
           </SQL>
           <SQL dialect="derby">
 "customer"."fullname"
+          </SQL>
+          <SQL dialect="db2">
+CONCAT(CONCAT("fname", ' '), "lname")
           </SQL>
           <SQL dialect="generic">
 fullname
@@ -477,6 +480,9 @@ fname + ' ' + lname
           </SQL>
           <SQL dialect="derby">
 "customer"."fullname"
+          </SQL>
+          <SQL dialect="db2">
+CONCAT(CONCAT("fname", ' '), "lname")
           </SQL>
           <SQL dialect="generic">
 fullname

diff --git a/src/main/mondrian/olap/Mondrian.xml b/src/main/mondrian/olap/Mondrian.xml
@@ -711,6 +711,7 @@ Revision is $Id$
             <Value>mssql</Value>
             <Value>sybase</Value>
             <Value>derby</Value>
+            <Value>db2</Value>
         </Attribute>
         <CData/>
     </Element>

diff --git a/src/main/mondrian/rolap/sql/SqlQuery.java b/src/main/mondrian/rolap/sql/SqlQuery.java
@@ -374,6 +374,8 @@ private String getBestName() {
             best = "sybase";
         } else if (isCloudscape() || isDerby()) {
             best = "derby";
+        } else if (isDB2()) {
+            best = "db2";
         } else {
             best = "generic";
         }