MONDRIAN: Sybase support.

[git-p4: depot-paths = "//open/mondrian/": change = 2779]
pentaho · Oct 20, 2004 · e2a0798 · e2a0798
1 parent 252aac9
commit e2a0798
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 26 deletions.
diff --git a/src/main/mondrian/rolap/SqlMemberSource.java b/src/main/mondrian/rolap/SqlMemberSource.java
@@ -189,36 +189,58 @@ private String makeLevelMemberCountSql(RolapLevel level,
 			return sqlQuery.toString();
 		}
 		if (!sqlQuery.allowsFromQuery()) {
-			// "select count(distinct c1, c2) from table"
 			String columnList = "";
+			int columnCount = 0;
 			for (int i = levelDepth; i >= 0; i--) {
 				RolapLevel level2 = levels[i];
 				if (level2.isAll()) {
 					 continue;
 				}
-				if (columnList.length() > 0) {
-					// for databases where both SELECT-in-FROM and COUNT DISTINCT do not work,
-					//  we do not generate any count and do the count distinct "manually".
-					if (!sqlQuery.allowsCompoundCountDistinct())
+				if (columnCount > 0) {
+					if (sqlQuery.allowsCompoundCountDistinct()) {
+						columnList += ", ";
+					} else if (true) {
+						// for databases where both SELECT-in-FROM and
+						// COUNT DISTINCT do not work, we do not
+						// generate any count and do the count
+						// distinct "manually".
 						mustCount[0] = true;
-					/*
-					if (!sqlQuery.allowsCompoundCountDistinct()) {
-						// I don't know know of a database where this would
-						// happen. MySQL does not allow SELECT-in-FROM, but it
-						// does allow compound COUNT DISTINCT.
+					} else if (sqlQuery.isSybase()) {
+						// "select count(distinct convert(varchar, c1) +
+						// convert(varchar, c2)) from table"
+						if (columnCount == 1) {
+							// Conversion to varchar is expensive, so we only
+							// do it when we know we are dealing with a
+							// compound key.
+							columnList = "convert(varchar, " + columnList + ")";
+						}
+						columnList += " + ";
+					} else {
+						// Apparently this database allows neither
+						// SELECT-in-FROM nor compound COUNT DISTINCT. I don't
+						// know any database where this happens. If you receive
+						// this error, try a workaround similar to the Sybase
+						// workaround above.
 						throw Util.newInternal(
 							"Cannot generate query to count members of level '" +
 							level.getUniqueName() +
 							"': database supports neither SELECT-in-FROM nor compound COUNT DISTINCT");
 					}
-					*/
-					columnList += ", ";
 				}
 				hierarchy.addToFrom(sqlQuery, level2.keyExp, null);
-				columnList += level2.keyExp.getExpression(sqlQuery);
+
+				String keyExp = level2.keyExp.getExpression(sqlQuery);
+				if (columnCount > 0 &&
+					!sqlQuery.allowsCompoundCountDistinct() &&
+					sqlQuery.isSybase()) {
+					keyExp = "convert(varchar, " + columnList + ")";
+				}
+				columnList += keyExp;
+
 				if (level2.unique) {
 					break; // no further qualification needed
 				}
+					++columnCount;
 			}
 			if (mustCount[0]) {
 				sqlQuery.addSelect(columnList);
@@ -660,7 +682,8 @@ public void getMemberChildren(RolapMember parentMember, List children)
         }
     }
 
-    private void getMemberChildren(RolapMember parentMember, List children, Connection jdbcConnection) {
+    private void getMemberChildren(RolapMember parentMember, List children,
+            Connection jdbcConnection) {
         String sql;
         boolean parentChild;
         final RolapLevel parentLevel = (RolapLevel) parentMember.getLevel();

diff --git a/src/main/mondrian/rolap/sql/SqlQuery.java b/src/main/mondrian/rolap/sql/SqlQuery.java
@@ -197,6 +197,9 @@ private String getProductVersion() {
 	}
 
 
+	public boolean isAccess() {
+		return getProduct().equals("ACCESS");
+	}
 	public boolean isDB2() {
 		// DB2 on NT returns "DB2/NT"
 		return getProduct().startsWith("DB2");
@@ -227,40 +230,39 @@ public boolean isOldAS400() {
 	}
 
 
-	public boolean isOracle() {
-		return getProduct().equals("Oracle");
+	public boolean isInformix() {
+		return getProduct().startsWith("Informix");
 	}
 	public boolean isMSSql() {
 		return getProduct().equalsIgnoreCase("Microsoft SQL Server");
 	}
-	public boolean isAccess() {
-		return getProduct().equals("ACCESS");
+    public boolean isMSSQL() {
+        return getProduct().toUpperCase().indexOf("SQL SERVER") >= 0;
+    }
+	public boolean isOracle() {
+		return getProduct().equals("Oracle");
 	}
 	public boolean isPostgres() {
 		return getProduct().toUpperCase().indexOf("POSTGRE") >= 0;
 	}
-    public boolean isMSSQL() {
-        return getProduct().toUpperCase().indexOf("SQL SERVER") >= 0;
-    }
 	public boolean isMySQL() {
 		return getProduct().toUpperCase().equals("MYSQL");
 	}
-	public boolean isInformix() {
-		return getProduct().startsWith("Informix");
+	public boolean isSybase() {
+		return getProduct().toUpperCase().indexOf("SYBASE") >= 0;
 	}
 
-
 	// -- behaviors --
 	protected boolean requiresAliasForFromItems() {
 		return isPostgres();
 	}
 	protected boolean allowsAs() {
-		return !isOracle();
+		return !isOracle() && !isSybase();
 	}
 	/** Whether "select * from (select * from t)" is OK. **/
 	public boolean allowsFromQuery() {
 		// older versions of AS400 do not allow FROM subqueries
-		return !(isMySQL() || isOldAS400() || isInformix());
+		return !isMySQL() && !isOldAS400() && !isInformix() && !isSybase();
 	}
 	/** Whether "select count(distinct x, y) from t" is OK. **/
 	public boolean allowsCompoundCountDistinct() {