Browse Source

Merge pull request #11904 from cakephp/fix-appveyor

Attempt to fix the failing appveyor builds.
José Lorenzo Rodríguez 8 years ago
parent
commit
8cef842e89
2 changed files with 4 additions and 5 deletions
  1. 1 1
      tests/Fixture/ProfilesFixture.php
  2. 3 4
      tests/TestCase/Database/QueryTest.php

+ 1 - 1
tests/Fixture/ProfilesFixture.php

@@ -28,7 +28,7 @@ class ProfilesFixture extends TestFixture
      * @var array
      */
     public $fields = [
-        'id' => ['type' => 'integer'],
+        'id' => ['type' => 'integer', 'null' => false, 'autoIncrement' => true],
         'user_id' => ['type' => 'integer', 'null' => false],
         'first_name' => ['type' => 'string', 'null' => true],
         'last_name' => ['type' => 'string', 'null' => true],

+ 3 - 4
tests/TestCase/Database/QueryTest.php

@@ -4633,20 +4633,19 @@ class QueryTest extends TestCase
         $this->loadFixtures('Profiles');
         $query = new Query($this->connection);
         $fields = [
-            'id' => 'integer',
             'user_id' => 'integer',
             'is_active' => 'boolean'
         ];
         $typeMap = new TypeMap($fields + ['a' => 'integer']);
         $results = $query
             ->select(array_keys($fields))
-            ->select(['a' => 'id'])
+            ->select(['a' => 'is_active'])
             ->from('profiles')
             ->setSelectTypeMap($typeMap)
-            ->limit(1)
+            ->where(['user_id' => 1])
             ->execute()
             ->fetchAll('assoc');
-        $this->assertSame([['id' => 1, 'user_id' => 1, 'is_active' => false, 'a' => 1]], $results);
+        $this->assertSame([['user_id' => 1, 'is_active' => false, 'a' => 0]], $results);
     }
 
     /**