Commit f179b1f7 authored by Dries's avatar Dries

- Patch #278592 by catch, Dave Reid, andypost, lilou, sun, tobiasb: sync 6.x...

- Patch #278592 by catch, Dave Reid, andypost, lilou, sun, tobiasb: sync 6.x extra updates with HEAD.
parent 1d9df227
......@@ -93,11 +93,33 @@ function dblog_schema() {
}
/**
* Allow NULL values for links and longer referers.
* @defgroup updates-6.x-extra Extra database logging updates for 6.x
* @{
*/
/**
* Allow longer referrers.
*/
function dblog_update_6000() {
db_change_field('watchdog', 'referer', 'referer', array('type' => 'text', 'not null' => FALSE));
}
/**
* @} End of "defgroup updates-6.x-extra"
* The next series of updates should start at 7000.
*/
/**
* @defgroup updates-6.x-to-7.x database logging updates from 6.x to 7.x
* @{
*/
/**
* Allow NULL values for links.
*/
function dblog_update_7001() {
db_change_field('watchdog', 'link', 'link', array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''));
db_change_field('watchdog', 'referer', 'referer', array('type' => 'text', 'not null' => FALSE));
}
/**
......@@ -113,3 +135,8 @@ function dblog_update_7002() {
function dblog_update_7003() {
db_change_field('watchdog', 'type', 'type', array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''));
}
/**
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
*/
......@@ -39,6 +39,7 @@ function locale_update_7000() {
db_add_field('locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
db_drop_index('locales_source', 'source');
db_add_index('locales_source', 'source_context', array(array('source', 30), 'context'));
db_change_field('locales_source', 'location', 'location', array('type' => 'text', 'size' => 'big', 'not null' => FALSE));
}
/**
......
......@@ -134,17 +134,28 @@ function statistics_schema() {
}
/**
* @defgroup updates-6.x-to-7.x System updates from 6.x to 7.x
* @defgroup updates-6.x-extra Extra statistics updates for 6.x
* @{
*/
/**
* Allow longer referrers.
*/
function statistics_update_7000() {
function statistics_update_6000() {
db_change_field('accesslog', 'url', 'url', array('type' => 'text', 'not null' => FALSE));
}
/**
* @} End of "defgroup updates-6.x-extra"
* The next series of updates should start at 7000.
*/
/**
* @defgroup updates-6.x-to-7.x statistics updates from 6.x to 7.x
* @{
*/
/**
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
......
......@@ -1629,9 +1629,99 @@ function system_schema() {
// Updates for core.
function system_update_last_removed() {
return 6049;
return 6047;
}
/**
* @defgroup updates-6.x-extra Extra system updates for 6.x
* @{
*/
/**
* Increase the size of the 'load_functions' and 'to_arg_functions' fields in table 'menu_router'.
*/
function system_update_6048() {
$ret = array();
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;
}
/**
* Replace src index on the {url_alias} table with src, language.
*/
function system_update_6049() {
$ret = array();
db_drop_index($ret, 'url_alias', 'src');
db_add_index($ret, 'url_alias', 'src_language', array('src', 'language'));
return $ret;
}
/**
* Clear any menu router blobs stored in the cache table.
*/
function system_update_6050() {
$ret = array();
cache_clear_all('router:', 'cache_menu', TRUE);
return $ret;
}
/**
* Create a signature_format column.
*/
function system_update_6051() {
$ret = array();
if (!db_column_exists('users', 'signature_format')) {
// Set future input formats to FILTER_FORMAT_DEFAULT to ensure a safe default
// when incompatible modules insert into the users table. An actual format
// will be assigned when users save their signature.
$schema = array(
'type' => 'int',
'size' => 'small',
'not null' => TRUE,
'default' => FILTER_FORMAT_DEFAULT,
'description' => 'The {filter_formats}.format of the signature.',
);
db_add_field($ret, 'users', 'signature_format', $schema);
// Set the format of existing signatures to the current default input format.
if ($current_default_filter = variable_get('filter_default_format', 0)) {
$ret[] = update_sql("UPDATE {users} SET signature_format = ". $current_default_filter);
}
drupal_set_message("User signatures no longer inherit comment input formats. Each user's signature now has its own associated format that can be selected on the user's account page. Existing signatures have been set to your site's default input format.");
}
return $ret;
}
/**
* Add a missing index on the {menu_router} table.
*/
function system_update_6052() {
$ret = array();
db_add_index($ret, 'menu_router', 'tab_root_weight_title', array(array('tab_root', 64), 'weight', 'title'));
return $ret;
}
/**
* Add a {system} index on type and name.
*/
function system_update_6053() {
$ret = array();
db_add_index($ret, 'system', 'type_name', array(array('type', 12), 'name'));
return $ret;
}
/**
* @} End of "defgroup updates-6.x-extra"
* The next series of updates should start at 7000.
*/
/**
* @defgroup updates-6.x-to-7.x System updates from 6.x to 7.x
......
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