Fixes bug 3042937. Escaped single quotes that were nested in a single…

… quoted section were unparsed as unescaped single quotes.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@348 c6a108a4-781c-0410-a6c6-c2d559e19af0

src/org/olap4j/mdx/IdentifierNode.java

@@ -165,7 +165,11 @@ public <T> T accept(ParseTreeVisitor<T> visitor) {
  }
 
  public void unparse(ParseTreeWriter writer) {
- writer.getPrintWriter().print(toString());
+ String str = toString();
+ if(writer.isInsideSingleQuote()) {
+ str = str.replace("'", "''");
+ }
+ writer.getPrintWriter().print(str);
  }
 
  public String toString() {

src/org/olap4j/mdx/ParseTreeWriter.java

@@ -41,6 +41,7 @@ public class ParseTreeWriter {
  private final PrintWriter pw;
  private int linePrefixLength;
  private String linePrefix;
+ private boolean isInsideSingleQuote;
 
  private static final int INDENT = 4;
  private static String bigString = " ";
@@ -112,6 +113,14 @@ private static synchronized String spaces(int n)
  }
  return bigString.substring(0, n);
  }
+
+ boolean isInsideSingleQuote() {
+ return isInsideSingleQuote;
+ }
+
+ void setInsideSingleQuote(boolean isInsideSingleQuote) {
+ this.isInsideSingleQuote = isInsideSingleQuote;
+ }
 }
 
 // End ParseTreeWriter.java

src/org/olap4j/mdx/WithMemberNode.java

@@ -63,7 +63,12 @@ public void unparse(ParseTreeWriter writer) {
  pw.print("MEMBER ");
  name.unparse(writer);
  pw.print(" AS '");
- expression.unparse(writer);
+ writer.setInsideSingleQuote(true);
+ try {
+ expression.unparse(writer);
+ } finally {
+ writer.setInsideSingleQuote(false);
+ }
  pw.print("'");
  if (memberPropertyList != null) {
  for (PropertyValueNode memberProperty : memberPropertyList) {

testsrc/org/olap4j/mdx/MdxTest.java

@@ -12,6 +12,10 @@
 
 import java.util.*;
 
+import org.olap4j.mdx.parser.MdxParser;
+import org.olap4j.mdx.parser.impl.DefaultMdxParserImpl;
+import org.olap4j.test.TestContext;
+
 /**
  * Testcase for org.olap4j.mdx package.
  *
@@ -109,6 +113,25 @@ public void testParseIdentifier() {
  e.getMessage());
  }
  }
+
+ /**
+ * Tests that escaped single quotes ('') nested inside a quoted
+ * part of a query are unparsed as escaped quotes as well.
+ */
+ public void testQuoteEscaping() {
+ final String query =
+ "WITH\n"
+ + "MEMBER [CustomerDim].[CustomerName].[XL_QZX] AS 'Aggregate"
+ + "({[CustomerDim].[CustomerName].&[ABC INT''L],"
+ + " [CustomerDim].[CustomerName].&[XYZ]})'\n"
+ + "SELECT\n"
+ + "{[Measures].[Sales]} ON COLUMNS\n"
+ + "FROM [cube]\n"
+ + "WHERE ([CustomerDim].[CustomerName].[XL_QZX])";
+ final MdxParser parser = new DefaultMdxParserImpl();
+ final SelectNode rootNode = parser.parseSelect(query);
+ assertEquals(query,TestContext.unfold(rootNode.toString()));
+ }
 }
 
 // End MdxTest.java

testsrc/org/olap4j/test/TestContext.java

@@ -73,6 +73,25 @@ public static SafeString fold(String string) {
  }
  }
 
+ /**
+ * Reverses the effect of {@link #fold}; converts platform-specific line
+ * endings in a string info linefeeds.
+ *
+ * @param string String where all linefeeds have been converted to
+ * platform-specific (CR+LF on Windows, LF on Unix/Linux)
+ * @return String where line endings are represented as linefeed "\n"
+ */
+ public static String unfold(String string) {
+ if (!NL.equals("\n")) {
+ string = Olap4jUtil.replace(string, NL, "\n");
+ }
+ if (string == null) {
+ return null;
+ } else {
+ return string;
+ }
+ }
+
  /**
  * Converts an MDX parse tree to an MDX string
  *