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

Issue #2990118 by amateescu: Optimize 'initial' and 'initial_from_field' handling in MySQL and PostgreSQL

8.7.x
Alex Pott 2018-08-06 10:53:18 +01:00
parent 27bc1f74cb
commit bc328489db
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
View File

@ -438,11 +438,6 @@ class Schema extends DatabaseSchema {
$query .= ', ADD ' . implode(', ADD ', $keys_sql); $query .= ', ADD ' . implode(', ADD ', $keys_sql);
} }
$this->connection->query($query); $this->connection->query($query);
if (isset($spec['initial'])) {
$this->connection->update($table)
->fields([$field => $spec['initial']])
->execute();
}
if (isset($spec['initial_from_field'])) { if (isset($spec['initial_from_field'])) {
if (isset($spec['initial'])) { if (isset($spec['initial'])) {
$expression = 'COALESCE(' . $spec['initial_from_field'] . ', :default_initial_value)'; $expression = 'COALESCE(' . $spec['initial_from_field'] . ', :default_initial_value)';
@ -456,6 +451,11 @@ class Schema extends DatabaseSchema {
->expression($field, $expression, $arguments) ->expression($field, $expression, $arguments)
->execute(); ->execute();
} }
elseif (isset($spec['initial'])) {
$this->connection->update($table)
->fields([$field => $spec['initial']])
->execute();
}
if ($fixnull) { if ($fixnull) {
$spec['not null'] = TRUE; $spec['not null'] = TRUE;
$this->changeField($table, $field, $field, $spec); $this->changeField($table, $field, $field, $spec);

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

@ -565,11 +565,6 @@ EOD;
$query = 'ALTER TABLE {' . $table . '} ADD COLUMN '; $query = 'ALTER TABLE {' . $table . '} ADD COLUMN ';
$query .= $this->createFieldSql($field, $this->processField($spec)); $query .= $this->createFieldSql($field, $this->processField($spec));
$this->connection->query($query); $this->connection->query($query);
if (isset($spec['initial'])) {
$this->connection->update($table)
->fields([$field => $spec['initial']])
->execute();
}
if (isset($spec['initial_from_field'])) { if (isset($spec['initial_from_field'])) {
if (isset($spec['initial'])) { if (isset($spec['initial'])) {
$expression = 'COALESCE(' . $spec['initial_from_field'] . ', :default_initial_value)'; $expression = 'COALESCE(' . $spec['initial_from_field'] . ', :default_initial_value)';
@ -583,6 +578,11 @@ EOD;
->expression($field, $expression, $arguments) ->expression($field, $expression, $arguments)
->execute(); ->execute();
} }
elseif (isset($spec['initial'])) {
$this->connection->update($table)
->fields([$field => $spec['initial']])
->execute();
}
if ($fixnull) { if ($fixnull) {
$this->connection->query("ALTER TABLE {" . $table . "} ALTER $field SET NOT NULL"); $this->connection->query("ALTER TABLE {" . $table . "} ALTER $field SET NOT NULL");
} }