mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
same right for all. ;) Groups table using same column types as the users table for avatars.
git-svn-id: file:///svn/phpbb/trunk@7968 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
5d52b51853
commit
1db9e62e08
7 changed files with 24 additions and 24 deletions
|
@ -14,7 +14,7 @@
|
|||
|
||||
die("Please read the first lines of this script for instructions on how to enable it");
|
||||
|
||||
set_time_limit(0);
|
||||
@set_time_limit(0);
|
||||
|
||||
$schema_path = './../install/schemas/';
|
||||
|
||||
|
@ -1107,9 +1107,9 @@ function get_schema_struct()
|
|||
'group_desc_uid' => array('VCHAR:5', ''),
|
||||
'group_display' => array('BOOL', 0),
|
||||
'group_avatar' => array('VCHAR', ''),
|
||||
'group_avatar_type' => array('TINT:4', 0),
|
||||
'group_avatar_width' => array('TINT:4', 0),
|
||||
'group_avatar_height' => array('TINT:4', 0),
|
||||
'group_avatar_type' => array('TINT:2', 0),
|
||||
'group_avatar_width' => array('USINT', 0),
|
||||
'group_avatar_height' => array('USINT', 0),
|
||||
'group_rank' => array('UINT', 0),
|
||||
'group_colour' => array('VCHAR:6', ''),
|
||||
'group_sig_chars' => array('UINT', 0),
|
||||
|
|
|
@ -380,6 +380,11 @@ $database_update_info = array(
|
|||
FORUMS_TABLE => array(
|
||||
'forum_style' => array('USINT', 0),
|
||||
),
|
||||
GROUPS_TABLE => array(
|
||||
'group_avatar_type' => array('TINT:2', 0),
|
||||
'group_avatar_width' => array('USINT', 0),
|
||||
'group_avatar_height' => array('USINT', 0),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
@ -467,7 +472,6 @@ while ($row = $db->sql_fetchrow($result))
|
|||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
|
||||
echo $lang['PREVIOUS_VERSION'] . ' :: <strong>' . $config['version'] . '</strong><br />';
|
||||
echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong>';
|
||||
|
||||
|
@ -1164,8 +1168,6 @@ if (version_compare($current_version, '3.0.RC3', '<='))
|
|||
{
|
||||
$sql = "SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));';
|
||||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
$no_updates = false;
|
||||
}
|
||||
|
||||
// we check for:
|
||||
|
@ -1204,8 +1206,6 @@ if (version_compare($current_version, '3.0.RC3', '<='))
|
|||
case 'mssql':
|
||||
$sql = 'DROP INDEX ' . $table_name . '.' . $bad_index;
|
||||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
$no_updates = false;
|
||||
break;
|
||||
|
||||
// last version, firebird, oracle, postgresql and sqlite all got bad index names
|
||||
|
@ -1216,8 +1216,6 @@ if (version_compare($current_version, '3.0.RC3', '<='))
|
|||
case 'sqlite':
|
||||
$sql = 'DROP INDEX ' . $bad_index;
|
||||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
$no_updates = false;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1247,10 +1245,12 @@ if (version_compare($current_version, '3.0.RC3', '<='))
|
|||
// Make sure empty smiley codes do not exist
|
||||
$sql = 'DELETE FROM ' . SMILIES_TABLE . "
|
||||
WHERE code = ''";
|
||||
$db->sql_query($sql);
|
||||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
set_config('allow_birthdays', '1');
|
||||
set_config('cron_lock', '0', true);
|
||||
|
||||
$no_updates = false;
|
||||
}
|
||||
|
||||
_write_result($no_updates, $errored, $error_ary);
|
||||
|
|
|
@ -303,9 +303,9 @@ CREATE TABLE phpbb_groups (
|
|||
group_desc_uid varbinary(5) DEFAULT '' NOT NULL,
|
||||
group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_avatar varbinary(255) DEFAULT '' NOT NULL,
|
||||
group_avatar_type tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_width tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_height tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
|
||||
group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_colour varbinary(6) DEFAULT '' NOT NULL,
|
||||
group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
|
|
@ -303,9 +303,9 @@ CREATE TABLE phpbb_groups (
|
|||
group_desc_uid varchar(5) DEFAULT '' NOT NULL,
|
||||
group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_avatar varchar(255) DEFAULT '' NOT NULL,
|
||||
group_avatar_type tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_width tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_height tinyint(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
|
||||
group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_colour varchar(6) DEFAULT '' NOT NULL,
|
||||
group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
|
|
@ -593,7 +593,7 @@ CREATE TABLE phpbb_groups (
|
|||
group_desc_uid varchar2(5) DEFAULT '' ,
|
||||
group_display number(1) DEFAULT '0' NOT NULL,
|
||||
group_avatar varchar2(255) DEFAULT '' ,
|
||||
group_avatar_type number(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_type number(2) DEFAULT '0' NOT NULL,
|
||||
group_avatar_width number(4) DEFAULT '0' NOT NULL,
|
||||
group_avatar_height number(4) DEFAULT '0' NOT NULL,
|
||||
group_rank number(8) DEFAULT '0' NOT NULL,
|
||||
|
|
|
@ -447,8 +447,8 @@ CREATE TABLE phpbb_groups (
|
|||
group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
|
||||
group_avatar varchar(255) DEFAULT '' NOT NULL,
|
||||
group_avatar_type INT2 DEFAULT '0' NOT NULL,
|
||||
group_avatar_width INT2 DEFAULT '0' NOT NULL,
|
||||
group_avatar_height INT2 DEFAULT '0' NOT NULL,
|
||||
group_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_width >= 0),
|
||||
group_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_height >= 0),
|
||||
group_rank INT4 DEFAULT '0' NOT NULL CHECK (group_rank >= 0),
|
||||
group_colour varchar(6) DEFAULT '' NOT NULL,
|
||||
group_sig_chars INT4 DEFAULT '0' NOT NULL CHECK (group_sig_chars >= 0),
|
||||
|
|
|
@ -295,9 +295,9 @@ CREATE TABLE phpbb_groups (
|
|||
group_desc_uid varchar(5) NOT NULL DEFAULT '',
|
||||
group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_avatar varchar(255) NOT NULL DEFAULT '',
|
||||
group_avatar_type tinyint(4) NOT NULL DEFAULT '0',
|
||||
group_avatar_width tinyint(4) NOT NULL DEFAULT '0',
|
||||
group_avatar_height tinyint(4) NOT NULL DEFAULT '0',
|
||||
group_avatar_type tinyint(2) NOT NULL DEFAULT '0',
|
||||
group_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_colour varchar(6) NOT NULL DEFAULT '',
|
||||
group_sig_chars INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
|
|
Loading…
Add table
Reference in a new issue