Skip to content

Fix FIND_IN_SET to PATINDEX translation #340

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

Fix FIND_IN_SET to PATINDEX translation #340

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33397ad
Allow whitespace after FIND_IN_SET function
rmc47 Mar 28, 2019
0bdf536
PATINDEX requires % around _pattern_
rmc47 Mar 28, 2019
3ce5bc0
Escape %s since we're going back via vsprintf
rmc47 Mar 28, 2019
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
9 changes: 7 additions & 2 deletions wp-includes/translations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,13 +1142,18 @@ function translate_findinset($query)
&& (stripos($query,'UPDATE') !== 0 && stripos($query,'UPDATE') !== FALSE) ) {
return $query;
}
$pattern = "/FIND_IN_SET\((.*),(.*)\)/";
$pattern = "/FIND_IN_SET\\s*\((.*),(.*)\)/";
$matched = preg_match($pattern, $query, $matches);
if ( $matched == 0 ) {
return $query;
}

// Replace the FIND_IN_SET
$query = preg_replace($pattern, "PATINDEX(','+" . $matches[1] . "+',', ','+" . $matches[2] . "+',')", $query);

// Note: the double percents here are because the result is going to go back via vsprintf,
// and we need it to not look like a replacement token there. Assumption: !empty($this->preg_data)
// holds true, which it should because FIND_IN_SET should originally have taken a string pattern.
$query = preg_replace($pattern, "PATINDEX('%%,'+" . $matches[1] . "+',%%', ','+" . $matches[2] . "+',')", $query);

return $query;
}
Expand Down