Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
d0357e97
Commit
d0357e97
authored
Sep 08, 2006
by
Neil Drumm
Browse files
#82177
by Heine. Run cache updates early to avoid unrecoverable errors.
parent
8bad7516
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/system/system.install
View file @
d0357e97
...
...
@@ -3289,72 +3289,6 @@ function system_update_1008() {
return
$ret
;
}
function
system_update_1009
()
{
$ret
=
array
();
switch
(
$GLOBALS
[
'db_type'
])
{
case
'mysql'
:
case
'mysqli'
:
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_filter
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_menu
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_page
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
break
;
case
'pgsql'
:
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_filter
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_menu
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_page
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_filter
}
_expire_idx ON
{
cache_filter
}
(expire)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_menu
}
_expire_idx ON
{
cache_menu
}
(expire)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_page
}
_expire_idx ON
{
cache_page
}
(expire)"
);
break
;
}
return
$ret
;
}
function
system_update_1010
()
{
$ret
=
array
();
...
...
update.php
View file @
d0357e97
...
...
@@ -678,6 +678,83 @@ function update_convert_table_utf8($table) {
return
$ret
;
}
/**
* Create tables for the split cache.
*
* This is part of the Drupal 4.7 to 5.0 migration.
*/
function
update_create_cache_tables
()
{
// If cache_filter exists, update is not necessary
if
(
db_table_exists
(
'cache_filter'
))
{
return
;
}
$ret
=
array
();
switch
(
$GLOBALS
[
'db_type'
])
{
case
'mysql'
:
case
'mysqli'
:
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_filter
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_menu
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_page
}
(
cid varchar(255) NOT NULL default '',
data longblob,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ "
);
break
;
case
'pgsql'
:
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_filter
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_menu
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE TABLE
{
cache_page
}
(
cid varchar(255) NOT NULL default '',
data bytea,
expire int NOT NULL default '0',
created int NOT NULL default '0',
headers text,
PRIMARY KEY (cid)
)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_filter
}
_expire_idx ON
{
cache_filter
}
(expire)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_menu
}
_expire_idx ON
{
cache_menu
}
(expire)"
);
$ret
[]
=
update_sql
(
"CREATE INDEX
{
cache_page
}
_expire_idx ON
{
cache_page
}
(expire)"
);
break
;
}
return
$ret
;
}
// Some unavoidable errors happen because the database is not yet up-to-date.
// Our custom error handler is not yet installed, so we just suppress them.
ini_set
(
'display_errors'
,
FALSE
);
...
...
@@ -691,6 +768,7 @@ function update_convert_table_utf8($table) {
// This must happen *after* drupal_bootstrap(), since it calls
// variable_(get|set), which only works after a full bootstrap.
update_fix_access_table
();
update_create_cache_tables
();
// 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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment