Commit 951478fb authored by xjm's avatar xjm
Browse files

Issue #2055851 by andypost, sja112, jungle, dawehner, Mac_Weber, borisson_,...

Issue #2055851 by andypost, sja112, jungle, dawehner, Mac_Weber, borisson_, fietserwin, xjm, init90, Gábor Hojtsy, effulgentsia, tim.plunkett: [backport] Remove translation of exception messages
parent cf32b857
...@@ -1205,7 +1205,7 @@ function archiver_get_archiver($file) { ...@@ -1205,7 +1205,7 @@ function archiver_get_archiver($file) {
// Archivers can only work on local paths // Archivers can only work on local paths
$filepath = \Drupal::service('file_system')->realpath($file); $filepath = \Drupal::service('file_system')->realpath($file);
if (!is_file($filepath)) { if (!is_file($filepath)) {
throw new Exception(t('Archivers can only operate on local files: %file not supported', ['%file' => $file])); throw new Exception("Archivers can only operate on local files: '$file' not supported");
} }
return \Drupal::service('plugin.manager.archiver')->getInstance(['filepath' => $filepath]); return \Drupal::service('plugin.manager.archiver')->getInstance(['filepath' => $filepath]);
} }
......
...@@ -1252,7 +1252,7 @@ function install_select_profile(&$install_state) { ...@@ -1252,7 +1252,7 @@ function install_select_profile(&$install_state) {
else { else {
// The non-interactive installer requires a profile parameter. // The non-interactive installer requires a profile parameter.
if (!$install_state['interactive']) { if (!$install_state['interactive']) {
throw new InstallerException(t('Missing profile parameter.')); throw new InstallerException('Missing profile parameter.');
} }
// Otherwise, display a form to select a profile. // Otherwise, display a form to select a profile.
return install_get_form('Drupal\Core\Installer\Form\SelectProfileForm', $install_state); return install_get_form('Drupal\Core\Installer\Form\SelectProfileForm', $install_state);
...@@ -1397,7 +1397,7 @@ function install_select_language(&$install_state) { ...@@ -1397,7 +1397,7 @@ function install_select_language(&$install_state) {
return; return;
} }
else { else {
throw new InstallerException(t('You must select a language to continue the installation.')); throw new InstallerException('You must select a language to continue the installation.');
} }
} }
} }
......
...@@ -377,7 +377,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) { ...@@ -377,7 +377,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
// Write the new settings file. // Write the new settings file.
if (file_put_contents($settings_file, $buffer) === FALSE) { if (file_put_contents($settings_file, $buffer) === FALSE) {
throw new Exception(t('Failed to modify %settings. Verify the file permissions.', ['%settings' => $settings_file])); throw new Exception("Failed to modify '$settings_file'. Verify the file permissions.");
} }
else { else {
// In case any $settings variables were written, import them into the // In case any $settings variables were written, import them into the
...@@ -394,7 +394,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) { ...@@ -394,7 +394,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
} }
} }
else { else {
throw new Exception(t('Failed to open %settings. Verify the file permissions.', ['%settings' => $settings_file])); throw new Exception("Failed to open '$settings_file'. Verify the file permissions.");
} }
} }
...@@ -555,10 +555,7 @@ function drupal_install_config_directories() { ...@@ -555,10 +555,7 @@ function drupal_install_config_directories() {
// Bail out using a similar error message as in system_requirements(). // Bail out using a similar error message as in system_requirements().
if (!\Drupal::service('file_system')->prepareDirectory($config_directories[CONFIG_SYNC_DIRECTORY], FileSystemInterface::CREATE_DIRECTORY) if (!\Drupal::service('file_system')->prepareDirectory($config_directories[CONFIG_SYNC_DIRECTORY], FileSystemInterface::CREATE_DIRECTORY)
&& !file_exists($config_directories[CONFIG_SYNC_DIRECTORY])) { && !file_exists($config_directories[CONFIG_SYNC_DIRECTORY])) {
throw new Exception(t('The directory %directory could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href=":handbook_url">online handbook</a>.', [ throw new Exception("The directory '" . config_get_config_directory(CONFIG_SYNC_DIRECTORY) . "' could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href='https://www.drupal.org/server-permissions'>online handbook</a>.");
'%directory' => config_get_config_directory(CONFIG_SYNC_DIRECTORY),
':handbook_url' => 'https://www.drupal.org/server-permissions',
]));
} }
elseif (is_writable($config_directories[CONFIG_SYNC_DIRECTORY])) { elseif (is_writable($config_directories[CONFIG_SYNC_DIRECTORY])) {
// Put a README.txt into the sync config directory. This is required so that // Put a README.txt into the sync config directory. This is required so that
......
...@@ -205,7 +205,7 @@ function update_set_schema($module, $schema_version) { ...@@ -205,7 +205,7 @@ function update_set_schema($module, $schema_version) {
* example: * example:
* @code * @code
* use Drupal\Core\Utility\UpdateException; * use Drupal\Core\Utility\UpdateException;
* throw new UpdateException(t('Description of what went wrong')); * throw new UpdateException('Description of what went wrong');
* @endcode * @endcode
* *
* If an exception is thrown, the current update and all updates that depend on * If an exception is thrown, the current update and all updates that depend on
......
...@@ -29,7 +29,7 @@ class Zip implements ArchiverInterface { ...@@ -29,7 +29,7 @@ class Zip implements ArchiverInterface {
public function __construct($file_path) { public function __construct($file_path) {
$this->zip = new \ZipArchive(); $this->zip = new \ZipArchive();
if ($this->zip->open($file_path) !== TRUE) { if ($this->zip->open($file_path) !== TRUE) {
throw new ArchiverException(t('Cannot open %file_path', ['%file_path' => $file_path])); throw new ArchiverException("Cannot open '$file_path'");
} }
} }
......
...@@ -380,10 +380,10 @@ protected function createKeySql($fields) { ...@@ -380,10 +380,10 @@ protected function createKeySql($fields) {
*/ */
public function renameTable($table, $new_name) { public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
} }
if ($this->tableExists($new_name)) { if ($this->tableExists($new_name)) {
throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
} }
$info = $this->getPrefixInfo($new_name); $info = $this->getPrefixInfo($new_name);
...@@ -407,10 +407,10 @@ public function dropTable($table) { ...@@ -407,10 +407,10 @@ public function dropTable($table) {
*/ */
public function addField($table, $field, $spec, $keys_new = []) { public function addField($table, $field, $spec, $keys_new = []) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
} }
if ($this->fieldExists($table, $field)) { if ($this->fieldExists($table, $field)) {
throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
} }
// Fields that are part of a PRIMARY KEY must be added as NOT NULL. // Fields that are part of a PRIMARY KEY must be added as NOT NULL.
...@@ -491,7 +491,7 @@ public function dropField($table, $field) { ...@@ -491,7 +491,7 @@ public function dropField($table, $field) {
public function fieldSetDefault($table, $field, $default) { public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` SET DEFAULT ' . $this->escapeDefaultValue($default)); $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` SET DEFAULT ' . $this->escapeDefaultValue($default));
...@@ -503,7 +503,7 @@ public function fieldSetDefault($table, $field, $default) { ...@@ -503,7 +503,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) { public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` DROP DEFAULT'); $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` DROP DEFAULT');
...@@ -524,10 +524,10 @@ public function indexExists($table, $name) { ...@@ -524,10 +524,10 @@ public function indexExists($table, $name) {
*/ */
public function addPrimaryKey($table, $fields) { public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, 'PRIMARY')) { if ($this->indexExists($table, 'PRIMARY')) {
throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table])); throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySql($fields) . ')'); $this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySql($fields) . ')');
...@@ -561,10 +561,10 @@ protected function findPrimaryKeyColumns($table) { ...@@ -561,10 +561,10 @@ protected function findPrimaryKeyColumns($table) {
*/ */
public function addUniqueKey($table, $name, $fields) { public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, $name)) { if ($this->indexExists($table, $name)) {
throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySql($fields) . ')'); $this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySql($fields) . ')');
...@@ -587,10 +587,10 @@ public function dropUniqueKey($table, $name) { ...@@ -587,10 +587,10 @@ public function dropUniqueKey($table, $name) {
*/ */
public function addIndex($table, $name, $fields, array $spec) { public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, $name)) { if ($this->indexExists($table, $name)) {
throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
} }
$spec['indexes'][$name] = $fields; $spec['indexes'][$name] = $fields;
...@@ -646,10 +646,10 @@ protected function introspectIndexSchema($table) { ...@@ -646,10 +646,10 @@ protected function introspectIndexSchema($table) {
*/ */
public function changeField($table, $field, $field_new, $spec, $keys_new = []) { public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field])); throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
} }
if (($field != $field_new) && $this->fieldExists($table, $field_new)) { if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new])); throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
} }
if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) { if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]); $this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]);
......
...@@ -546,10 +546,10 @@ public function findTables($table_expression) { ...@@ -546,10 +546,10 @@ public function findTables($table_expression) {
*/ */
public function renameTable($table, $new_name) { public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
} }
if ($this->tableExists($new_name)) { if ($this->tableExists($new_name)) {
throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
} }
// Get the schema and tablename for the old table. // Get the schema and tablename for the old table.
...@@ -626,10 +626,10 @@ public function dropTable($table) { ...@@ -626,10 +626,10 @@ public function dropTable($table) {
*/ */
public function addField($table, $field, $spec, $new_keys = []) { public function addField($table, $field, $spec, $new_keys = []) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
} }
if ($this->fieldExists($table, $field)) { if ($this->fieldExists($table, $field)) {
throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
} }
// Fields that are part of a PRIMARY KEY must be added as NOT NULL. // Fields that are part of a PRIMARY KEY must be added as NOT NULL.
...@@ -702,7 +702,7 @@ public function dropField($table, $field) { ...@@ -702,7 +702,7 @@ public function dropField($table, $field) {
public function fieldSetDefault($table, $field, $default) { public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
} }
$default = $this->escapeDefaultValue($default); $default = $this->escapeDefaultValue($default);
...@@ -716,7 +716,7 @@ public function fieldSetDefault($table, $field, $default) { ...@@ -716,7 +716,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) { public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" DROP DEFAULT'); $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" DROP DEFAULT');
...@@ -779,10 +779,10 @@ public function constraintExists($table, $name) { ...@@ -779,10 +779,10 @@ public function constraintExists($table, $name) {
*/ */
public function addPrimaryKey($table, $fields) { public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
} }
if ($this->constraintExists($table, 'pkey')) { if ($this->constraintExists($table, 'pkey')) {
throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table])); throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($fields) . ')'); $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($fields) . ')');
...@@ -830,10 +830,10 @@ protected function findPrimaryKeyColumns($table) { ...@@ -830,10 +830,10 @@ protected function findPrimaryKeyColumns($table) {
*/ */
public function addUniqueKey($table, $name, $fields) { public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
} }
if ($this->constraintExists($table, $name . '__key')) { if ($this->constraintExists($table, $name . '__key')) {
throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
} }
$this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, $name, 'key') . ' UNIQUE (' . implode(',', $fields) . ')'); $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, $name, 'key') . ' UNIQUE (' . implode(',', $fields) . ')');
...@@ -858,10 +858,10 @@ public function dropUniqueKey($table, $name) { ...@@ -858,10 +858,10 @@ public function dropUniqueKey($table, $name) {
*/ */
public function addIndex($table, $name, $fields, array $spec) { public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, $name)) { if ($this->indexExists($table, $name)) {
throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
} }
$this->connection->query($this->_createIndexSql($table, $name, $fields)); $this->connection->query($this->_createIndexSql($table, $name, $fields));
...@@ -918,10 +918,10 @@ protected function introspectIndexSchema($table) { ...@@ -918,10 +918,10 @@ protected function introspectIndexSchema($table) {
*/ */
public function changeField($table, $field, $field_new, $spec, $new_keys = []) { public function changeField($table, $field, $field_new, $spec, $new_keys = []) {
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field])); throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
} }
if (($field != $field_new) && $this->fieldExists($table, $field_new)) { if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new])); throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
} }
if (isset($new_keys['primary key']) && in_array($field_new, $new_keys['primary key'], TRUE)) { if (isset($new_keys['primary key']) && in_array($field_new, $new_keys['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($new_keys['primary key'], [$field_new => $spec]); $this->ensureNotNullPrimaryKey($new_keys['primary key'], [$field_new => $spec]);
......
...@@ -262,10 +262,10 @@ public function getFieldTypeMap() { ...@@ -262,10 +262,10 @@ public function getFieldTypeMap() {
*/ */
public function renameTable($table, $new_name) { public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
} }
if ($this->tableExists($new_name)) { if ($this->tableExists($new_name)) {
throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name])); throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
} }
$schema = $this->introspectSchema($table); $schema = $this->introspectSchema($table);
...@@ -314,10 +314,10 @@ public function dropTable($table) { ...@@ -314,10 +314,10 @@ public function dropTable($table) {
*/ */
public function addField($table, $field, $specification, $keys_new = []) { public function addField($table, $field, $specification, $keys_new = []) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
} }
if ($this->fieldExists($table, $field)) { if ($this->fieldExists($table, $field)) {
throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table])); throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
} }
if (isset($keys_new['primary key']) && in_array($field, $keys_new['primary key'], TRUE)) { if (isset($keys_new['primary key']) && in_array($field, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field => $specification]); $this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field => $specification]);
...@@ -586,10 +586,10 @@ public function dropField($table, $field) { ...@@ -586,10 +586,10 @@ public function dropField($table, $field) {
*/ */
public function changeField($table, $field, $field_new, $spec, $keys_new = []) { public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field])); throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
} }
if (($field != $field_new) && $this->fieldExists($table, $field_new)) { if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new])); throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
} }
if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) { if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]); $this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]);
...@@ -659,10 +659,10 @@ protected function mapKeyDefinition(array $key_definition, array $mapping) { ...@@ -659,10 +659,10 @@ protected function mapKeyDefinition(array $key_definition, array $mapping) {
*/ */
public function addIndex($table, $name, $fields, array $spec) { public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, $name)) { if ($this->indexExists($table, $name)) {
throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
} }
$schema['indexes'][$name] = $fields; $schema['indexes'][$name] = $fields;
...@@ -700,10 +700,10 @@ public function dropIndex($table, $name) { ...@@ -700,10 +700,10 @@ public function dropIndex($table, $name) {
*/ */
public function addUniqueKey($table, $name, $fields) { public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
} }
if ($this->indexExists($table, $name)) { if ($this->indexExists($table, $name)) {
throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name])); throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
} }
$schema['unique keys'][$name] = $fields; $schema['unique keys'][$name] = $fields;
...@@ -732,14 +732,14 @@ public function dropUniqueKey($table, $name) { ...@@ -732,14 +732,14 @@ public function dropUniqueKey($table, $name) {
*/ */
public function addPrimaryKey($table, $fields) { public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) { if (!$this->tableExists($table)) {
throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table])); throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
} }
$old_schema = $this->introspectSchema($table); $old_schema = $this->introspectSchema($table);
$new_schema = $old_schema; $new_schema = $old_schema;
if (!empty($new_schema['primary key'])) { if (!empty($new_schema['primary key'])) {
throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table])); throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
} }
$new_schema['primary key'] = $fields; $new_schema['primary key'] = $fields;
...@@ -792,7 +792,7 @@ protected function introspectIndexSchema($table) { ...@@ -792,7 +792,7 @@ protected function introspectIndexSchema($table) {
public function fieldSetDefault($table, $field, $default) { public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
} }
$old_schema = $this->introspectSchema($table); $old_schema = $this->introspectSchema($table);
...@@ -808,7 +808,7 @@ public function fieldSetDefault($table, $field, $default) { ...@@ -808,7 +808,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) { public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED); @trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) { if (!$this->fieldExists($table, $field)) {
throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field])); throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
} }
$old_schema = $this->introspectSchema($table); $old_schema = $this->introspectSchema($table);
......