Skip to content

EloquentDataSource - ignore placeholders inside SQL comments and strings #744

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 1 commit into
base: master
Choose a base branch
from
Open

EloquentDataSource - ignore placeholders inside SQL comments and strings #744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 30 additions & 17 deletions Clockwork/DataSource/EloquentDataSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,25 +268,38 @@ protected function createRunnableQuery($query, $bindings, $connection)
{
// add bindings to query
$bindings = $this->databaseManager->connection($connection)->prepareBindings($bindings);


$bindingsArePositional = array_keys($bindings) === range(0, count($bindings) - 1);

/**
* Regexp explanation:
* ('(?:''|[^'])*') - single quoted string (handles escaped single quotes by doubling)
* ("(?:""|[^"])*") - double quoted string (handles escaped double quotes by doubling)
* (--.*) - single-line comment
* (\/\*[\s\S]*?\*\/) - multi-line comment
* (*SKIP)(*FAIL) - skip all matches above
* \? - positional placeholder
* :\w+ - named placeholder
*/
$pattern = $bindingsArePositional
? "/('(?:''|[^'])*'|\"(?:\"\"|[^\"])*\"|--.*|\/\*[\s\S]*?\*\/)(*SKIP)(*FAIL)|\?/"
: "/('(?:''|[^'])*'|\"(?:\"\"|[^\"])*\"|--.*|\/\*[\s\S]*?\*\/)(*SKIP)(*FAIL)|:\w+/";


$index = 0;
$query = preg_replace_callback('/\'[^\']*\'|[^?]\?|\W:[a-z]+/', function ($matches) use ($bindings, $connection, &$index) {
$match = $matches[0];

if ($match[0] == '\'') { // quoted string
return $match;
} elseif ($match[1] == '?' && isset($bindings[$index])) { // question-mark binding
$binding = $this->quoteBinding($bindings[$index++], $connection);
} elseif ($match[1] == ':' && isset($bindings[substr($match, 2)])) { // named binding
$binding = $this->quoteBinding($bindings[substr($match, 2)], $connection);
} else {
return $match;
}

$query = preg_replace_callback($pattern, function ($matches) use ($bindings, $connection, &$index, $bindingsArePositional) {
$binding = $bindingsArePositional
? $bindings[$index++]
: $bindings[ltrim($matches[$index++], ':')];

$binding = $this->quoteBinding($binding, $connection);

// convert binary bindings to hexadecimal representation
if (! preg_match('//u', (string) $binding)) $binding = '0x' . bin2hex($binding);

return $match[0] . ((string) $binding);
if (!preg_match('//u', (string)$binding)) {
$binding = '0x' . bin2hex($binding);
}

return (string)$binding;
}, $query);

// highlight keywords
Expand Down