MONDRIAN: Fix for DB2 loading from a file

[git-p4: depot-paths = "//open/mondrian/": change = 4009]
pentaho · Aug 23, 2005 · 903ef56 · 903ef56
1 parent 69860b2
commit 903ef56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/mondrian/rolap/sql/SqlQuery.java b/src/main/mondrian/rolap/sql/SqlQuery.java
@@ -750,7 +750,7 @@ public void quoteIdentifier(final String qual,
 
         public String getQuoteIdentifierString() {
             if (isDB2()) {
-                return null;
+                return "";
             } else {
                 return quoteIdentifierString;
             }

diff --git a/testsrc/main/mondrian/test/loader/MondrianFoodMartLoader.java b/testsrc/main/mondrian/test/loader/MondrianFoodMartLoader.java
@@ -1683,6 +1683,7 @@ private String columnValue(String columnValue, Column column) throws Exception {
             String trimmedValue = columnValue.trim();
             if (!sqlQuery.getDialect().isMySQL() &&
                     !sqlQuery.getDialect().isOracle() &&
+                    !sqlQuery.getDialect().isDB2() &&
                     !sqlQuery.getDialect().isFirebird()) {
                 if (trimmedValue.equals("1")) {
                     return "true";