[MONDRIAN-1708] Some small tweaks to the informix dialect. It now use…

…s ANSI style nulls ordering. Plus, I've fixed the loader to load foodmart and such into the test DBs.
perryhau · Sep 10, 2013 · 02304d4 · 02304d4
1 parent 28175fc
commit 02304d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/main/mondrian/spi/impl/InformixDialect.java b/src/main/mondrian/spi/impl/InformixDialect.java
@@ -37,6 +37,20 @@ public InformixDialect(Connection connection) throws SQLException {
     public boolean allowsFromQuery() {
         return false;
     }
+
+    @Override
+    public String generateOrderByNulls(
+        String expr,
+        boolean ascending,
+        boolean collateNullsLast)
+    {
+        return generateOrderByNullsAnsi(expr, ascending, collateNullsLast);
+    }
+
+    @Override
+    public boolean supportsGroupByExpressions() {
+        return false;
+    }
 }
 
 // End InformixDialect.java
diff --git a/testsrc/main/mondrian/test/DialectTest.java b/testsrc/main/mondrian/test/DialectTest.java
@@ -840,6 +840,10 @@ private String dialectize(String s) {
             s = s.replace(']', '"');
             s = s.replaceAll(" as ", " ");
             break;
+        case INFORMIX:
+            s = s.replace("[", "");
+            s = s.replace("]", "");
+            break;
         default:
             s = s.replace('[', '"');
             s = s.replace(']', '"');

diff --git a/testsrc/main/mondrian/test/loader/MondrianFoodMartLoader.java b/testsrc/main/mondrian/test/loader/MondrianFoodMartLoader.java
@@ -3143,6 +3143,7 @@ private String columnValue(
             case NEOVIEW:
             case VECTORWISE:
             case VERTICA:
+            case INFORMIX:
                 if (trimmedValue.equals("true")) {
                     return "1";
                 } else if (trimmedValue.equals("false")) {
@@ -3345,6 +3346,8 @@ String toPhysical(Dialect dialect) {
                     return "DATETIME";
                 case INGRES:
                     return "INGRESDATE";
+                case INFORMIX:
+                    return "DATETIME YEAR TO FRACTION(1)";
                 default:
                     return name;
                 }