diff options
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 16 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_40_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_41_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/oracle_schema.sql | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index ffd4774c59..34f0aebb12 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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); diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index cdece1567b..e2dc0718e7 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -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, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index f9535aaacc..022c3ecbfe 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -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, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 69889a3db2..7dad10dd67 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -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, diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index b2a5b20a52..f9b0557d8a 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -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), diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index fb619a3f36..90847e9d31 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -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', |