diff options
| -rw-r--r-- | database/updates.inc | 15 | ||||
| -rw-r--r-- | update.php | 20 |
2 files changed, 20 insertions, 15 deletions
diff --git a/database/updates.inc b/database/updates.inc index 10a73f3d7..e7a1a24be 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -1398,18 +1398,3 @@ function system_update_166() { return $ret; } -function system_update_167() { - $ret = array(); - switch ($GLOBALS['db_type']) { - case 'pgsql': - db_add_column($ret, 'system', 'weight', 'smallint', array('not null' => TRUE, 'default' => 0)); - $ret[] = update_sql('CREATE INDEX {system}_weight_idx ON {system} (weight)'); - break; - case 'mysql': - case 'mysqli': - $ret[] = update_sql("ALTER TABLE {system} ADD weight tinyint(3) unsigned default '0' NOT NULL, ADD KEY (weight)"); - break; - } - - return $ret; -} diff --git a/update.php b/update.php index f5623e04f..1a8c5812b 100644 --- a/update.php +++ b/update.php @@ -513,7 +513,27 @@ function update_access_denied_page() { </ol>'; } +// This code may be removed later. It is part of the Drupal 4.5 to 4.7 migration. +function update_fix_system_table() { + drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); + $row = db_fetch_object(db_query_range('SELECT * FROM {system}', 0, 1)); + if (!isset($row->weight)) { + $ret = array(); + switch ($GLOBALS['db_type']) { + case 'pgsql': + db_add_column($ret, 'system', 'weight', 'smallint', array('not null' => TRUE, 'default' => 0)); + $ret[] = update_sql('CREATE INDEX {system}_weight_idx ON {system} (weight)'); + break; + case 'mysql': + case 'mysqli': + $ret[] = update_sql("ALTER TABLE {system} ADD weight tinyint(3) unsigned default '0' NOT NULL, ADD KEY (weight)"); + break; + } + } +} + include_once './includes/bootstrap.inc'; +update_fix_system_table(); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); drupal_maintenance_theme(); |