Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3143618 by Krzysztof Domański, daffie, longwave, Beakerboy: Replace space (U+0020) with No-Break Space (U+00A0) to minimize false positives

merge-requests/2419/head
Alex Pott 2020-06-15 11:25:18 +01:00
parent 6b769d1e4f
commit aa97890339
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Database/Connection.php
View File

@ -726,7 +726,7 @@ abstract class Connection {
// semicolons should only be needed for special cases like defining a // semicolons should only be needed for special cases like defining a
// function or stored procedure in SQL. Trim any trailing delimiter to // function or stored procedure in SQL. Trim any trailing delimiter to
// minimize false positives unless delimiter is allowed. // minimize false positives unless delimiter is allowed.
$trim_chars = " \t\n\r\0\x0B"; $trim_chars = " \xA0\t\n\r\0\x0B";
if (empty($options['allow_delimiter_in_query'])) { if (empty($options['allow_delimiter_in_query'])) {
$trim_chars .= ';'; $trim_chars .= ';';
} }

10
core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
View File

@ -607,6 +607,16 @@ class ConnectionTest extends UnitTestCase {
*/ */
public function provideQueriesToTrim() { public function provideQueriesToTrim() {
return [ return [
'remove_non_breaking_space' => [
'SELECT * FROM test',
"SELECT * FROM test\xA0",
[],
],
'remove_ordinary_space' => [
'SELECT * FROM test',
'SELECT * FROM test ',
[],
],
'remove_semicolon' => [ 'remove_semicolon' => [
'SELECT * FROM test', 'SELECT * FROM test',
'SELECT * FROM test;', 'SELECT * FROM test;',