Commit ca9f5854 authored by catch's avatar catch

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

This reverts commit f3040e71.
parent 496f5533
......@@ -70,21 +70,10 @@ public function __construct(\PDO $connection, array $connection_options) {
// 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.
$this->connection->exec(implode('; ', $connection_options['init_commands']));
if (isset($connection_options['init_commands'])) {
$this->connection->exec(implode('; ', $connection_options['init_commands']));
}
}
/**
......
......@@ -721,7 +721,7 @@ public function changeField($table, $field, $field_new, $spec, $new_keys = array
// 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');");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment