Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#524710 by catch and gordon: Add role_permission() table earlier in order to allow upgrade path to work.

merge-requests/26/head
Angie Byron 2009-10-24 01:46:13 +00:00
parent 63ac367e4f
commit ae70677b3d
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
includes/update.inc
View File

@ -128,10 +128,32 @@ function update_fix_d7_requirements() {
$schema['cache_path']['description'] = 'Cache table used for path alias lookups.'; $schema['cache_path']['description'] = 'Cache table used for path alias lookups.';
// system_update_7042() renames columns, but these are needed to bootstrap. // system_update_7042() renames columns, but these are needed to bootstrap.
// add empty columns for now. // Add empty columns for now.
db_add_field('url_alias', 'source', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')); db_add_field('url_alias', 'source', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
db_add_field('url_alias', 'alias', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')); db_add_field('url_alias', 'alias', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
// Add the role_permisson table.
$schema['role_permission'] = array(
'fields' => array(
'rid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
),
'permission' => array(
'type' => 'varchar',
'length' => 64,
'not null' => TRUE,
'default' => '',
),
),
'primary key' => array('rid', 'permission'),
'indexes' => array(
'permission' => array('permission'),
),
);
db_create_table('role_permission', $schema['role_permission']);
// Add column for locale context. // Add column for locale context.
if (db_table_exists('locales_source')) { if (db_table_exists('locales_source')) {
db_add_field('locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.')); db_add_field('locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.'));

22
modules/system/system.install
View File

@ -1992,28 +1992,6 @@ function system_update_7006() {
* all modules can use the updated permission scheme during their updates. * all modules can use the updated permission scheme during their updates.
*/ */
function system_update_7007() { function system_update_7007() {
$schema['role_permission'] = array(
'fields' => array(
'rid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
),
'permission' => array(
'type' => 'varchar',
'length' => 64,
'not null' => TRUE,
'default' => '',
),
),
'primary key' => array('rid', 'permission'),
'indexes' => array(
'permission' => array('permission'),
),
);
db_create_table('role_permission', $schema['role_permission']);
// Copy the permissions from the old {permission} table to the new {role_permission} table. // Copy the permissions from the old {permission} table to the new {role_permission} table.
$messages = array(); $messages = array();
$result = db_query("SELECT rid, perm FROM {permission} ORDER BY rid ASC"); $result = db_query("SELECT rid, perm FROM {permission} ORDER BY rid ASC");