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

Revert "Issue #2560897 by alexpott: Drupal\user\Plugin\views\argument\RolesRid is very broken" 

This reverts commit f3040e71cb.
8.0.x
Nathaniel Catchpole 2015-09-01 12:40:23 +01:00
parent 496f5533f7
commit ca9f58547a
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
View File

@ -70,22 +70,11 @@ class Connection extends DatabaseConnection {
// Force PostgreSQL to use the UTF-8 character set by default.
$this->connection->exec("SET NAMES 'UTF8'");
// Set PostgreSQL init_commands if not already defined.
$connection_options += array(
'init_commands' => array(),
);
$connection_options['init_commands'] += array(
// Set standard_conforming_strings to off so as to treat backslashes as
// escape characters, complying with historical PostgreSQL behavior. In
// PostgreSQL 9.1 and up this is on by default, however Drupal still
// assumes this to be off.
'standard_conforming_strings' => 'SET standard_conforming_strings = off',
);
// Execute PostgreSQL init_commands.
if (isset($connection_options['init_commands'])) {
$this->connection->exec(implode('; ', $connection_options['init_commands']));
}
}
/**
* {@inheritdoc}

2
core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
View File

@ -721,7 +721,7 @@ class Schema extends DatabaseSchema {
// Convert to a bytea type by using the SQL replace() function to
// convert any single backslashes in the field content to double
// backslashes ('\' to '\\').
$this->connection->query('ALTER TABLE {' . $table . '} ALTER "' . $field . '" TYPE ' . $field_def . ' USING convert_to("' . $field . '", ' . "'UTF8')");
$this->connection->query('ALTER TABLE {' . $table . '} ALTER "' . $field . '" TYPE ' . $field_def . ' USING decode(replace("' . $field . '"' . ", '\\', '\\\\'), 'escape');");
}
}