MONDRIAN: integrate change #14842 from pacino: [MONDRIAN-1057] Fixes …

…a problem with the regular expression support in MySQL and Oracle dialects. They were only removing a single pair of \Q and \R markers and would not remove the others, if any. [git-p4: depot-paths = "//open/mondrian/": change = 14850]
pentaho · Dec 23, 2011 · b31087d · b31087d
1 parent d0d97d6
commit b31087d
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 14 deletions.
diff --git a/src/main/mondrian/spi/impl/MySqlDialect.java b/src/main/mondrian/spi/impl/MySqlDialect.java
@@ -26,7 +26,7 @@ public class MySqlDialect extends JdbcDialectImpl {
 
     private final String flagsRegexp = "^(\\(\\?([a-zA-Z])\\)).*$";
     private final Pattern flagsPattern = Pattern.compile(flagsRegexp);
-    private final String escapeRegexp = "^.*(\\\\Q(.*)\\\\E).*$";
+    private final String escapeRegexp = "(\\\\Q([^\\\\Q]+)\\\\E)";
     private final Pattern escapePattern = Pattern.compile(escapeRegexp);
 
     public static final JdbcDialectFactory FACTORY =
@@ -285,13 +285,11 @@ public String generateRegularExpression(
                 + javaRegex.substring(flagsMatcher.end(1));
         }
         final Matcher escapeMatcher = escapePattern.matcher(javaRegex);
-        if (escapeMatcher.matches()) {
-            String sequence = escapeMatcher.group(2);
-            sequence = sequence.replaceAll("\\\\", "\\\\");
+        while (escapeMatcher.find()) {
             javaRegex =
-                javaRegex.substring(0, escapeMatcher.start(1))
-                + sequence.toUpperCase()
-                + javaRegex.substring(escapeMatcher.end(1));
+                javaRegex.replace(
+                    escapeMatcher.group(1),
+                    escapeMatcher.group(2));
         }
         final StringBuilder sb = new StringBuilder();
         sb.append("UPPER(");

diff --git a/src/main/mondrian/spi/impl/OracleDialect.java b/src/main/mondrian/spi/impl/OracleDialect.java
@@ -23,7 +23,7 @@ public class OracleDialect extends JdbcDialectImpl {
 
     private final String flagsRegexp = "^(\\(\\?([a-zA-Z])\\)).*$";
     private final Pattern flagsPattern = Pattern.compile(flagsRegexp);
-    private final String escapeRegexp = "^.*(\\\\Q(.*)\\\\E).*$";
+    private final String escapeRegexp = "(\\\\Q([^\\\\Q]+)\\\\E)";
     private final Pattern escapePattern = Pattern.compile(escapeRegexp);
 
     public static final JdbcDialectFactory FACTORY =
@@ -112,15 +112,11 @@ public String generateRegularExpression(
             suffix = "";
         }
         final Matcher escapeMatcher = escapePattern.matcher(javaRegex);
-        if (escapeMatcher.matches()) {
-            // We need to convert escape characters \E and \Q into
-            // oracle compatible escapes.
-            String sequence = escapeMatcher.group(2);
-            sequence = sequence.replaceAll("\\\\", "\\\\");
+        while (escapeMatcher.find()) {
             javaRegex =
                 javaRegex.replace(
                     escapeMatcher.group(1),
-                    sequence);
+                    escapeMatcher.group(2));
         }
         final StringBuilder sb = new StringBuilder();
         sb.append("REGEXP_LIKE(");

diff --git a/testsrc/main/mondrian/test/DialectTest.java b/testsrc/main/mondrian/test/DialectTest.java
@@ -943,6 +943,50 @@ public void testAllowsRegularExpressionInWhereClause() throws Exception {
         }
     }
 
+    /**
+     * This is a test for
+     * <a href="http://jira.pentaho.com/browse/MONDRIAN-1057">
+     * http://jira.pentaho.com/browse/MONDRIAN-1057</a>
+     * Some dialects are not removing the \Q and \E markers if they
+     * are in the middle of the regexp.
+     */
+    public void testComplexRegularExpression() throws Exception {
+        final String regexp =
+            "(?i).*\\QJeanne\\E.*|.*\\QSheri\\E.*|.*\\QJonathan\\E.*|.*\\QJewel\\E.*";
+        Dialect dialect = getDialect();
+        if (dialect.allowsRegularExpressionInWhereClause()) {
+            assertNotNull(
+                dialect.generateRegularExpression(
+                    dialect.quoteIdentifier("customer", "fname"),
+                    regexp));
+            StringBuilder sb =
+                new StringBuilder(
+                    "select "
+                    + dialect.quoteIdentifier("customer", "fname")
+                    + " from "
+                    + dialect.quoteIdentifier("customer")
+                    + " group by "
+                    + dialect.quoteIdentifier("customer", "fname")
+                    + " having "
+                    + dialect.generateRegularExpression(
+                        dialect.quoteIdentifier("customer", "fname"),
+                        regexp));
+            final ResultSet resultSet =
+                getConnection().createStatement().executeQuery(sb.toString());
+            int i = 0;
+            while (resultSet.next()) {
+                i++;
+            }
+            assertEquals(7, i);
+            resultSet.close();
+        } else {
+            assertNull(
+                dialect.generateRegularExpression(
+                    "Foo",
+                    "(?i).*\\QBar\\E.*"));
+        }
+    }
+
     public void testRegularExpressionSqlInjection() throws SQLException {
         // bug mondrian-983
         // We know that mysql's dialect can handle this regex