Skip to content

Rewrite multiple prepared parameters #303

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
HLeithner merged 3 commits into from
Jun 16, 2024
Merged

Rewrite multiple prepared parameters #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fe2f5e
Simplified and fixed broken multi name parameter code
HLeithner Jun 16, 2024
1f2e7f1
Fix missing ! and tests
HLeithner Jun 16, 2024
f2b34be
Fix copy-paste error
HLeithner Jun 16, 2024
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
4 changes: 2 additions & 2 deletions Tests/Mysqli/MysqliPreparedStatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ public function testPrepareParameterKeyMappingWithSingleKey()

$this->assertEquals(
[
':search' => 0,
':search2' => 1,
':search' => [0],
':search2' => [1],
],
$parameterKeyMapping
);
Expand Down
4 changes: 2 additions & 2 deletions Tests/Sqlsrv/SqlsrvPreparedStatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ public function testPrepareParameterKeyMappingWithSingleKey()

$this->assertEquals(
[
':search' => 0,
':search2' => 1,
':search' => [0],
':search2' => [1],
],
$parameterKeyMapping
);
Expand Down
26 changes: 10 additions & 16 deletions src/Mysqli/MysqliStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function prepareParameterKeyMapping($sql)
$quoteChar = '';
$literal = '';
$mapping = [];
$replace = [];
$position = 0;
$matches = [];
$pattern = '/([:][a-zA-Z0-9_]+)/';

Expand Down Expand Up @@ -197,16 +197,15 @@ public function prepareParameterKeyMapping($sql)
$literal .= substr($substring, 0, $match[1]);
}

if (isset($mapping[$match[0]])) {
$mapping[$match[0]] = is_array($mapping[$match[0]]) ? $mapping[$match[0]] : [$mapping[$match[0]]];
$mapping[$match[0]][] = \count($mapping);
} else {
$mapping[$match[0]] = \count($mapping);
if (!isset($mapping[$match[0]])) {
$mapping[$match[0]] = [];
}
$endOfPlaceholder = $match[1] + strlen($match[0]);

$mapping[$match[0]][] = $position++;
$endOfPlaceholder = $match[1] + strlen($match[0]);
$beginOfNextPlaceholder = $matches[0][$i + 1][1] ?? strlen($substring);
$beginOfNextPlaceholder -= $endOfPlaceholder;
$literal .= '?' . substr($substring, $endOfPlaceholder, $beginOfNextPlaceholder);
$literal .= '?' . substr($substring, $endOfPlaceholder, $beginOfNextPlaceholder);
}
} else {
$literal .= $substring;
Expand Down Expand Up @@ -378,14 +377,9 @@ public function execute(?array $parameters = null)
foreach ($this->bindedValues as $key => &$value) {
$paramKey = $this->parameterKeyMapping[$key];

if (is_scalar($this->parameterKeyMapping[$key])) {
$params[$paramKey] =& $value;
$types[$paramKey] = $this->typesKeyMapping[$key];
} else {
foreach ($paramKey as $currentKey) {
$params[$currentKey] =& $value;
$types[$currentKey] = $this->typesKeyMapping[$key];
}
foreach ($paramKey as $currentKey) {
$params[$currentKey] =& $value;
$types[$currentKey] = $this->typesKeyMapping[$key];
}
}
} else {
Expand Down
20 changes: 7 additions & 13 deletions src/Sqlsrv/SqlsrvStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function prepareParameterKeyMapping($sql)
$quoteChar = '';
$literal = '';
$mapping = [];
$replace = [];
$position = 0;
$matches = [];
$pattern = '/([:][a-zA-Z0-9_]+)/';

Expand Down Expand Up @@ -202,17 +202,15 @@ public function prepareParameterKeyMapping($sql)
$literal .= substr($substring, 0, $match[1]);
}

if (isset($mapping[$match[0]])) {
$mapping[$match[0]] = is_array($mapping[$match[0]]) ? $mapping[$match[0]] : [$mapping[$match[0]]];
$mapping[$match[0]][] = \count($mapping);
} else {
$mapping[$match[0]] = \count($mapping);
if (!isset($mapping[$match[0]])) {
$mapping[$match[0]] = [];
}

$mapping[$match[0]][] = $position++;
$endOfPlaceholder = $match[1] + strlen($match[0]);
$beginOfNextPlaceholder = $matches[0][$i + 1][1] ?? strlen($substring);
$beginOfNextPlaceholder -= $endOfPlaceholder;
$literal .= '?' . substr($substring, $endOfPlaceholder, $beginOfNextPlaceholder);
$literal .= '?' . substr($substring, $endOfPlaceholder, $beginOfNextPlaceholder);
}
} else {
$literal .= $substring;
Expand Down Expand Up @@ -492,12 +490,8 @@ private function prepare()
if (isset($this->parameterKeyMapping[$key])) {
$paramKey = $this->parameterKeyMapping[$key];

if (is_scalar($this->parameterKeyMapping[$key])) {
$params[$paramKey] = $variable;
} else {
foreach ($paramKey as $currentKey) {
$params[$currentKey] = $variable;
}
foreach ($paramKey as $currentKey) {
$params[$currentKey] = $variable;
}
} else {
$params[] = $variable;
Expand Down