Fixed statements INSERT and REPLACE + options.

phpmyadmin · Feb 15, 2019 · ef95576 · ef95576
1 parent 457d094
commit ef95576
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/src/Statements/InsertStatement.php b/src/Statements/InsertStatement.php
@@ -110,8 +110,8 @@ class InsertStatement extends Statement
      */
     public function build()
     {
-        $ret = 'INSERT ' . $this->options
-            . 'INTO ' . $this->into;
+        $ret = 'INSERT ' . $this->options;
+        $ret = trim($ret) . ' INTO ' . $this->into;
 
         if (! is_null($this->values) && count($this->values) > 0) {
             $ret .= ' VALUES ' . Array2d::build($this->values);

diff --git a/src/Statements/ReplaceStatement.php b/src/Statements/ReplaceStatement.php
@@ -87,7 +87,8 @@ class ReplaceStatement extends Statement
      */
     public function build()
     {
-        $ret = 'REPLACE ' . $this->options . 'INTO ' . $this->into;
+        $ret = 'REPLACE ' . $this->options;
+        $ret = trim($ret) . ' INTO ' . $this->into;
 
         if (! is_null($this->values) && count($this->values) > 0) {
             $ret .= ' VALUES ' . Array2d::build($this->values);

diff --git a/tests/Builder/InsertStatementTest.php b/tests/Builder/InsertStatementTest.php
@@ -63,5 +63,16 @@ public function testBuilder()
             'INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1',
             $stmt->build()
         );
+
+        /* Assertion 6 */
+        /* INSERT [OPTIONS] INTO ... */
+        $parser = new Parser(
+            'INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar'
+        );
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar',
+            $stmt->build()
+        );
     }
 }
diff --git a/tests/Builder/ReplaceStatementTest.php b/tests/Builder/ReplaceStatementTest.php
@@ -43,4 +43,16 @@ public function testBuilderSelect()
             $stmt->build()
         );
     }
+
+    public function testBuilderSelectDelayed()
+    {
+        $parser = new Parser(
+            'REPLACE DELAYED INTO tbl(col1, col2, col3) SELECT col1, col2, col3 FROM tbl2'
+        );
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'REPLACE DELAYED INTO tbl(`col1`, `col2`, `col3`) SELECT col1, col2, col3 FROM tbl2',
+            $stmt->build()
+        );
+    }
 }