malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempting to fix occasional db tests on Travis

Browse Source
This commit is contained in:
Lonnie Ezell 2017-08-02 22:20:19 -05:00
parent 2e1549f5b1
commit a883c95675
No known key found for this signature in database
GPG Key ID: 8EB408F8D82F5002
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/Database/BaseBuilder.php
View File

@ -1440,7 +1440,9 @@ class BaseBuilder
$this->QBOrderBy = $orderby; $this->QBOrderBy = $orderby;
} }
$row = $result->getRow(); $row = is_bool($result)
? null
: $result->getRow();
if (empty($row)) if (empty($row))
{ {

2
tests/system/Database/Live/ModelTest.php
View File

@ -496,7 +496,7 @@ class ModelTest extends \CIDatabaseTestCase
$date = $this->getPrivateProperty($entity, 'created_at'); $date = $this->getPrivateProperty($entity, 'created_at');
$this->assertTrue($date instanceof Time); $this->assertTrue($date instanceof Time);
$model->save($entity); $this->assertTrue($model->save($entity));
$this->seeInDatabase('job', ['name' => 'Senior Developer', 'created_at' => '2017-07-15 00:00:00']); $this->seeInDatabase('job', ['name' => 'Senior Developer', 'created_at' => '2017-07-15 00:00:00']);
} }