Fix merge conflicts for pull request #242

Signed-off-by: Isaac Bennetch <[email protected]>

Author: ibennetch

src/Context.php

@@ -409,7 +409,7 @@ public static function isSymbol($str)
             return Token::FLAG_SYMBOL_VARIABLE;
         } elseif ($str[0] === '`') {
             return Token::FLAG_SYMBOL_BACKTICK;
-        } elseif ($str[0] === ':') {
+        } elseif ($str[0] === ':' || $str[0] === '?') {
             return Token::FLAG_SYMBOL_PARAMETER;
         }
 

src/Lexer.php

@@ -877,7 +877,7 @@ public function parseSymbol()
                 $flags |= Token::FLAG_SYMBOL_SYSTEM;
             }
         } elseif ($flags & Token::FLAG_SYMBOL_PARAMETER) {
-            if ($this->last + 1 < $this->len) {
+            if ($token !== '?' && $this->last + 1 < $this->len) {
                 ++$this->last;
             }
         } else {

src/Utils/Formatter.php

@@ -225,6 +225,13 @@ protected function getDefaultFormats()
                 'cli' => "\x1b[91m",
                 'function' => '',
             ],
+            [
+                'type' => Token::TYPE_SYMBOL,
+                'flags' => Token::FLAG_SYMBOL_PARAMETER,
+                'html' => 'class="sql-parameter"',
+                'cli' => "\x1b[31m",
+                'function' => '',
+            ],
             [
                 'type' => Token::TYPE_SYMBOL,
                 'flags' => 0,

tests/Lexer/TokenTest.php

@@ -75,6 +75,12 @@ public function testExtractSymbol()
 
         $tok = new Token('@`foo`', Token::TYPE_SYMBOL, Token::FLAG_SYMBOL_VARIABLE);
         $this->assertEquals($tok->value, 'foo');
+
+        $tok = new Token(':foo', Token::TYPE_SYMBOL, Token::FLAG_SYMBOL_PARAMETER);
+        $this->assertEquals($tok->value, 'foo');
+
+        $tok = new Token('?', Token::TYPE_SYMBOL, Token::FLAG_SYMBOL_PARAMETER);
+        $this->assertEquals($tok->value, '?');
     }
 
     public function testInlineToken()

tests/Utils/FormatterTest.php

@@ -506,6 +506,48 @@ public function formatQueries()
                     "\x1b[0m",
                 'html' => '<span class="sql-reserved">JOIN</span> tbl2 <span class="sql-reserved">ON</span> c1 = c2',
             ],
+            'named param' => [
+                'query' => 'select * from tbl where col = :param',
+                'text' => 'SELECT' . "\n" .
+                    '    *' . "\n" .
+                    'FROM' . "\n" .
+                    '    tbl' . "\n" .
+                    'WHERE' . "\n" .
+                    '    col = :param',
+                'cli' => "\x1b[35mSELECT" . "\n" .
+                    "    \x1b[39m*" . "\n" .
+                    "\x1b[35mFROM" . "\n" .
+                    "    \x1b[39mtbl" . "\n" .
+                    "\x1b[35mWHERE" . "\n" .
+                    "    \x1b[39mcol = \x1b[31m:param" . "\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
+                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
+                    '<span class="sql-reserved">WHERE</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;col = <span class="sql-parameter">:param</span>',
+            ],
+            'anon param' => [
+                'query' => 'select * from tbl where col = ?',
+                'text' => 'SELECT' . "\n" .
+                    '    *' . "\n" .
+                    'FROM' . "\n" .
+                    '    tbl' . "\n" .
+                    'WHERE' . "\n" .
+                    '    col = ?',
+                'cli' => "\x1b[35mSELECT" . "\n" .
+                    "    \x1b[39m*" . "\n" .
+                    "\x1b[35mFROM" . "\n" .
+                    "    \x1b[39mtbl" . "\n" .
+                    "\x1b[35mWHERE" . "\n" .
+                    "    \x1b[39mcol = \x1b[31m?" . "\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
+                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
+                    '<span class="sql-reserved">WHERE</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;col = <span class="sql-parameter">?</span>',
+            ],
         ];
     }
 }