Merge pull request #9395 from cakephp/issue-9391

Quote identifiers for numeric fields on insert queries.
cakephp · Sep 2, 2016 · a9d42fd · a9d42fd
2 parents 63017f4 + cddaaa4
commit a9d42fd
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
@@ -457,7 +457,7 @@ public static function clear($check = false, $config = 'default')
 
         return $engine->clear($check);
     }
-    
+
     /**
      * Delete all keys from the cache from all configurations.
      *
@@ -467,11 +467,11 @@ public static function clear($check = false, $config = 'default')
     public static function clearAll($check = false)
     {
         $status = [];
-        
+
         foreach (self::configured() as $config) {
             $status[$config] = self::clear($check, $config);
         }
-        
+
         return $status;
     }
 

diff --git a/src/Database/IdentifierQuoter.php b/src/Database/IdentifierQuoter.php
@@ -180,7 +180,7 @@ protected function _quoteInsert($query)
         list($table, $columns) = $query->clause('insert');
         $table = $this->_driver->quoteIdentifier($table);
         foreach ($columns as &$column) {
-            if (is_string($column)) {
+            if (is_scalar($column)) {
                 $column = $this->_driver->quoteIdentifier($column);
             }
         }

diff --git a/src/Http/ResponseTransformer.php b/src/Http/ResponseTransformer.php
@@ -53,7 +53,7 @@ public static function toCake(PsrResponse $response)
         }
         $headers = static::collapseHeaders($response);
         $cake->header($headers);
- 
+
         if (!empty($headers['Content-Type'])) {
             $cake->type($headers['Content-Type']);
         }

diff --git a/src/Network/Request.php b/src/Network/Request.php
@@ -584,9 +584,9 @@ public function __call($name, $params)
     {
         if (strpos($name, 'is') === 0) {
             $type = strtolower(substr($name, 2));
-            
+
             array_unshift($params, $type);
-            
+
             return call_user_func_array([$this, 'is'], $params);
         }
         throw new BadMethodCallException(sprintf('Method %s does not exist', $name));
@@ -639,19 +639,16 @@ public function is($type)
 
             return count(array_filter($result)) > 0;
         }
-
         $args = func_get_args();
         array_shift($args);
 
         $type = strtolower($type);
         if (!isset(static::$_detectors[$type])) {
             return false;
         }
-
         if ($args) {
             return $this->_is($type, $args);
         }
-
         if (!isset($this->_detectorCache[$type])) {
             $this->_detectorCache[$type] = $this->_is($type, $args);
         }

diff --git a/src/Network/Session/DatabaseSession.php b/src/Network/Session/DatabaseSession.php
@@ -112,7 +112,7 @@ public function read($id)
         if ($session === false) {
             return '';
         }
-        
+
         return $session;
     }
 

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2930,6 +2930,29 @@ public function testInsertSimple()
         $this->assertTable('articles', 1, $expected, ['id >=' => 4]);
     }
 
+    /**
+     * Test insert queries quote integer column names
+     *
+     * @return void
+     */
+    public function testInsertQuoteColumns()
+    {
+        $this->loadFixtures('Articles');
+        $query = new Query($this->connection);
+        $query->insert([123])
+            ->into('articles')
+            ->values([
+                '123' => 'mark',
+            ]);
+        $result = $query->sql();
+        $this->assertQuotedQuery(
+            'INSERT INTO <articles> \(<123>\) (OUTPUT INSERTED\.\* )?' .
+            'VALUES \(:c0\)',
+            $result,
+            !$this->autoQuote
+        );
+    }
+
     /**
      * Test an insert when not all the listed fields are provided.
      * Columns should be matched up where possible.

diff --git a/tests/TestCase/Http/MiddlewareQueueTest.php b/tests/TestCase/Http/MiddlewareQueueTest.php
@@ -258,7 +258,7 @@ public function testInsertBefore()
         $three = function () {
         };
         $four = new DumbMiddleware();
-        
+
         $queue = new MiddlewareQueue();
         $queue->add($one)->add($two)->insertBefore(SampleMiddleware::class, $three)->insertBefore(SampleMiddleware::class, $four);