MONRG: Fix double-doubled quotes in generated .properties file.

[git-p4: depot-paths = "//open/mondrian/": change = 309]
pentaho · Feb 19, 2003 · 09484fc · 09484fc
1 parent 70c4270
commit 09484fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/mondrian/resource/Util.java b/src/main/mondrian/resource/Util.java
@@ -234,7 +234,7 @@ static String quoteForProperties(String val) {
 		String s0;
 		s0 = replace(val, "\\", "\\\\");
 //		s0 = replace(val, "\"", "\\\"");
-		s0 = replace(s0, "'", "''");
+//		s0 = replace(s0, "'", "''");
 		s0 = replace(s0, "\n\r", "\\n");
 		s0 = replace(s0, "\n", "\\n");
 		s0 = replace(s0, "\r", "\\r");

diff --git a/src/main/mondrian/test/ParameterTest.java b/src/main/mondrian/test/ParameterTest.java
@@ -102,15 +102,15 @@ public void testParamRef() {
 		assertEquals("xyY.xyY",s);
 	}
 	public void testParamRefWithoutParamFails() {
-		assertExprThrows("ParamRef(\"Y\")", "Parameter ''Y'' is referenced but never defined");
+		assertExprThrows("ParamRef(\"Y\")", "Parameter 'Y' is referenced but never defined");
 	}
 	public void testParamDefinedTwiceFails() {
 		assertThrows(
 				"select {[Measures].[Unit Sales]} on rows," + nl +
 				" {Parameter(\"P\",[Gender],[Gender].[M],\"Which gender?\")," + nl +
 				"  Parameter(\"P\",[Gender],[Gender].[F],\"Which gender?\")} on columns" + nl +
 				"from Sales",
-				"Parameter ''P'' is defined ''2'' times");
+				"Parameter 'P' is defined '2' times");
 	}
 	public void testParameterMetadata() {
 		Connection connection = getConnection();