Merge pull request #805 from cakephp/fix-804

Add missing array cast in SqliteAdapter

Author: markstory

src/Db/Adapter/SqliteAdapter.php

@@ -376,6 +376,10 @@ public function createTable(Table $table, array $columns = [], array $indexes =
 
         $sql = 'CREATE TABLE ';
         $sql .= $this->quoteTableName($table->getName()) . ' (';
+        if (isset($options['primary_key'])) {
+            $options['primary_key'] = (array)$options['primary_key'];
+        }
+
         foreach ($columns as $column) {
             $sql .= $this->quoteColumnName((string)$column->getName()) . ' ' . $this->getColumnSqlDefinition($column) . ', ';
 

tests/TestCase/Db/Adapter/SqliteAdapterTest.php

@@ -360,17 +360,14 @@ public function testCreateTableWithoutAutoIncrementingPrimaryKeyAndWithForeignKe
 
     public function testAddPrimaryKey()
     {
-        $table = new Table('table1', ['id' => false], $this->adapter);
+        $table = new Table('table1', [], $this->adapter);
         $table
             ->addColumn('column1', 'integer')
             ->addColumn('column2', 'integer')
+            ->addPrimaryKey('id')
             ->save();
 
-        $table
-            ->changePrimaryKey('column1')
-            ->save();
-
-        $this->assertTrue($this->adapter->hasPrimaryKey('table1', ['column1']));
+        $this->assertTrue($this->adapter->hasPrimaryKey('table1', ['id']));
     }
 
     public function testChangePrimaryKey()