Skip to content

Updated implementation of query named parameters #169

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

Open
wants to merge 2 commits into
base: 0.7.x
Choose a base branch
from
Open

Updated implementation of query named parameters #169

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
ab28a9c
Implement query named parameters.
Divi Jan 15, 2023
03b7b26
Split named params unit test methods.
Divi Jan 21, 2023
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
26 changes: 22 additions & 4 deletions src/Io/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,34 @@ protected function resolveValueForSql($value)

protected function buildSql()
{
$tooManyParametersError = 'Params not enough to build sql';
$sql = $this->sql;

$offset = strpos($sql, '?');
foreach ($this->params as $param) {
$offsetNamed = 0;

foreach ($this->params as $key => $param) {
$replacement = $this->resolveValueForSql($param);
$sql = substr_replace($sql, $replacement, $offset, 1);
$offset = strpos($sql, '?', $offset + strlen($replacement));

if (is_string($key)) {
$prefix = $key[0] === ':' ? '' : ':';
$offsetNamed = strpos($sql, $prefix . $key, $offsetNamed);

if ($offsetNamed === false) {
throw new \LogicException($tooManyParametersError);
}

$sql = substr_replace($sql, $replacement, $offsetNamed, strlen($prefix) + strlen($key));
$offset = strpos($sql, '?', strlen($replacement));
$offsetNamed += strlen($replacement);
} else {
$sql = substr_replace($sql, $replacement, $offset, 1);
$offset = strpos($sql, '?', $offset + strlen($replacement));
}
}

if ($offset !== false) {
throw new \LogicException('Params not enough to build sql');
throw new \LogicException($tooManyParametersError);
}

return $sql;
Expand Down
60 changes: 60 additions & 0 deletions tests/Io/QueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,56 @@ public function testBindParams()
*/
}

public function testNamedParams()
{
$query = new Query('select * from test where id = :id and name = :name');
$sql = $query->bindParamsFromArray([
'id' => 100,
'name' => 'test'
])->getSql();
$this->assertEquals("select * from test where id = 100 and name = 'test'", $sql);
}

public function testNamedParamsWithPrefix()
{
$query = new Query('select * from test where id = :id and name = :name');
$sql = $query->bindParamsFromArray([
':id' => 100,
':name' => 'test'
])->getSql();
$this->assertEquals("select * from test where id = 100 and name = 'test'", $sql);
}

public function testNamedParamsWithInClause()
{
$query = new Query('select * from test where id in (:in) and name = :name');
$sql = $query->bindParamsFromArray([
'in' => [1, 2],
'name' => 'test'
])->getSql();
$this->assertEquals("select * from test where id in (1,2) and name = 'test'", $sql);
}

public function testMixedNamedParams()
{
$query = new Query('select * from test where id in (?) and name = :name');
$sql = $query->bindParamsFromArray([
[1, 2],
'name' => 'test'
])->getSql();
$this->assertEquals("select * from test where id in (1,2) and name = 'test'", $sql);
}

public function testMixedNamedParamsWithInClause()
{
$query = new Query('select * from test where id in (:in) and name = ?');
$sql = $query->bindParamsFromArray([
'in' => [1, 2],
'test'
])->getSql();
$this->assertEquals("select * from test where id in (1,2) and name = 'test'", $sql);
}

public function testGetSqlReturnsQuestionMarkReplacedWhenBound()
{
$query = new Query('select ?');
Expand Down Expand Up @@ -55,6 +105,16 @@ public function testGetSqlReturnsQuestionMarkReplacedFromBoundWhenBound()
$this->assertEquals("select CONCAT('hello??', 'world??')", $sql);
}

public function testGetSqlReturnsNamedParamsReplacedFromBoundWhenBound()
{
$query = new Query('select CONCAT(:param1, :param2)');
$sql = $query->bindParamsFromArray([
'param1' => ':param2',
'param2' => 'world'
])->getSql();
$this->assertEquals("select CONCAT(':param2', 'world')", $sql);
}

public function testGetSqlReturnsQuestionMarksAsIsWhenNotBound()
{
$query = new Query('select "hello?"');
Expand Down