Remove unnecessary string concatenation

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

1 files changed, 130 insertions, 130 deletions

diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php
index 0c09215..f54f31f 100644
--- a/tests/Utils/FormatterTest.php
+++ b/tests/Utils/FormatterTest.php
@@ -267,9 +267,9 @@ class FormatterTest extends TestCase
                 'query' => 'select 1',
                 'text' => 'SELECT' . "\n" .
                     '    1',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[92m1" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[92m1\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
             ],
             'simply' => [
@@ -280,17 +280,17 @@ class FormatterTest extends TestCase
                     '    tbl' . "\n" .
                     'WHERE' . "\n" .
                     '    1',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[39m*" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[39mtbl" . "\n" .
-                    "\x1b[35mWHERE" . "\n" .
-                    "    \x1b[92m1" . "\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/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[39m*\n" .
+                    "\x1b[35mFROM\n" .
+                    "    \x1b[39mtbl\n" .
+                    "\x1b[35mWHERE\n" .
+                    "    \x1b[92m1\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;<span class="sql-number">1</span>',
             ],
             'typical' => [
@@ -308,31 +308,31 @@ class FormatterTest extends TestCase
                     '    id' . "\n" .
                     'DESC' . "\n" .
                     'LIMIT 1 OFFSET 0',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[39mid," . "\n" .
-                    "    \x1b[35mIF\x1b[39m(id = \x1b[92m1\x1b[39m, \x1b[91m\"Si\"\x1b[39m, \x1b[91m\"No\"\x1b[39m)" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[36m`tbl`" . "\n" .
-                    "\x1b[35mWHERE" . "\n" .
-                    "    \x1b[39mid = \x1b[92m0 \x1b[35mOR \x1b[39mid = \x1b[92m1" . "\n" .
-                    "\x1b[35mGROUP BY" . "\n" .
-                    "    \x1b[39mid" . "\n" .
-                    "\x1b[35mORDER BY" . "\n" .
-                    "    \x1b[39mid" . "\n" .
-                    "\x1b[35mDESC" . "\n" .
-                    "LIMIT \x1b[92m1 \x1b[95mOFFSET \x1b[92m0" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;id,' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">IF</span>(id = <span class="sql-number">1</span>, <span class="sql-string">"Si"</span>, <span class="sql-string">"No"</span>)' . '<br/>' .
-                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`tbl`</span>' . '<br/>' .
-                    '<span class="sql-reserved">WHERE</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;id = <span class="sql-number">0</span> <span class="sql-reserved">OR</span> id = <span class="sql-number">1</span>' . '<br/>' .
-                    '<span class="sql-reserved">GROUP BY</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;id' . '<br/>' .
-                    '<span class="sql-reserved">ORDER BY</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;id' . '<br/>' .
-                    '<span class="sql-reserved">DESC</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[39mid,\n" .
+                    "    \x1b[35mIF\x1b[39m(id = \x1b[92m1\x1b[39m, \x1b[91m\"Si\"\x1b[39m, \x1b[91m\"No\"\x1b[39m)\n" .
+                    "\x1b[35mFROM\n" .
+                    "    \x1b[36m`tbl`\n" .
+                    "\x1b[35mWHERE\n" .
+                    "    \x1b[39mid = \x1b[92m0 \x1b[35mOR \x1b[39mid = \x1b[92m1\n" .
+                    "\x1b[35mGROUP BY\n" .
+                    "    \x1b[39mid\n" .
+                    "\x1b[35mORDER BY\n" .
+                    "    \x1b[39mid\n" .
+                    "\x1b[35mDESC\n" .
+                    "LIMIT \x1b[92m1 \x1b[95mOFFSET \x1b[92m0\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;id,<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">IF</span>(id = <span class="sql-number">1</span>, <span class="sql-string">"Si"</span>, <span class="sql-string">"No"</span>)<br/>' .
+                    '<span class="sql-reserved">FROM</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`tbl`</span><br/>' .
+                    '<span class="sql-reserved">WHERE</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;id = <span class="sql-number">0</span> <span class="sql-reserved">OR</span> id = <span class="sql-number">1</span><br/>' .
+                    '<span class="sql-reserved">GROUP BY</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;id<br/>' .
+                    '<span class="sql-reserved">ORDER BY</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;id<br/>' .
+                    '<span class="sql-reserved">DESC</span><br/>' .
                     '<span class="sql-reserved">LIMIT</span> <span class="sql-number">1</span> <span class="sql-keyword">OFFSET</span> <span class="sql-number">0</span>',
             ],
             'comments' => [
@@ -345,17 +345,17 @@ class FormatterTest extends TestCase
                     '    tbl # Comment' . "\n" .
                     'WHERE' . "\n" .
                     '    1 -- Comment',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[37m/* Comment */ \x1b[39m*" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[39mtbl \x1b[37m# Comment" . "\n" .
-                    "\x1b[35mWHERE" . "\n" .
-                    "    \x1b[92m1 \x1b[37m-- Comment" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-comment">/* Comment */</span> *' . '<br/>' .
-                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl <span class="sql-comment"># Comment</span>' . '<br/>' .
-                    '<span class="sql-reserved">WHERE</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[37m/* Comment */ \x1b[39m*\n" .
+                    "\x1b[35mFROM\n" .
+                    "    \x1b[39mtbl \x1b[37m# Comment\n" .
+                    "\x1b[35mWHERE\n" .
+                    "    \x1b[92m1 \x1b[37m-- Comment\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-comment">/* Comment */</span> *<br/>' .
+                    '<span class="sql-reserved">FROM</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl <span class="sql-comment"># Comment</span><br/>' .
+                    '<span class="sql-reserved">WHERE</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span> <span class="sql-comment">-- Comment</span>',
             ],
             'strip comments' => [
@@ -368,17 +368,17 @@ class FormatterTest extends TestCase
                     '    tbl' . "\n" .
                     'WHERE' . "\n" .
                     '    1',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[39m*" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[39mtbl" . "\n" .
-                    "\x1b[35mWHERE" . "\n" .
-                    "    \x1b[92m1" . "\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/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[39m*\n" .
+                    "\x1b[35mFROM\n" .
+                    "    \x1b[39mtbl\n" .
+                    "\x1b[35mWHERE\n" .
+                    "    \x1b[92m1\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;<span class="sql-number">1</span>',
                 'options' => [
                     'remove_comments' => true,
@@ -388,18 +388,18 @@ class FormatterTest extends TestCase
                 'query' => 'select hex("1")',
                 'text' => 'SELECT' . "\n" .
                     '    HEX("1")',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[95mHEX\x1b[39m(\x1b[91m\"1\"\x1b[39m)" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[95mHEX\x1b[39m(\x1b[91m\"1\"\x1b[39m)\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)',
             ],
             'distinct count' => [
                 'query' => 'select distinct count(*)',
                 'text' => 'SELECT DISTINCT' . "\n" .
                     '    COUNT(*)',
-                'cli' => "\x1b[35mSELECT DISTINCT" . "\n" .
-                    "    \x1b[95mCOUNT\x1b[39m(*)" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span> <span class="sql-reserved">DISTINCT</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT DISTINCT\n" .
+                    "    \x1b[95mCOUNT\x1b[39m(*)\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span> <span class="sql-reserved">DISTINCT</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-keyword">COUNT</span>(*)',
             ],
             'create procedure' => [
@@ -412,45 +412,45 @@ class FormatterTest extends TestCase
                     '        *;' . "\n" .
                     'END',
                 'cli' => "\x1b[35mCREATE PROCEDURE \x1b[39mtest_procedure()\n" .
-                    "\x1b[95mBEGIN" . "\n" .
-                    "    \x1b[35mFROM" . "\n" .
-                    "        \x1b[39mtbl" . "\n" .
-                    "    \x1b[35mSELECT" . "\n" .
+                    "\x1b[95mBEGIN\n" .
+                    "    \x1b[35mFROM\n" .
+                    "        \x1b[39mtbl\n" .
+                    "    \x1b[35mSELECT\n" .
                     "        \x1b[39m*;\n" .
-                    "\x1b[95mEND" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">CREATE</span> <span class="sql-reserved">PROCEDURE</span> test_procedure()' . '<br/>' .
-                    '<span class="sql-keyword">BEGIN</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">FROM</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*;' . '<br/>' .
+                    "\x1b[95mEND\x1b[0m",
+                'html' => '<span class="sql-reserved">CREATE</span> <span class="sql-reserved">PROCEDURE</span> test_procedure()<br/>' .
+                    '<span class="sql-keyword">BEGIN</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">FROM</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tbl<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">SELECT</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*;<br/>' .
                     '<span class="sql-keyword">END</span>',
             ],
             'insert' => [
                 'query' => 'insert into foo values (0, 0, 0), (1, 1, 1)',
                 'text' => 'INSERT INTO foo' . "\n" .
                     'VALUES(0, 0, 0),(1, 1, 1)',
-                'cli' => "\x1b[35mINSERT INTO \x1b[39mfoo" . "\n" .
-                    "\x1b[35mVALUES\x1b[39m(\x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m),(\x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m)" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">INSERT</span> <span class="sql-reserved">INTO</span> foo' . '<br/>' .
+                'cli' => "\x1b[35mINSERT INTO \x1b[39mfoo\n" .
+                    "\x1b[35mVALUES\x1b[39m(\x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m),(\x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m)\x1b[0m",
+                'html' => '<span class="sql-reserved">INSERT</span> <span class="sql-reserved">INTO</span> foo<br/>' .
                     '<span class="sql-reserved">VALUES</span>(<span class="sql-number">0</span>, <span class="sql-number">0</span>, <span class="sql-number">0</span>),(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)',
             ],
             'string as alias' => [
                 'query' => 'select "Text" as bar',
                 'text' => 'SELECT' . "\n" .
                     '    "Text" AS bar',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[91m\"Text\" \x1b[35mAS \x1b[39mbar" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[91m\"Text\" \x1b[35mAS \x1b[39mbar\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">"Text"</span> <span class="sql-reserved">AS</span> bar',
             ],
             'escape cli' => [
                 'query' => "select 'text\x1b[33mcolor-inj'",
                 'text' => 'SELECT' . "\n" .
                     "    'text\x1B[33mcolor-inj'",
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[91m'text\\x1B[33mcolor-inj'" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[91m'text\\x1B[33mcolor-inj'\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'text' . "\x1b[33m" . 'color-inj\'</span>',
             ],
             'escape html' => [
@@ -460,14 +460,14 @@ class FormatterTest extends TestCase
                     'FROM' . "\n" .
                     '    `<s>xss`,' . "\n" .
                     '    < s > nxss /*s<s>xss*/',
-                'cli' => "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[91m'<s>xss'" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[36m`<s>xss`\x1b[39m," . "\n" .
-                    "    < s > nxss \x1b[37m/*s<s>xss*/" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'&lt;s&gt;xss\'</span>' . '<br/>' .
-                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
+                'cli' => "\x1b[35mSELECT\n" .
+                    "    \x1b[91m'<s>xss'\n" .
+                    "\x1b[35mFROM\n" .
+                    "    \x1b[36m`<s>xss`\x1b[39m,\n" .
+                    "    < s > nxss \x1b[37m/*s<s>xss*/\x1b[0m",
+                'html' => '<span class="sql-reserved">SELECT</span><br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'&lt;s&gt;xss\'</span><br/>' .
+                    '<span class="sql-reserved">FROM</span><br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`&lt;s&gt;xss`</span>,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt; s &gt; nxss <span class="sql-comment">/*s&lt;s&gt;xss*/</span>',
             ],
             'create table' => [
@@ -485,19 +485,19 @@ class FormatterTest extends TestCase
                     '    `label` VARCHAR(255) COLLATE utf8_general_ci NOT NULL DEFAULT "",' . "\n" .
                     '    `query` TEXT NOT NULL,' . "\n" .
                     '    PRIMARY KEY(`id`)',
-                'cli' => "\x1b[35mCREATE TABLE IF NOT EXISTS \x1b[36m`pma__bookmark`\x1b[39m(" . "\n" .
-                    "    \x1b[36m`id` \x1b[35mINT\x1b[39m(\x1b[92m11\x1b[39m) \x1b[35mNOT NULL \x1b[95mAUTO_INCREMENT\x1b[39m," . "\n" .
-                    "    \x1b[36m`dbase` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
-                    "    \x1b[36m`user` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
-                    "    \x1b[36m`label` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mCOLLATE \x1b[39mutf8_general_ci \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
-                    "    \x1b[36m`query` \x1b[95mTEXT \x1b[35mNOT NULL\x1b[39m," . "\n" .
-                    "    \x1b[35mPRIMARY KEY\x1b[39m(\x1b[36m`id`\x1b[39m)" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">CREATE</span> <span class="sql-reserved">TABLE</span> <span class="sql-reserved">IF NOT EXISTS</span> <span class="sql-variable">`pma__bookmark`</span>(' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`id`</span> <span class="sql-reserved">INT</span>(<span class="sql-number">11</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-keyword">AUTO_INCREMENT</span>,' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`dbase`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`user`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`label`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">COLLATE</span> utf8_general_ci <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`query`</span> <span class="sql-keyword">TEXT</span> <span class="sql-reserved">NOT NULL</span>,' . '<br/>' .
+                'cli' => "\x1b[35mCREATE TABLE IF NOT EXISTS \x1b[36m`pma__bookmark`\x1b[39m(\n" .
+                    "    \x1b[36m`id` \x1b[35mINT\x1b[39m(\x1b[92m11\x1b[39m) \x1b[35mNOT NULL \x1b[95mAUTO_INCREMENT\x1b[39m,\n" .
+                    "    \x1b[36m`dbase` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m,\n" .
+                    "    \x1b[36m`user` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m,\n" .
+                    "    \x1b[36m`label` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mCOLLATE \x1b[39mutf8_general_ci \x1b[35mNOT NULL DEFAULT \x1b[91m\"\"\x1b[39m,\n" .
+                    "    \x1b[36m`query` \x1b[95mTEXT \x1b[35mNOT NULL\x1b[39m,\n" .
+                    "    \x1b[35mPRIMARY KEY\x1b[39m(\x1b[36m`id`\x1b[39m)\x1b[0m",
+                'html' => '<span class="sql-reserved">CREATE</span> <span class="sql-reserved">TABLE</span> <span class="sql-reserved">IF NOT EXISTS</span> <span class="sql-variable">`pma__bookmark`</span>(<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`id`</span> <span class="sql-reserved">INT</span>(<span class="sql-number">11</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-keyword">AUTO_INCREMENT</span>,<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`dbase`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`user`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`label`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">COLLATE</span> utf8_general_ci <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`query`</span> <span class="sql-keyword">TEXT</span> <span class="sql-reserved">NOT NULL</span>,<br/>' .
                     '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">PRIMARY KEY</span>(<span class="sql-variable">`id`</span>)',
             ],
             'join' => [
@@ -515,17 +515,17 @@ class FormatterTest extends TestCase
                     '    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/>' .
+                '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' => [
@@ -536,17 +536,17 @@ class FormatterTest extends TestCase
                     '    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/>' .
+                '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>',
             ],
         ];