Skip to content

Fix compatibility of PgSql\Result on closing the result instance #5279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 3, 2021
Merged

Fix compatibility of PgSql\Result on closing the result instance #5279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb56555
Skip if result object has no `close` method
paulbalandan Nov 2, 2021
af7dcf3
Call `close` in `tearDown`
paulbalandan Nov 2, 2021
32f88ce
Use class const for seeder name
paulbalandan Nov 2, 2021
eb1b621
Remove duplicated `$refresh` property
paulbalandan Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/Database/BasePreparedQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ abstract public function _getResult();
*/
public function close()
{
if (! is_object($this->statement)) {
if (! is_object($this->statement) || ! method_exists($this->statement, 'close')) {
return;
}

Expand Down
55 changes: 34 additions & 21 deletions tests/system/Database/Live/PreparedQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use CodeIgniter\Database\Query;
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Tests\Support\Database\Seeds\CITestSeeder;

/**
* @group DatabaseLive
Expand All @@ -25,19 +26,38 @@ final class PreparedQueryTest extends CIUnitTestCase
{
use DatabaseTestTrait;

protected $refresh = true;
protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
protected $seed = CITestSeeder::class;

/**
* @var BasePreparedQuery|null
*/
private $query;

protected function setUp(): void
{
parent::setUp();
$this->query = null;
}

protected function tearDown(): void
{
parent::tearDown();

if ($this->query !== null) {
$this->query->close();
}
}

public function testPrepareReturnsPreparedQuery()
{
$query = $this->db->prepare(static function ($db) {
$this->query = $this->db->prepare(static function ($db) {
return $db->table('user')->insert([
'name' => 'a',
'email' => '[email protected]',
]);
});

$this->assertInstanceOf(BasePreparedQuery::class, $query);
$this->assertInstanceOf(BasePreparedQuery::class, $this->query);

$ec = $this->db->escapeChar;
$pre = $this->db->DBPrefix;
Expand All @@ -54,20 +74,19 @@ public function testPrepareReturnsPreparedQuery()
} else {
$expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
}
$this->assertSame($expected, $query->getQueryString());

$query->close();
$this->assertSame($expected, $this->query->getQueryString());
}

public function testPrepareReturnsManualPreparedQuery()
{
$query = $this->db->prepare(static function ($db) {
$this->query = $this->db->prepare(static function ($db) {
$sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";

return (new Query($db))->setQuery($sql);
});

$this->assertInstanceOf(BasePreparedQuery::class, $query);
$this->assertInstanceOf(BasePreparedQuery::class, $this->query);

$pre = $this->db->DBPrefix;

Expand All @@ -78,33 +97,29 @@ public function testPrepareReturnsManualPreparedQuery()
}

$expected = "INSERT INTO {$pre}user (name, email, country) VALUES ({$placeholders})";
$this->assertSame($expected, $query->getQueryString());

$query->close();
$this->assertSame($expected, $this->query->getQueryString());
}

public function testExecuteRunsQueryAndReturnsResultObject()
{
$query = $this->db->prepare(static function ($db) {
$this->query = $this->db->prepare(static function ($db) {
return $db->table('user')->insert([
'name' => 'a',
'email' => '[email protected]',
'country' => 'x',
]);
});

$query->execute('foo', '[email protected]', 'US');
$query->execute('bar', '[email protected]', 'GB');
$this->query->execute('foo', '[email protected]', 'US');
$this->query->execute('bar', '[email protected]', 'GB');

$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => '[email protected]']);
$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => '[email protected]']);

$query->close();
}

public function testExecuteRunsQueryAndReturnsManualResultObject()
{
$query = $this->db->prepare(static function ($db) {
$this->query = $this->db->prepare(static function ($db) {
$sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";

if ($db->DBDriver === 'SQLSRV') {
Expand All @@ -114,12 +129,10 @@ public function testExecuteRunsQueryAndReturnsManualResultObject()
return (new Query($db))->setQuery($sql);
});

$query->execute('foo', '[email protected]', '');
$query->execute('bar', '[email protected]', '');
$this->query->execute('foo', '[email protected]', '');
$this->query->execute('bar', '[email protected]', '');

$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => '[email protected]']);
$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => '[email protected]']);

$query->close();
}
}