Improved format of INSERT queries.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>

Author: udan11

src/Utils/Formatter.php

@@ -28,6 +28,28 @@ class Formatter
      */
     public $options;
 
+    /**
+     * Clauses that are usually short.
+     *
+     * These clauses share the line with the next clause.
+     *
+     * E.g. if INSERT was not here, the formatter would produce:
+     *
+     *      INSERT
+     *      INTO foo
+     *      VALUES(0, 0, 0),(1, 1, 1);
+     *
+     * Instead of:
+     *
+     *      INSERT INTO foo
+     *      VALUES(0, 0, 0),(1, 1, 1)
+     *
+     * @var array
+     */
+    public static $SHORT_CLAUSES = array(
+        'INSERT' => true,
+    );
+
     /**
      * Clauses that must be inlined.
      *
@@ -37,6 +59,7 @@ class Formatter
      */
     public static $INLINE_CLAUSES = array(
         'CREATE' => true,
+        'INTO' => true,
         'LIMIT' => true,
         'PARTITION BY' => true,
         'PARTITION' => true,
@@ -380,7 +403,7 @@ public function formatList($list)
 
                 // Checking if this clause ended.
                 if ($tmp = static::isClause($curr)) {
-                    if ($tmp == 2 || $this->options['clause_newline']) {
+                    if (($tmp == 2 || $this->options['clause_newline']) && empty(self::$SHORT_CLAUSES[$lastClause])) {
                         $lineEnded = true;
                         if ($this->options['parts_newline'] && $indent > 0) {
                             --$indent;

tests/Utils/FormatterTest.php

@@ -430,17 +430,11 @@ public function formatQueries()
             ),
             'insert' => array(
                 'query' => 'insert into foo values (0, 0, 0), (1, 1, 1)',
-                'text' => 'INSERT' . "\n" .
-                    'INTO' . "\n" .
-                    '    foo' . "\n" .
+                'text' => 'INSERT INTO foo' . "\n" .
                     'VALUES(0, 0, 0),(1, 1, 1)',
-                'cli' => "\x1b[35mINSERT" . "\n" .
-                    "\x1b[35mINTO" . "\n" .
-                    "    \x1b[39mfoo" . "\n" .
+                'cli' => "\x1b[35mINSERT \x1b[35mINTO \x1b[39mfoo" . "\n" .
                     "\x1b[35mVALUES\x1b[39m(\x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m)\x1b[39m,\x1b[39m(\x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m)" . "\x1b[0m",
-                'html' => '<span class="sql-reserved">INSERT</span>' . '<br/>' .
-                    '<span class="sql-reserved">INTO</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;foo' . '<br/>' .
+                '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' => array(