Skip to content

Changed signature for prepareStatementForSqlObject() #116

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
simon-mundy merged 2 commits into from
Jan 12, 2026
Merged

Changed signature for prepareStatementForSqlObject() #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b711fb4
Changed signature for prepareStatementForSqlObject()
simon-mundy Jan 12, 2026
aa78e5c
Modernised assignment
simon-mundy Jan 12, 2026
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
5 changes: 0 additions & 5 deletions src/RowGateway/AbstractRowGateway.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Countable;
// phpcs:ignore SlevomatCodingStandard.Namespaces.UnusedUses.UnusedUse
use Override;
use PhpDb\Adapter\Driver\StatementInterface;
use PhpDb\Sql\Sql;
use PhpDb\Sql\TableIdentifier;
use ReturnTypeWillChange;
Expand Down Expand Up @@ -125,7 +124,6 @@ public function save(): int
}
}

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($this->sql->update()->set($data)->where($where));
$result = $statement->execute();
$rowsAffected = $result->getAffectedRows();
Expand All @@ -145,7 +143,6 @@ public function save(): int
$insert = $this->sql->insert();
$insert->values($this->data);

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($insert);

$result = $statement->execute();
Expand All @@ -166,7 +163,6 @@ public function save(): int
}

// refresh data
/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($this->sql->select()->where($where));
$result = $statement->execute();
$rowData = $result->current();
Expand All @@ -192,7 +188,6 @@ public function delete(): int

// @todo determine if we need to do a select to ensure 1 row will be affected

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($this->sql->delete()->where($where));
$result = $statement->execute();

Expand Down
11 changes: 6 additions & 5 deletions src/Sql/Sql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use PhpDb\Adapter\AdapterInterface;
use PhpDb\Adapter\Driver\StatementInterface;
use PhpDb\Adapter\StatementContainerInterface;

use function sprintf;

Expand Down Expand Up @@ -109,11 +108,13 @@ public function prepareStatementForSqlObject(
PreparableSqlInterface $sqlObject,
?StatementInterface $statement = null,
?AdapterInterface $adapter = null
): ?StatementContainerInterface {
$adapter = $adapter ?: $this->adapter;
$statement = $statement ?: $adapter->getDriver()->createStatement();
): StatementInterface {
$adapter ??= $this->adapter;
$statement ??= $adapter->getDriver()->createStatement();

return $this->sqlPlatform->setSubject($sqlObject)->prepareStatement($adapter, $statement);
$this->sqlPlatform->setSubject($sqlObject)->prepareStatement($adapter, $statement);

return $statement;
}

/**
Expand Down
5 changes: 0 additions & 5 deletions src/TableGateway/AbstractTableGateway.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Closure;
use Override;
use PhpDb\Adapter\AdapterInterface;
use PhpDb\Adapter\Driver\StatementInterface;
use PhpDb\ResultSet\ResultSet;
use PhpDb\ResultSet\ResultSetInterface;
use PhpDb\Sql\Delete;
Expand Down Expand Up @@ -191,7 +190,6 @@ protected function executeSelect(Select $select): ResultSetInterface
$this->featureSet->apply(EventFeatureEventsInterface::EVENT_PRE_SELECT, [$select]);

// prepare and execute
/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($select);
$result = $statement->execute();

Expand Down Expand Up @@ -249,7 +247,6 @@ protected function executeInsert(Insert $insert): int
$insert->into($unaliasedTable);
}

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($insert);
$result = $statement->execute();
$this->lastInsertValue = $this->adapter->getDriver()->getConnection()->getLastGeneratedValue();
Expand Down Expand Up @@ -322,7 +319,6 @@ protected function executeUpdate(Update $update): int
$update->table($unaliasedTable);
}

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($update);
$result = $statement->execute();

Expand Down Expand Up @@ -381,7 +377,6 @@ protected function executeDelete(Delete $delete): int
$delete->from($unaliasedTable);
}

/** @var StatementInterface $statement */
$statement = $this->sql->prepareStatementForSqlObject($delete);
$result = $statement->execute();

Expand Down
2 changes: 0 additions & 2 deletions test/unit/Sql/AbstractSqlFunctionalTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use PhpDb\Adapter\Driver\DriverInterface;
use PhpDb\Adapter\Driver\StatementInterface;
use PhpDb\Adapter\ParameterContainer;
use PhpDb\Adapter\StatementContainer;
use PhpDb\Sql;
use PhpDb\Sql\Ddl\Column\Column;
use PhpDb\Sql\Ddl\CreateTable;
Expand Down Expand Up @@ -279,7 +278,6 @@ public function test(PreparableSqlInterface|SqlInterface $sqlObject, string $pla

if (is_array($expected) && isset($expected['prepare'])) {
self::assertInstanceOf(PreparableSqlInterface::class, $sqlObject);
/** @var StatementInterface|StatementContainer $actual */
$actual = $sql->prepareStatementForSqlObject($sqlObject);
self::assertEquals($expected['prepare'], $actual->getSql(), 'prepareStatement()');
if (isset($expected['parameters'])) {
Expand Down