StandardExpressionFunctions#escapeがescapeCharを使用していない

Author: pinzolo

src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java

@@ -915,16 +915,16 @@ public String escape(String text, char escapeChar) {
             if (text == null) {
                 return null;
             }
-            return escapeWildcard(defaultWildcardReplacementPattern, text,
-                    defaultReplacement);
+            return escapeWildcard(text, escapeChar);
         }
 
         @Override
         public String escape(String text) {
             if (text == null) {
                 return null;
             }
-            return escapeWildcard(text, escapeChar);
+            return escapeWildcard(defaultWildcardReplacementPattern, text,
+                    defaultReplacement);
         }
 
         @Override

src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java

@@ -47,6 +47,24 @@ public void testRemoveQuote() {
         assertEquals("bbb", dialect.removeQuote("bbb"));
     }
 
+    public void testExpressionFunctions_escape() throws Exception {
+        StandardDialect dialect = new StandardDialect();
+        ExpressionFunctions functions = dialect.getExpressionFunctions();
+        assertEquals("a$$a$%a$_", functions.escape("a$a%a_"));
+    }
+
+    public void testExpressionFunctions_escape_withExclamation() throws Exception {
+        StandardDialect dialect = new StandardDialect();
+        ExpressionFunctions functions = dialect.getExpressionFunctions();
+        assertEquals("a!!a!%a!_", functions.escape("a!a%a_", '!'));
+    }
+
+    public void testExpressionFunctions_escape_withBackslash() throws Exception {
+        StandardDialect dialect = new StandardDialect();
+        ExpressionFunctions functions = dialect.getExpressionFunctions();
+        assertEquals("a\\\\a\\%a\\_", functions.escape("a\\a%a_", '\\'));
+    }
+
     public void testExpressionFunctions_prefix() throws Exception {
         StandardDialect dialect = new StandardDialect();
         ExpressionFunctions functions = dialect.getExpressionFunctions();