quote identifiers

mrjgreen · Aug 26, 2015 · 7664bc9 · 7664bc9
1 parent 3bc69d6
commit 7664bc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/DbSync/Connection.php b/src/DbSync/Connection.php
@@ -226,6 +226,8 @@ protected function doMultiInsert($table, $data, $type = self::INSERT)
             $qs .= ('(' . rtrim($subq, ',') . ')' . (++$i !== $count ? ',' : ''));
         }
 
+        $cols = array_map(array($this, 'quoteIdentifier'), $cols);
+
         return $this->query($type . ' INTO ' . $table . ' (' . implode(',', $cols) . ') VALUES ' . $qs, $bind);
     }
 
@@ -297,18 +299,29 @@ public function multiInsertOnDuplicateKeyUpdate($table, $data)
             $qs = trim($qs, ',') . '),';
         }
 
+        $cols = array_map(array($this, 'quoteIdentifier'), $cols);
+
         $colsValues = array_map(function ($col) {
             return $col . ' = VALUES(' . $col . ')';
         }, $cols);
 
         // Build the statement
         $sql = 'INSERT INTO ' . $table . ' 
-		(' . implode(', ', $cols) . ') VALUES ' . trim($qs, ',') . '	
+		(' . implode(', ', $cols) . ') VALUES ' . trim($qs, ',') . '
 		ON DUPLICATE KEY UPDATE ' . implode(', ', $colsValues);
 
         return $this->query($sql, $bind);
     }
 
+    /**
+     * @param $column
+     * @return string
+     */
+    private function quoteIdentifier($column)
+    {
+        return '`' . $column . '`';
+    }
+
     public static function make(array $config)
     {
 

diff --git a/tests/integration/config.php b/tests/integration/config.php
@@ -4,7 +4,7 @@
     'host'      => 'localhost',
     'driver'    => 'mysql',
     'username'  => 'root',
-    'password'  => '',
+    'password'  => 'password',
     'charset'   => 'utf8',
     'collation' => 'utf8_unicode_ci',
     'prefix'    => '',