Поддержка условия "или" при биндинге

Author: kikimor

Parser.php

@@ -128,7 +128,7 @@ private function simplifyParams($params)
     private function parseSql()
     {
         // Разбор многострочных комментариев
-        if (preg_match_all('#/\*(\w+)(.+?)\*/#s', $this->sql, $matches)) {
+        if (preg_match_all('#/\*([\w|]+)(.+?)\*/#s', $this->sql, $matches)) {
             $count = count($matches[0]);
             for ($i = 0; $i < $count; $i++) {
                 $this->replaceComment($matches[0][$i], $matches[2][$i], $matches[1][$i]);
@@ -137,7 +137,7 @@ private function parseSql()
 
         // Многоитерационный разбор однострчных комментариев
         while (true) {
-            if (preg_match_all('#--\*(\w+)(.+)#', $this->sql, $matches)) {
+            if (preg_match_all('#--\*([\w|]+)(.+)#', $this->sql, $matches)) {
                 $count = count($matches[0]);
                 for ($i = 0; $i < $count; $i++) {
                     $this->replaceComment($matches[0][$i], $matches[2][$i], $matches[1][$i]);
@@ -159,7 +159,21 @@ private function parseSql()
     private function replaceComment($comment, $queryInComment, $paramName)
     {
         $param = $this->getParam($paramName);
-        if ($param) {
+
+        if (strpos($paramName, '|')) {
+            $found = false;
+
+            foreach (explode('|', $paramName) as $param) {
+                if (array_key_exists($param, $this->params)) {
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                $queryInComment = '';
+            }
+        } elseif ($param) {
             $paramName = $param[0];
             $paramValue = $param[1];
             if (is_array($paramValue)) {

tests/SqlParserTest.php

@@ -14,6 +14,8 @@ public function sqlData()
                 /*param4 --*param5 sql5 */
                 /*param8 --*param9 --*param10 sql10 */
                 --*param11 :@param11
+                --*param12|param13 test multiple
+                /*param14|param15 test multiple*/
         ';
 
         return [
@@ -29,7 +31,8 @@ public function sqlData()
             ["-- test\n".$query, [], '/^-- test$/'],
             [$query, ['param11' => [['v1', 'v2']]], "/^:param11_0,:param11_1$/"],
             ["--*param order by param", ['param' => ['v1', 'bind' => 'text']], "/^order by v1$/"],
-
+            [$query, ['param12' => 'test'], "/^test multiple$/"],
+            [$query, ['param14' => 'test'], "/^test multiple$/"],
         ];
     }