Unverified Commit aa978903 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3143618 by Krzysztof Domański, daffie, longwave, Beakerboy: Replace... 

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

core/lib/Drupal/Core/Database/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ public function query($query, array $args = [], $options = []) { 
        // semicolons should only be needed for special cases like defining a

        // function or stored procedure in SQL. Trim any trailing delimiter to

        // 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'])) {

          $trim_chars .= ';';

        }

core/tests/Drupal/Tests/Core/Database/ConnectionTest.php

+10 −0
Original line number Diff line number Diff line
@@ -607,6 +607,16 @@ public function testQueryTrim($expected, $query, $options) { 
   */

  public function provideQueriesToTrim() {

    return [

      'remove_non_breaking_space' => [

        'SELECT * FROM test',

        "SELECT * FROM test\xA0",

        [],

      ],

      'remove_ordinary_space' => [

        'SELECT * FROM test',

        'SELECT * FROM test ',

        [],

      ],

      'remove_semicolon' => [

        'SELECT * FROM test',

        'SELECT * FROM test;',