Fixed LIKE escaping issues

danielgindi · Sep 25, 2018 · 8340fa1 · 8340fa1
1 parent dd2467c
commit 8340fa1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/dg.Sql.Connector.MySql/MySqlConnector.cs b/dg.Sql.Connector.MySql/MySqlConnector.cs
@@ -242,12 +242,12 @@ public override string FormatDate(DateTime dateTime)
 
         public override string EscapeLike(string expression)
         {
-            return expression.Replace(@"'", @"''").Replace(@"%", @"%%");
+            return expression.Replace("%", "\x10%");
         }
 
         public override string LikeEscapingStatement
         {
-            get { return @"ESCAPE('\\')"; }
+            get { return "ESCAPE('\x10')"; }
         }
 
         #endregion

diff --git a/dg.Sql.Connector.PostgreSQL/PostgreSQLConnector.cs b/dg.Sql.Connector.PostgreSQL/PostgreSQLConnector.cs
@@ -209,21 +209,14 @@ public override string FormatDate(DateTime dateTime)
 
         public override string EscapeLike(string expression)
         {
-            return expression.Replace(@"_", @"\_").Replace(@"%", @"\%");
+            return expression.Replace(@"_", @"\x10_").Replace(@"%", @"\x10%");
         }
 
         public override string LikeEscapingStatement
         {
             get 
             {
-                if (GetPostgreSQLMode().StandardConformingStrings)
-                {
-                    return @"ESCAPE('\')";
-                }
-                else
-                {
-                    return @"ESCAPE('\\')";
-                }
+                return "ESCAPE('\x10')";
             }
         }