Commit d0f8f90a authored by webchick's avatar webchick

#303889 by David_Rothstein, kbahey, and chx: Make it possible to update D6 -> D7.

parent 0f956d42
......@@ -414,9 +414,7 @@ public function query($query, Array $args = array(), $options = array()) {
}
}
catch (PDOException $e) {
if (!function_exists('module_implements')) {
_db_need_install();
}
_db_check_install_needed();
if ($options['throw_exception']) {
if ($query instanceof DatabaseStatement) {
$query_string = $stmt->queryString;
......@@ -892,11 +890,9 @@ public function startTransaction($required = FALSE) {
final protected static function parseConnectionInfo() {
global $databases;
if (empty($databases)) {
_db_need_install();
}
$databaseInfo = $databases;
_db_check_install_needed();
$databaseInfo = $databases;
foreach ($databaseInfo as $index => $info) {
foreach ($databaseInfo[$index] as $target => $value) {
// If there is no "driver" property, then we assume it's an array of
......@@ -1016,7 +1012,7 @@ public static function addConnectionInfo($key, $target, $info) {
// It is extremely rare that an exception will be generated here other
// than when installing. We therefore intercept it and try the installer,
// passing on the exception otherwise.
_db_need_install();
_db_check_install_needed();
throw $e;
}
}
......@@ -1851,7 +1847,7 @@ function db_field_set_no_default(&$ret, $table, $field) {
* Fields for the primary key.
*/
function db_add_primary_key(&$ret, $table, $fields) {
return Database::getActiveConnection()->schema()->addPrimaryKey($ret, $table, $field);
return Database::getActiveConnection()->schema()->addPrimaryKey($ret, $table, $fields);
}
/**
......@@ -1923,7 +1919,7 @@ function db_add_index(&$ret, $table, $name, $fields) {
* The name of the index.
*/
function db_drop_index(&$ret, $table, $name) {
return Database::getActiveConnection()->schema()->addIndex($ret, $table, $name);
return Database::getActiveConnection()->schema()->dropIndex($ret, $table, $name);
}
/**
......@@ -2032,8 +2028,14 @@ function db_result(DatabaseStatement $statement) {
return $statement->fetchField();
}
function _db_need_install() {
if (!function_exists('install_goto')) {
/**
* Redirect the user to the installation script if Drupal has not been
* installed yet (i.e., if no $databases array has been defined in the
* settings file) and we are not already there. Otherwise, do nothing.
*/
function _db_check_install_needed() {
global $databases;
if (empty($databases) && !function_exists('install_main')) {
include_once DRUPAL_ROOT . '/includes/install.inc';
install_goto('install.php');
}
......
......@@ -61,10 +61,7 @@ public function query($query, Array $args = array(), $options = array()) {
}
}
catch (PDOException $e) {
if (!function_exists('module_implements')) {
_db_need_install();
}
//watchdog('database', var_export($e, TRUE) . $e->getMessage(), NULL, WATCHDOG_ERROR);
_db_check_install_needed();
if ($options['throw_exception']) {
if ($query instanceof DatabaseStatement) {
$query_string = $stmt->queryString;
......
......@@ -898,7 +898,7 @@ function theme_get_settings($key = NULL) {
'toggle_logo' => 1,
'toggle_favicon' => 1,
'toggle_name' => 1,
'toggle_search' => 1,
'toggle_search' => 0,
'toggle_slogan' => 0,
'toggle_mission' => 1,
'toggle_node_user_picture' => 0,
......@@ -919,8 +919,8 @@ function theme_get_settings($key = NULL) {
}
// Only offer search box if search.module is enabled.
if (!module_exists('search') || !user_access('search content')) {
$settings['toggle_search'] = 0;
if (!defined('MAINTENANCE_MODE') && module_exists('search') && user_access('search content')) {
$settings['toggle_search'] = 1;
}
return $settings;
......
......@@ -594,8 +594,9 @@ function _node_types_build() {
while ($type_object = db_fetch_object($type_result)) {
// Check for node types from disabled modules and mark their types for removal.
// Types defined by the node module in the database (rather than by a separate
// module using hook_node_info) have a base value of 'node_content'.
if ($type_object->base != 'node_content' && empty($info_array[$type_object->type])) {
// module using hook_node_info) have a base value of 'node_content'. The isset()
// check prevents errors on old (pre-Drupal 7) databases.
if (isset($type_object->base) && $type_object->base != 'node_content' && empty($info_array[$type_object->type])) {
$type_object->disabled = TRUE;
}
if (!isset($_node_types[$type_object->type]) || $type_object->modified) {
......
......@@ -2955,7 +2955,7 @@ function system_update_7006() {
'type' => array('type' => 'varchar', 'length' => 9, 'not null' => TRUE, 'default' => ''),
'filename' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
'module' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
'suffix' => array('type' => 'varchar', 'length' => 69, 'not null' => TRUE, 'default' => ''),
'suffix' => array('type' => 'varchar', 'length' => 68, 'not null' => TRUE, 'default' => ''),
'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
),
'primary key' => array('name', 'type'),
......@@ -3071,8 +3071,8 @@ function system_update_7009() {
*/
function system_update_7010() {
$ret = array();
db_change_field($ret, 'menu_router', 'load_functions', 'load_functions', array('type' => 'text', 'not null' => TRUE, 'default' => ''));
db_change_field($ret, 'menu_router', 'to_arg_functions', 'to_arg_functions', array('type' => 'text', 'not null' => TRUE, 'default' => '',));
db_change_field($ret, 'menu_router', 'load_functions', 'load_functions', array('type' => 'text', 'not null' => TRUE));
db_change_field($ret, 'menu_router', 'to_arg_functions', 'to_arg_functions', array('type' => 'text', 'not null' => TRUE));
return $ret;
}
......@@ -3107,10 +3107,11 @@ function system_update_7012() {
$ret = array();
db_drop_unique_key($ret, 'search_dataset', 'sid_type');
db_add_primary_key($ret, 'search_dataset', array('sid', 'type'));
db_drop_index($ret, 'search_index', 'word');
db_drop_unique_key($ret, 'search_index', 'word_sid_type');
db_add_primary_key($ret, 'search_index', array('word', 'sid', 'type'));
return $ret;
}
......
......@@ -330,7 +330,7 @@ function update_finished($success, $results, $operations) {
$_SESSION['update_results'] = $results;
$_SESSION['update_success'] = $success;
$_SESSION['updates_remaining'] = $operations;
// Now that the update is done, we can disable site maintenance if it was
// previously turned off.
if (isset($_SESSION['site_offline']) && $_SESSION['site_offline'] == FALSE) {
......@@ -573,6 +573,37 @@ function update_fix_d6_requirements() {
return $ret;
}
/**
* Users who still have a Drupal 6 database (and are in the process of
* updating to Drupal 7) need extra help before a full bootstrap can be
* achieved. This function does the necessary preliminary work that allows
* the bootstrap to be successful.
*
* No access check has been performed when this function is called, so no
* changes to the database should be made here.
*/
function update_prepare_d7_bootstrap() {
// Allow the database system to work even though the registry has not
// been created yet.
drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE);
include_once DRUPAL_ROOT . '/includes/install.inc';
drupal_install_init_database();
spl_autoload_unregister('drupal_autoload_class');
spl_autoload_unregister('drupal_autoload_interface');
// The new {blocked_ips} table is used in Drupal 7 to store a list of
// banned IP addresses. If this table doesn't exist then we are still
// running on a Drupal 6 database, so suppress the unavoidable errors
// that occur.
try {
drupal_bootstrap(DRUPAL_BOOTSTRAP_ACCESS);
}
catch (Exception $e) {
if (db_table_exists('blocked_ips')) {
throw $e;
}
}
}
/**
* Add the update task list to the current page.
*/
......@@ -655,13 +686,10 @@ function update_check_requirements() {
install_goto('update.php?op=info');
}
update_prepare_d7_bootstrap();
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
drupal_maintenance_theme();
// This must happen *after* drupal_bootstrap(), since it calls
// variable_(get|set), which only works after a full bootstrap.
update_create_batch_table();
// Turn error reporting back on. From now on, only fatal errors (which are
// not passed through the error handler) will cause a message to be printed.
ini_set('display_errors', TRUE);
......
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