MONDRIAN: Fixes some issues with the Vertica dialect. It wasn't getti…

…ng detected correctly accross all versions. [git-p4: depot-paths = "//open/mondrian/": change = 14900]
pentaho · Jan 24, 2012 · 1104a01 · 1104a01
1 parent 8b1e3d5
commit 1104a01
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/mondrian/spi/impl/JdbcDialectImpl.java b/src/main/mondrian/spi/impl/JdbcDialectImpl.java
@@ -944,7 +944,9 @@ public static DatabaseProduct getProduct(
             return DatabaseProduct.INFOBRIGHT;
         } else if (upperProductName.equals("MYSQL")) {
             return DatabaseProduct.MYSQL;
-        } else if (upperProductName.equals("VERTICA")) {
+        } else if (upperProductName.equals("VERTICA")
+            || upperProductName.equals("VERTICA DATABASE"))
+        {
             return DatabaseProduct.VERTICA;
         } else if (upperProductName.equals("VECTORWISE")) {
             return DatabaseProduct.VECTORWISE;

diff --git a/src/main/mondrian/spi/impl/VerticaDialect.java b/src/main/mondrian/spi/impl/VerticaDialect.java
@@ -39,6 +39,15 @@ public boolean requiresAliasForFromQuery() {
         return true;
     }
 
+    public boolean allowsFromQuery() {
+        return true;
+    }
+
+    @Override
+    public boolean allowsCountDistinct() {
+        return false;
+    }
+
     @Override
     public DatabaseProduct getDatabaseProduct() {
         return DatabaseProduct.VERTICA;