summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-09 22:07:57 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-09 22:07:57 +0000
commita895a366c56fc3a03303e5341e222b7ad097952b (patch)
treebc2570500c04151ad8f6ea2b99e385f9839bf2ef /includes
parent20bac50d4a67dc44b2a40f03162a4d0d244448ce (diff)
downloadbrdo-a895a366c56fc3a03303e5341e222b7ad097952b.tar.gz
brdo-a895a366c56fc3a03303e5341e222b7ad097952b.tar.bz2
#563106 by quicksketch, scor, andypost, ctmattice1, catch, yched, adrian: Fix critical upgrade path bugs from Drupal 6 to Drupal 7
Diffstat (limited to 'includes')
-rw-r--r--includes/update.inc26
1 files changed, 26 insertions, 0 deletions
diff --git a/includes/update.inc b/includes/update.inc
index 28b4cbb81..97a878480 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -178,6 +178,7 @@ function update_fix_d7_requirements() {
// Add the cache_path table.
$schema['cache_path'] = drupal_get_schema_unprocessed('system', 'cache');
$schema['cache_path']['description'] = 'Cache table used for path alias lookups.';
+ db_create_table('cache_path', $schema['cache_path']);
// system_update_7042() renames columns, but these are needed to bootstrap.
// Add empty columns for now.
@@ -250,6 +251,31 @@ function update_fix_d7_requirements() {
);
db_create_table('semaphore', $schema['semaphore']);
+ // Add registry tables since these are required during an update.
+ $schema['registry'] = array(
+ 'fields' => array(
+ 'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
+ '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' => ''),
+ 'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+ ),
+ 'primary key' => array('name', 'type'),
+ 'indexes' => array(
+ 'hook' => array('type', 'weight', 'module'),
+ ),
+ );
+ $schema['registry_file'] = array(
+ 'fields' => array(
+ 'filename' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+ 'filectime' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+ 'filemtime' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+ ),
+ 'primary key' => array('filename'),
+ );
+ db_create_table('registry', $schema['registry']);
+ db_create_table('registry_file', $schema['registry_file']);
+
$schema['date_format_type'] = array(
'description' => 'Stores configured date format types.',
'fields' => array(