fix LIKE query issue. (#44)

* fix LIKE issue * code review comments Co-authored-by: Yasmine Mortazavi <[email protected]>
slackhq · Mar 24, 2020 · 30fbdd2 · 30fbdd2
1 parent ea3710a
commit 30fbdd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Expressions/BinaryOperatorExpression.php b/src/Expressions/BinaryOperatorExpression.php
@@ -226,6 +226,9 @@ public function evaluate(row $row, AsyncMysqlConnection $conn): mixed {
           $pattern = Str\strip_suffix($pattern, '%');
         }
 
+        // escape all + characters
+        $pattern = \preg_quote($pattern, '/');
+
         // replace only unescaped % and _ characters to make regex
         $pattern = Regex\replace($pattern, re"/(?<!\\\)%/", '.*?');
         $pattern = Regex\replace($pattern, re"/(?<!\\\)_/", '.');

diff --git a/tests/SelectExpressionTest.php b/tests/SelectExpressionTest.php
@@ -204,11 +204,11 @@ final class SelectExpressionTest extends HackTest {
 	public async function testLike(): Awaitable<void> {
 		$conn = static::$conn as nonnull;
 		$results = await $conn->query(
-			"SELECT 'foo' LIKE 'foo' as test1, 'foobarbaz' like '%bar%' test2, 'foobaz' LIKE 'foo_az' test3, 'foobarqux' like 'foo%' test4, 'foobarqux' LIKE '%qux' test5, 'blahfoobarbazqux blah' LIKE '%foo%qux%' test6, 'blegh' LIKE '%foo%' test7",
+			"SELECT 'foo' LIKE 'foo' as test1, 'foobarbaz' like '%bar%' test2, 'foobaz' LIKE 'foo_az' test3, 'foobarqux' like 'foo%' test4, 'foobarqux' LIKE '%qux' test5, 'blahfoobarbazqux blah' LIKE '%foo%qux%' test6, 'blegh' LIKE '%foo%' test7, 'foo+bar' LIKE '%foo+bar%' test8, 'foo/bar' LIKE '%foo/bar%' test9",
 		);
 		expect($results->rows())->toBeSame(
 			vec[
-				dict['test1' => 1, 'test2' => 1, 'test3' => 1, 'test4' => 1, 'test5' => 1, 'test6' => 1, 'test7' => 0],
+				dict['test1' => 1, 'test2' => 1, 'test3' => 1, 'test4' => 1, 'test5' => 1, 'test6' => 1, 'test7' => 0, 'test8' => 1, 'test9' => 1],
 			],
 		);
 	}