diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 7a0bec11e2..2aad6c3900 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -12,7 +12,7 @@ * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds. */ -die("Please read the first lines of this script for instructions on how to enable it"); +//die("Please read the first lines of this script for instructions on how to enable it"); set_time_limit(0); @@ -37,9 +37,9 @@ $dbms_type_map = array( 'VCHAR:' => 'varchar(%d)', 'CHAR:' => 'char(%d)', 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'text', + 'XSTEXT_UNI'=> 'varchar(100)', 'STEXT' => 'text', - 'STEXT_UNI' => 'text', + 'STEXT_UNI' => 'varchar(255)', 'TEXT' => 'text', 'TEXT_UNI' => 'text', 'MTEXT' => 'mediumtext', @@ -48,7 +48,7 @@ $dbms_type_map = array( 'DECIMAL' => 'decimal(5,2)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(252)', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'varbinary(255)', ), @@ -87,23 +87,23 @@ $dbms_type_map = array( 'TINT:' => 'INTEGER', 'USINT' => 'INTEGER', 'BOOL' => 'INTEGER', - 'VCHAR' => 'VARCHAR(255)', - 'VCHAR:' => 'VARCHAR(%d)', - 'CHAR:' => 'CHAR(%d)', - 'XSTEXT' => 'BLOB SUB_TYPE TEXT', - 'STEXT' => 'BLOB SUB_TYPE TEXT', - 'TEXT' => 'BLOB SUB_TYPE TEXT', - 'MTEXT' => 'BLOB SUB_TYPE TEXT', - 'XSTEXT_UNI'=> 'BLOB SUB_TYPE TEXT', - 'STEXT_UNI' => 'BLOB SUB_TYPE TEXT', - 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT', - 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT', + 'VCHAR' => 'VARCHAR(255) CHARACTER SET NONE', + 'VCHAR:' => 'VARCHAR(%d) CHARACTER SET NONE', + 'CHAR:' => 'CHAR(%d) CHARACTER SET NONE', + 'XSTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'STEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'TEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'MTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8', + 'STEXT_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', + 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', 'TIMESTAMP' => 'INTEGER', 'DECIMAL' => 'DOUBLE PRECISION', - 'VCHAR_UNI' => 'VARCHAR(84) CHARACTER SET UNICODE_FSS', - 'VCHAR_UNI:'=> array('VARCHAR(%d) CHARACTER SET UNICODE_FSS', 'rule' => array('div', 3)), - 'VCHAR_CI' => 'VARCHAR(84) CHARACTER SET UNICODE_FSS', - 'VARBINARY' => 'CHAR(255)', + 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', + 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'VARBINARY' => 'CHAR(255) CHARACTER SET NONE', ), 'mssql' => array( @@ -121,15 +121,15 @@ $dbms_type_map = array( 'STEXT' => '[varchar] (3000)', 'TEXT' => '[varchar] (8000)', 'MTEXT' => '[text]', - 'XSTEXT_UNI'=> '[text]', - 'STEXT_UNI' => '[text]', - 'TEXT_UNI' => '[text]', + 'XSTEXT_UNI'=> '[varchar] (100)', + 'STEXT_UNI' => '[varchar] (255)', + 'TEXT_UNI' => '[varchar] (4000)', 'MTEXT_UNI' => '[text]', 'TIMESTAMP' => '[int]', 'DECIMAL' => '[float]', 'VCHAR_UNI' => '[varchar] (255)', 'VCHAR_UNI:'=> '[varchar] (%d)', - 'VCHAR_CI' => '[varchar] (252)', + 'VCHAR_CI' => '[varchar] (255)', 'VARBINARY' => '[varchar] (255)', ), @@ -148,15 +148,15 @@ $dbms_type_map = array( 'STEXT' => 'varchar2(3000)', 'TEXT' => 'clob', 'MTEXT' => 'clob', - 'XSTEXT_UNI'=> 'varchar2(1000)', - 'STEXT_UNI' => 'varchar2(3000)', + 'XSTEXT_UNI'=> 'varchar2(300)', + 'STEXT_UNI' => 'varchar2(765)', 'TEXT_UNI' => 'clob', 'MTEXT_UNI' => 'clob', 'TIMESTAMP' => 'number(11)', 'DECIMAL' => 'number(5, 2)', - 'VCHAR_UNI' => 'varchar2(255)', - 'VCHAR_UNI:'=> 'varchar2(%d)', - 'VCHAR_CI' => 'varchar2(252)', + 'VCHAR_UNI' => 'varchar2(765)', + 'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')), + 'VCHAR_CI' => 'varchar2(255)', 'VARBINARY' => 'raw(255)', ), @@ -183,7 +183,7 @@ $dbms_type_map = array( 'DECIMAL' => 'decimal(5,2)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(252)', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'blob', ), @@ -202,9 +202,9 @@ $dbms_type_map = array( 'STEXT' => 'varchar(3000)', 'TEXT' => 'varchar(8000)', 'MTEXT' => 'TEXT', - 'XSTEXT_UNI'=> 'varchar(1000)', - 'STEXT_UNI' => 'varchar(3000)', - 'TEXT_UNI' => 'varchar(8000)', + 'XSTEXT_UNI'=> 'varchar(100)', + 'STEXT_UNI' => 'varchar(255)', + 'TEXT_UNI' => 'varchar(4000)', 'MTEXT_UNI' => 'TEXT', 'TIMESTAMP' => 'INT4', // unsigned 'DECIMAL' => 'decimal(5,2)', @@ -301,6 +301,9 @@ foreach ($supported_dbms as $dbms) break; } + // Table specific so we don't get overlap + $modded_array = array(); + // Write columns one by one... foreach ($table_data['COLUMNS'] as $column_name => $column_data) { @@ -335,6 +338,7 @@ foreach ($supported_dbms as $dbms) if ($column_length > $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2]) { $column_type = $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3]; + $modded_array[$column_name] = $column_type; } else { @@ -403,7 +407,15 @@ foreach ($supported_dbms as $dbms) $line .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' '; } - $line .= "NOT NULL,\n"; + $line .= 'NOT NULL'; + + // This is a UNICODE column and thus should be given it's fair share + if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0])) + { + $line .= ' COLLATE UNICODE'; + } + + $line .= ",\n"; if (isset($column_data[2]) && $column_data[2] == 'auto_increment') { @@ -593,6 +605,18 @@ foreach ($supported_dbms as $dbms) case 'mysql_41': $line .= ($key_data[0] == 'INDEX') ? "\tKEY" : ''; $line .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : ''; + foreach ($key_data[1] as $key => $col_name) + { + if (isset($modded_array[$col_name])) + { + switch ($modded_array[$col_name]) + { + case 'text': + $key_data[1][$key] = $col_name . '(255)'; + break; + } + } + } $line .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n"; break; @@ -735,7 +759,7 @@ foreach ($supported_dbms as $dbms) * VCHAR:x => varchar(x) * TIMESTAMP => int(11) UNSIGNED * DECIMAL => decimal number (5,2) -* VCHAR_UNI => varchar(252) BINARY +* VCHAR_UNI => varchar(255) BINARY * VCHAR_CI => varchar_ci for postgresql, others VCHAR */ function get_schema_struct() @@ -905,7 +929,7 @@ function get_schema_struct() $schema_data['phpbb_config'] = array( 'COLUMNS' => array( - 'config_name' => array('VCHAR:252', ''), + 'config_name' => array('VCHAR:255', ''), 'config_value' => array('VCHAR', ''), 'is_dynamic' => array('BOOL', 0), ), @@ -931,7 +955,7 @@ function get_schema_struct() $schema_data['phpbb_disallow'] = array( 'COLUMNS' => array( 'disallow_id' => array('UINT', NULL, 'auto_increment'), - 'disallow_username' => array('VCHAR_UNI:252', ''), + 'disallow_username' => array('VCHAR_UNI:255', ''), ), 'PRIMARY_KEY' => 'disallow_id', ); @@ -985,7 +1009,7 @@ function get_schema_struct() 'forum_parents' => array('MTEXT', ''), 'forum_name' => array('STEXT_UNI', ''), 'forum_desc' => array('TEXT_UNI', ''), - 'forum_desc_bitfield' => array('VCHAR:252', ''), + 'forum_desc_bitfield' => array('VCHAR:255', ''), 'forum_desc_options' => array('UINT:11', 7), 'forum_desc_uid' => array('VCHAR:5', ''), 'forum_link' => array('VCHAR_UNI', ''), @@ -994,7 +1018,7 @@ function get_schema_struct() 'forum_image' => array('VCHAR', ''), 'forum_rules' => array('TEXT_UNI', ''), 'forum_rules_link' => array('VCHAR_UNI', ''), - 'forum_rules_bitfield' => array('VCHAR:252', ''), + 'forum_rules_bitfield' => array('VCHAR:255', ''), 'forum_rules_options' => array('UINT:11', 7), 'forum_rules_uid' => array('VCHAR:5', ''), 'forum_topics_per_page' => array('TINT:4', 0), @@ -1063,7 +1087,7 @@ function get_schema_struct() 'group_type' => array('TINT:4', 1), 'group_name' => array('VCHAR_CI', ''), 'group_desc' => array('TEXT_UNI', ''), - 'group_desc_bitfield' => array('VCHAR:252', ''), + 'group_desc_bitfield' => array('VCHAR:255', ''), 'group_desc_options' => array('UINT:11', 7), 'group_desc_uid' => array('VCHAR:5', ''), 'group_display' => array('BOOL', 0), @@ -1141,7 +1165,7 @@ function get_schema_struct() 'COLUMNS' => array( 'forum_id' => array('UINT', 0), 'user_id' => array('UINT', 0), - 'username' => array('VCHAR_UNI:252', ''), + 'username' => array('VCHAR_UNI:255', ''), 'group_id' => array('UINT', 0), 'group_name' => array('VCHAR_UNI', ''), 'display_on_index' => array('BOOL', 1), @@ -1216,12 +1240,12 @@ function get_schema_struct() 'enable_smilies' => array('BOOL', 1), 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), - 'post_username' => array('VCHAR_UNI:252', ''), + 'post_username' => array('VCHAR_UNI:255', ''), 'post_subject' => array('XSTEXT_UNI', ''), 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), 'post_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:252', ''), + 'bbcode_bitfield' => array('VCHAR:255', ''), 'bbcode_uid' => array('VCHAR:5', ''), 'post_postcount' => array('BOOL', 1), 'post_edit_time' => array('TIMESTAMP', 0), @@ -1258,7 +1282,7 @@ function get_schema_struct() 'message_edit_reason' => array('STEXT_UNI', ''), 'message_edit_user' => array('UINT', 0), 'message_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:252', ''), + 'bbcode_bitfield' => array('VCHAR:255', ''), 'bbcode_uid' => array('VCHAR:5', ''), 'message_edit_time' => array('TIMESTAMP', 0), 'message_edit_count' => array('USINT', 0), @@ -1513,7 +1537,7 @@ function get_schema_struct() $schema_data['phpbb_styles'] = array( 'COLUMNS' => array( 'style_id' => array('TINT:4', NULL, 'auto_increment'), - 'style_name' => array('VCHAR_UNI:252', ''), + 'style_name' => array('VCHAR_UNI:255', ''), 'style_copyright' => array('VCHAR_UNI', ''), 'style_active' => array('BOOL', 1), 'template_id' => array('TINT:4', 0), @@ -1532,10 +1556,10 @@ function get_schema_struct() $schema_data['phpbb_styles_template'] = array( 'COLUMNS' => array( 'template_id' => array('TINT:4', NULL, 'auto_increment'), - 'template_name' => array('VCHAR_UNI:252', ''), + 'template_name' => array('VCHAR_UNI:255', ''), 'template_copyright' => array('VCHAR_UNI', ''), 'template_path' => array('VCHAR:100', ''), - 'bbcode_bitfield' => array('VCHAR:252', 'kNg='), + 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), 'template_storedb' => array('BOOL', 0), ), 'PRIMARY_KEY' => 'template_id', @@ -1561,7 +1585,7 @@ function get_schema_struct() $schema_data['phpbb_styles_theme'] = array( 'COLUMNS' => array( 'theme_id' => array('TINT:4', NULL, 'auto_increment'), - 'theme_name' => array('VCHAR_UNI:252', ''), + 'theme_name' => array('VCHAR_UNI:255', ''), 'theme_copyright' => array('VCHAR_UNI', ''), 'theme_path' => array('VCHAR:100', ''), 'theme_storedb' => array('BOOL', 0), @@ -1577,7 +1601,7 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset'] = array( 'COLUMNS' => array( 'imageset_id' => array('TINT:4', NULL, 'auto_increment'), - 'imageset_name' => array('VCHAR_UNI:252', ''), + 'imageset_name' => array('VCHAR_UNI:255', ''), 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), @@ -1853,7 +1877,7 @@ function get_schema_struct() 'user_avatar_height' => array('USINT', 0), 'user_sig' => array('MTEXT_UNI', ''), 'user_sig_bbcode_uid' => array('VCHAR:5', ''), - 'user_sig_bbcode_bitfield' => array('VCHAR:252', ''), + 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), 'user_from' => array('VCHAR_UNI:100', ''), 'user_icq' => array('VCHAR:15', ''), 'user_aim' => array('VCHAR_UNI', ''), @@ -1967,7 +1991,7 @@ EOF; /* Domain definition */ -CREATE DOMAIN varchar_ci AS varchar(252) NOT NULL DEFAULT ''::character varying; +CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; /* Operation Functions @@ -2039,27 +2063,6 @@ CREATE OPERATOR =( MERGES, SORT1= <); -EOF; - break; - - case 'firebird': - return <<sql_numrows($query_id); } +/* + $num_rows = 0; + while ($this->sql_fetchrow($query_id)) + { + $num_rows++; + } + + // leave the query_id alone, it never hurt anybody + $query_id = $this->sql_query($this->last_query_text); + + return $num_rows; +*/ return false; } diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index 09437a1780..30ccb77e91 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -120,6 +120,9 @@ class dbal_mssql_odbc extends dbal $this->sql_report('start', $query); } + // For now, MSSQL has no real UTF-8 support + $query = utf8_decode($query); + $this->last_query_text = $query; $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; $this->sql_add_num_queries($this->query_result); diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index e241c1e83e..825b92cae1 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1046,21 +1046,8 @@ function display_user_activity(&$userdata) WHERE poster_id = ' . $userdata['user_id'] . " AND post_postcount = 1 $forum_sql - GROUP BY forum_id"; - - // Firebird does not support ORDER BY on aliased columns - // MySQL does not support ORDER BY on functions - switch (SQL_LAYER) - { - case 'firebird': - $sql .= ' ORDER BY COUNT(post_id) DESC'; - break; - - default: - $sql .= ' ORDER BY num_posts DESC'; - break; - } - + GROUP BY forum_id + ORDER BY num_posts DESC"; $result = $db->sql_query_limit($sql, 1); $active_f_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -1081,21 +1068,8 @@ function display_user_activity(&$userdata) WHERE poster_id = ' . $userdata['user_id'] . " AND post_postcount = 1 $forum_sql - GROUP BY topic_id"; - - // Firebird does not support ORDER BY on aliased columns - // MySQL does not support ORDER BY on functions - switch (SQL_LAYER) - { - case 'firebird': - $sql .= ' ORDER BY COUNT(post_id) DESC'; - break; - - default: - $sql .= ' ORDER BY num_posts DESC'; - break; - } - + GROUP BY topic_id + ORDER BY num_posts DESC"; $result = $db->sql_query_limit($sql, 1); $active_t_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 4e931d2d9c..10f7ad5811 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -280,26 +280,11 @@ function mcp_post_details($id, $mode, $action) // but the extra size is only valuable if there are persons having more than a thousands posts. // This is better left to the really really big forums. - // Firebird does not support ORDER BY on aliased columns - // MySQL does not support ORDER BY on functions - switch (SQL_LAYER) - { - case 'firebird': - $sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings - FROM ' . POSTS_TABLE . ' - WHERE poster_id = ' . $post_info['poster_id'] . ' - GROUP BY poster_ip - ORDER BY COUNT(poster_ip) DESC'; - break; - - default: - $sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings - FROM ' . POSTS_TABLE . ' - WHERE poster_id = ' . $post_info['poster_id'] . ' - GROUP BY poster_ip - ORDER BY postings DESC'; - break; - } + $sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings + FROM ' . POSTS_TABLE . ' + WHERE poster_id = ' . $post_info['poster_id'] . ' + GROUP BY poster_ip + ORDER BY postings DESC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index f6b3302dc1..cad82aaf8c 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1089,7 +1089,7 @@ class parse_message extends bbcode_firstpass case 'firebird': $sql = 'SELECT * FROM ' . SMILIES_TABLE . ' - ORDER BY STRLEN(code) DESC'; + ORDER BY CHAR_LENGTH(code) DESC'; break; // LENGTH supported by MySQL, IBM DB2, Oracle and Access for sure... diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 1dcb599718..5be5c46540 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -953,11 +953,11 @@ class fulltext_native extends search_backend while (isset($word[0])) { - if (isset($word[252]) + if (isset($word[255]) || !isset($word[$isset_min])) { /** - * Words longer than 252 bytes are ignored. This will have to be + * Words longer than 255 bytes are ignored. This will have to be * changed whenever we change the length of search_wordlist.word_text * * Words shorter than $isset_min bytes are ignored, too @@ -1570,7 +1570,7 @@ class fulltext_native extends search_backend // These are fields required in the config table return array( 'tpl' => $tpl, - 'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:252', 'fulltext_native_max_chars' => 'integer:0:255') + 'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255') ); } } diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 739b939f31..a906cc6ffb 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -127,6 +127,9 @@ if (extension_loaded('mbstring')) /** * UTF-8 aware alternative to strrpos * Find position of last occurrence of a char in a string + * + * Notes: + * - offset for mb_strrpos was added in 5.2.0, we emulate if it is lower * * @author Harry Fuecks * @param string haystack @@ -134,10 +137,9 @@ if (extension_loaded('mbstring')) * @param integer (optional) offset (from left) * @return mixed integer position or FALSE on failure */ - function utf8_strrpos($str, $needle, $offset = null) + if (version_compare(phpversion(), '5.2.0', '>=')) { - // offset for mb_strrpos was added in 5.2.0 - if ($offset === false || version_compare(phpversion(), '5.2.0', '>=')) + function utf8_strrpos($str, $needle, $offset = null) { // Emulate behaviour of strrpos rather than raising warning if (empty($str)) @@ -147,22 +149,39 @@ if (extension_loaded('mbstring')) return mb_strrpos($str, $search); } - else + } + else + { + function utf8_strrpos($str, $needle, $offset = null) { - if (!is_int($offset)) + // offset for mb_strrpos was added in 5.2.0 + if ($offset === false) { - trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_WARNING); + // Emulate behaviour of strrpos rather than raising warning + if (empty($str)) + { + return false; + } + + return mb_strrpos($str, $search); + } + else + { + if (!is_int($offset)) + { + trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_WARNING); + return false; + } + + $str = mb_substr($str, $offset); + + if (false !== ($pos = mb_strrpos($str, $search))) + { + return $pos + $offset; + } + return false; } - - $str = mb_substr($str, $offset); - - if (false !== ($pos = mb_strrpos($str, $search))) - { - return $pos + $offset; - } - - return false; } } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 793780aa6b..fae340805e 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -99,9 +99,9 @@ $dbms_type_map = array( 'VCHAR:' => 'varchar(%d)', 'CHAR:' => 'char(%d)', 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'text', + 'XSTEXT_UNI'=> 'varchar(100)', 'STEXT' => 'text', - 'STEXT_UNI' => 'text', + 'STEXT_UNI' => 'varchar(255)', 'TEXT' => 'text', 'TEXT_UNI' => 'text', 'MTEXT' => 'mediumtext', @@ -110,7 +110,7 @@ $dbms_type_map = array( 'DECIMAL' => 'decimal(5,2)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(252)', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'varbinary(255)', ), @@ -135,9 +135,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'mediumtext', 'TIMESTAMP' => 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_UNI' => 'varchar(255)', + 'VCHAR_UNI' => 'text', 'VCHAR_UNI:'=> array('varchar(%d)', 'limit' => array('mult', 3, 255, 'text')), - 'VCHAR_CI' => 'varchar(252)', + 'VCHAR_CI' => 'text', 'VARBINARY' => 'varbinary(255)', ), @@ -149,23 +149,23 @@ $dbms_type_map = array( 'TINT:' => 'INTEGER', 'USINT' => 'INTEGER', 'BOOL' => 'INTEGER', - 'VCHAR' => 'VARCHAR(255)', - 'VCHAR:' => 'VARCHAR(%d)', - 'CHAR:' => 'CHAR(%d)', - 'XSTEXT' => 'BLOB SUB_TYPE TEXT', - 'STEXT' => 'BLOB SUB_TYPE TEXT', - 'TEXT' => 'BLOB SUB_TYPE TEXT', - 'MTEXT' => 'BLOB SUB_TYPE TEXT', - 'XSTEXT_UNI'=> 'BLOB SUB_TYPE TEXT', - 'STEXT_UNI' => 'BLOB SUB_TYPE TEXT', - 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT', - 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT', + 'VCHAR' => 'VARCHAR(255) CHARACTER SET NONE', + 'VCHAR:' => 'VARCHAR(%d) CHARACTER SET NONE', + 'CHAR:' => 'CHAR(%d) CHARACTER SET NONE', + 'XSTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'STEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'TEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'MTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', + 'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8', + 'STEXT_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', + 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', 'TIMESTAMP' => 'INTEGER', 'DECIMAL' => 'DOUBLE PRECISION', - 'VCHAR_UNI' => 'VARCHAR(84) CHARACTER SET UNICODE_FSS', - 'VCHAR_UNI:'=> array('VARCHAR(%d) CHARACTER SET UNICODE_FSS', 'rule' => array('div', 3)), - 'VCHAR_CI' => 'VARCHAR(84) CHARACTER SET UNICODE_FSS', - 'VARBINARY' => 'CHAR(255)', + 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', + 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', + 'VARBINARY' => 'CHAR(255) CHARACTER SET NONE', ), 'mssql' => array( @@ -183,16 +183,16 @@ $dbms_type_map = array( 'STEXT' => '[varchar] (3000)', 'TEXT' => '[varchar] (8000)', 'MTEXT' => '[text]', - 'XSTEXT_UNI'=> '[nvarchar] (1000)', - 'STEXT_UNI' => '[nvarchar] (3000)', - 'TEXT_UNI' => '[nvarchar] (8000)', - 'MTEXT_UNI' => '[ntext]', + 'XSTEXT_UNI'=> '[varchar] (100)', + 'STEXT_UNI' => '[varchar] (255)', + 'TEXT_UNI' => '[varchar] (4000)', + 'MTEXT_UNI' => '[text]', 'TIMESTAMP' => '[int]', 'DECIMAL' => '[float]', - 'VCHAR_UNI' => '[nvarchar] (255)', - 'VCHAR_UNI:'=> '[nvarchar] (%d)', - 'VCHAR_CI' => '[nvarchar] (252)', - 'VARBINARY' => '[varbinary] (255)', + 'VCHAR_UNI' => '[varchar] (255)', + 'VCHAR_UNI:'=> '[varchar] (%d)', + 'VCHAR_CI' => '[varchar] (255)', + 'VARBINARY' => '[varchar] (255)', ), 'oracle' => array( @@ -210,15 +210,15 @@ $dbms_type_map = array( 'STEXT' => 'varchar2(3000)', 'TEXT' => 'clob', 'MTEXT' => 'clob', - 'XSTEXT_UNI'=> 'varchar2(1000)', - 'STEXT_UNI' => 'varchar2(3000)', + 'XSTEXT_UNI'=> 'varchar2(300)', + 'STEXT_UNI' => 'varchar2(765)', 'TEXT_UNI' => 'clob', 'MTEXT_UNI' => 'clob', 'TIMESTAMP' => 'number(11)', 'DECIMAL' => 'number(5, 2)', - 'VCHAR_UNI' => 'varchar2(255)', - 'VCHAR_UNI:'=> 'varchar2(%d)', - 'VCHAR_CI' => 'varchar2(252)', + 'VCHAR_UNI' => 'varchar2(765)', + 'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')), + 'VCHAR_CI' => 'varchar2(255)', 'VARBINARY' => 'raw(255)', ), @@ -245,7 +245,7 @@ $dbms_type_map = array( 'DECIMAL' => 'decimal(5,2)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(252)', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'blob', ), @@ -264,9 +264,9 @@ $dbms_type_map = array( 'STEXT' => 'varchar(3000)', 'TEXT' => 'varchar(8000)', 'MTEXT' => 'TEXT', - 'XSTEXT_UNI'=> 'varchar(1000)', - 'STEXT_UNI' => 'varchar(3000)', - 'TEXT_UNI' => 'varchar(8000)', + 'XSTEXT_UNI'=> 'varchar(100)', + 'STEXT_UNI' => 'varchar(255)', + 'TEXT_UNI' => 'varchar(4000)', 'MTEXT_UNI' => 'TEXT', 'TIMESTAMP' => 'INT4', // unsigned 'DECIMAL' => 'decimal(5,2)', @@ -693,7 +693,15 @@ function prepare_column_data($dbms, $column_data) $sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' '; } - $sql .= "NOT NULL"; + $sql .= 'NOT NULL'; + + // This is a UNICODE column and thus should be given it's fair share + if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0])) + { + $sql .= ' COLLATE UNICODE'; + } + + $sql .= ",\n"; break; case 'mssql': diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 74b8b52fc6..c3804c8cd1 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1760,7 +1760,6 @@ class install_install extends module { $error[] = $lang['INST_ERR_DB_NO_MYSQL4']; } - break; case 'mysqli': @@ -1769,6 +1768,18 @@ class install_install extends module $error[] = $lang['INST_ERR_DB_NO_MYSQLI']; } break; + + case 'firebird': + if ($db->service_handle !== false && function_exists('ibase_server_info')) + { + $val = @ibase_server_info($db->service_handle, IBASE_SVC_SERVER_VERSION); + preg_match('#V([\d.]+)#', $val, $match); + if ($match[1] < 2) + { + $error[] = $lang['INST_ERR_DB_NO_FIREBIRD']; + } + } + break; case 'oracle': $sql = "SELECT * diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 0237ea838f..bf6497df2f 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -5,21 +5,6 @@ # -# Emulation of STRLEN, might need to be checked out for FB 2.0 -DECLARE EXTERNAL FUNCTION STRLEN CSTRING(32767) -RETURNS INTEGER BY VALUE -ENTRY_POINT 'IB_UDF_strlen' MODULE_NAME 'ib_udf';; - -# Emulation of LOWER, might need to be checked out for FB 2.0 -DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) -RETURNS CSTRING(80) FREE_IT -ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf';; - -# Only used for insertion of binary strings as defaults -DECLARE EXTERNAL FUNCTION ASCII_CHAR INTEGER -RETURNS CSTRING(1) FREE_IT -ENTRY_POINT 'IB_UDF_ascii_char' MODULE_NAME 'ib_udf';; - # Table: 'phpbb_attachments' CREATE TABLE phpbb_attachments ( attach_id INTEGER NOT NULL, @@ -28,12 +13,12 @@ CREATE TABLE phpbb_attachments ( in_message INTEGER DEFAULT 0 NOT NULL, poster_id INTEGER DEFAULT 0 NOT NULL, is_orphan INTEGER DEFAULT 1 NOT NULL, - physical_filename VARCHAR(255) DEFAULT '' NOT NULL, - real_filename VARCHAR(255) DEFAULT '' NOT NULL, + physical_filename VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + real_filename VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, download_count INTEGER DEFAULT 0 NOT NULL, - attach_comment BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - extension VARCHAR(100) DEFAULT '' NOT NULL, - mimetype VARCHAR(100) DEFAULT '' NOT NULL, + attach_comment BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + extension VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, + mimetype VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, filesize INTEGER DEFAULT 0 NOT NULL, filetime INTEGER DEFAULT 0 NOT NULL, thumbnail INTEGER DEFAULT 0 NOT NULL @@ -73,7 +58,7 @@ CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups(auth_option_id);; # Table: 'phpbb_acl_options' CREATE TABLE phpbb_acl_options ( auth_option_id INTEGER NOT NULL, - auth_option VARCHAR(50) DEFAULT '' NOT NULL, + auth_option VARCHAR(50) CHARACTER SET NONE DEFAULT '' NOT NULL, is_global INTEGER DEFAULT 0 NOT NULL, is_local INTEGER DEFAULT 0 NOT NULL, founder_only INTEGER DEFAULT 0 NOT NULL @@ -97,9 +82,9 @@ END;; # Table: 'phpbb_acl_roles' CREATE TABLE phpbb_acl_roles ( role_id INTEGER NOT NULL, - role_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - role_description BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - role_type VARCHAR(10) DEFAULT '' NOT NULL, + role_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + role_description BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + role_type VARCHAR(10) CHARACTER SET NONE DEFAULT '' NOT NULL, role_order INTEGER DEFAULT 0 NOT NULL );; @@ -145,13 +130,13 @@ CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users(auth_option_id);; CREATE TABLE phpbb_banlist ( ban_id INTEGER NOT NULL, ban_userid INTEGER DEFAULT 0 NOT NULL, - ban_ip VARCHAR(40) DEFAULT '' NOT NULL, - ban_email VARCHAR(34) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + ban_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, + ban_email VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, ban_start INTEGER DEFAULT 0 NOT NULL, ban_end INTEGER DEFAULT 0 NOT NULL, ban_exclude INTEGER DEFAULT 0 NOT NULL, - ban_reason BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - ban_give_reason BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + ban_reason BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, + ban_give_reason BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_banlist ADD PRIMARY KEY (ban_id);; @@ -175,15 +160,15 @@ END;; # Table: 'phpbb_bbcodes' CREATE TABLE phpbb_bbcodes ( bbcode_id INTEGER DEFAULT 0 NOT NULL, - bbcode_tag VARCHAR(16) DEFAULT '' NOT NULL, - bbcode_helpline VARCHAR(255) DEFAULT '' NOT NULL, + bbcode_tag VARCHAR(16) CHARACTER SET NONE DEFAULT '' NOT NULL, + bbcode_helpline VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, display_on_posting INTEGER DEFAULT 0 NOT NULL, - bbcode_match BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - bbcode_tpl BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - first_pass_match BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - first_pass_replace BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - second_pass_match BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - second_pass_replace BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + bbcode_match BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + bbcode_tpl BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + first_pass_match BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + first_pass_replace BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + second_pass_match BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + second_pass_replace BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_bbcodes ADD PRIMARY KEY (bbcode_id);; @@ -204,10 +189,10 @@ CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks(topic_id, user_id) CREATE TABLE phpbb_bots ( bot_id INTEGER NOT NULL, bot_active INTEGER DEFAULT 1 NOT NULL, - bot_name BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + bot_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, user_id INTEGER DEFAULT 0 NOT NULL, - bot_agent VARCHAR(255) DEFAULT '' NOT NULL, - bot_ip VARCHAR(255) DEFAULT '' NOT NULL + bot_agent VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + bot_ip VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_bots ADD PRIMARY KEY (bot_id);; @@ -227,8 +212,8 @@ END;; # Table: 'phpbb_config' CREATE TABLE phpbb_config ( - config_name VARCHAR(252) DEFAULT '' NOT NULL, - config_value VARCHAR(255) DEFAULT '' NOT NULL, + config_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + config_value VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, is_dynamic INTEGER DEFAULT 0 NOT NULL );; @@ -238,10 +223,10 @@ CREATE INDEX phpbb_config_is_dynamic ON phpbb_config(is_dynamic);; # Table: 'phpbb_confirm' CREATE TABLE phpbb_confirm ( - confirm_id CHAR(32) DEFAULT '' NOT NULL, - session_id CHAR(32) DEFAULT '' NOT NULL, + confirm_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, + session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, confirm_type INTEGER DEFAULT 0 NOT NULL, - code VARCHAR(8) DEFAULT '' NOT NULL + code VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_confirm ADD PRIMARY KEY (session_id, confirm_id);; @@ -251,7 +236,7 @@ CREATE INDEX phpbb_confirm_confirm_type ON phpbb_confirm(confirm_type);; # Table: 'phpbb_disallow' CREATE TABLE phpbb_disallow ( disallow_id INTEGER NOT NULL, - disallow_username VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + disallow_username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_disallow ADD PRIMARY KEY (disallow_id);; @@ -275,8 +260,8 @@ CREATE TABLE phpbb_drafts ( topic_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL, save_time INTEGER DEFAULT 0 NOT NULL, - draft_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - draft_message BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + draft_subject VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + draft_message BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_drafts ADD PRIMARY KEY (draft_id);; @@ -298,7 +283,7 @@ END;; CREATE TABLE phpbb_extensions ( extension_id INTEGER NOT NULL, group_id INTEGER DEFAULT 0 NOT NULL, - extension VARCHAR(100) DEFAULT '' NOT NULL + extension VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_extensions ADD PRIMARY KEY (extension_id);; @@ -318,13 +303,13 @@ END;; # Table: 'phpbb_extension_groups' CREATE TABLE phpbb_extension_groups ( group_id INTEGER NOT NULL, - group_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, cat_id INTEGER DEFAULT 0 NOT NULL, allow_group INTEGER DEFAULT 0 NOT NULL, download_mode INTEGER DEFAULT 1 NOT NULL, - upload_icon VARCHAR(255) DEFAULT '' NOT NULL, + upload_icon VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, max_filesize INTEGER DEFAULT 0 NOT NULL, - allowed_forums BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + allowed_forums BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, allow_in_pm INTEGER DEFAULT 0 NOT NULL );; @@ -348,21 +333,21 @@ CREATE TABLE phpbb_forums ( parent_id INTEGER DEFAULT 0 NOT NULL, left_id INTEGER DEFAULT 0 NOT NULL, right_id INTEGER DEFAULT 0 NOT NULL, - forum_parents BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - forum_name BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - forum_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - forum_desc_bitfield VARCHAR(252) DEFAULT '' NOT NULL, + forum_parents BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + forum_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + forum_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_desc_options INTEGER DEFAULT 7 NOT NULL, - forum_desc_uid VARCHAR(5) DEFAULT '' NOT NULL, - forum_link VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - forum_password VARCHAR(14) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + forum_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_style INTEGER DEFAULT 0 NOT NULL, - forum_image VARCHAR(255) DEFAULT '' NOT NULL, - forum_rules BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - forum_rules_link VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - forum_rules_bitfield VARCHAR(252) DEFAULT '' NOT NULL, + forum_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_rules BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + forum_rules_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + forum_rules_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_rules_options INTEGER DEFAULT 7 NOT NULL, - forum_rules_uid VARCHAR(5) DEFAULT '' NOT NULL, + forum_rules_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_topics_per_page INTEGER DEFAULT 0 NOT NULL, forum_type INTEGER DEFAULT 0 NOT NULL, forum_status INTEGER DEFAULT 0 NOT NULL, @@ -371,10 +356,10 @@ CREATE TABLE phpbb_forums ( forum_topics_real INTEGER DEFAULT 0 NOT NULL, forum_last_post_id INTEGER DEFAULT 0 NOT NULL, forum_last_poster_id INTEGER DEFAULT 0 NOT NULL, - forum_last_post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + forum_last_post_subject VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_last_post_time INTEGER DEFAULT 0 NOT NULL, - forum_last_poster_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - forum_last_poster_colour VARCHAR(6) DEFAULT '' NOT NULL, + forum_last_poster_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + forum_last_poster_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_flags INTEGER DEFAULT 32 NOT NULL, display_on_index INTEGER DEFAULT 1 NOT NULL, enable_indexing INTEGER DEFAULT 1 NOT NULL, @@ -406,7 +391,7 @@ END;; CREATE TABLE phpbb_forums_access ( forum_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL, - session_id CHAR(32) DEFAULT '' NOT NULL + session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_forums_access ADD PRIMARY KEY (forum_id, user_id, session_id);; @@ -437,18 +422,18 @@ CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch(notify_status) CREATE TABLE phpbb_groups ( group_id INTEGER NOT NULL, group_type INTEGER DEFAULT 1 NOT NULL, - group_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - group_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - group_desc_bitfield VARCHAR(252) DEFAULT '' NOT NULL, + group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, group_desc_options INTEGER DEFAULT 7 NOT NULL, - group_desc_uid VARCHAR(5) DEFAULT '' NOT NULL, + group_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, group_display INTEGER DEFAULT 0 NOT NULL, - group_avatar VARCHAR(255) DEFAULT '' NOT NULL, + group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, group_avatar_type INTEGER DEFAULT 0 NOT NULL, group_avatar_width INTEGER DEFAULT 0 NOT NULL, group_avatar_height INTEGER DEFAULT 0 NOT NULL, group_rank INTEGER DEFAULT 0 NOT NULL, - group_colour VARCHAR(6) DEFAULT '' NOT NULL, + group_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, group_sig_chars INTEGER DEFAULT 0 NOT NULL, group_receive_pm INTEGER DEFAULT 0 NOT NULL, group_message_limit INTEGER DEFAULT 0 NOT NULL, @@ -473,7 +458,7 @@ END;; # Table: 'phpbb_icons' CREATE TABLE phpbb_icons ( icons_id INTEGER NOT NULL, - icons_url VARCHAR(255) DEFAULT '' NOT NULL, + icons_url VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, icons_width INTEGER DEFAULT 0 NOT NULL, icons_height INTEGER DEFAULT 0 NOT NULL, icons_order INTEGER DEFAULT 0 NOT NULL, @@ -498,11 +483,11 @@ END;; # Table: 'phpbb_lang' CREATE TABLE phpbb_lang ( lang_id INTEGER NOT NULL, - lang_iso VARCHAR(30) DEFAULT '' NOT NULL, - lang_dir VARCHAR(30) DEFAULT '' NOT NULL, - lang_english_name VARCHAR(34) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - lang_local_name VARCHAR(85) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - lang_author VARCHAR(85) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + lang_iso VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL, + lang_dir VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL, + lang_english_name VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + lang_local_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + lang_author VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_lang ADD PRIMARY KEY (lang_id);; @@ -528,10 +513,10 @@ CREATE TABLE phpbb_log ( forum_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER DEFAULT 0 NOT NULL, reportee_id INTEGER DEFAULT 0 NOT NULL, - log_ip VARCHAR(40) DEFAULT '' NOT NULL, + log_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, log_time INTEGER DEFAULT 0 NOT NULL, - log_operation BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - log_data BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + log_operation BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + log_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_log ADD PRIMARY KEY (log_id);; @@ -557,9 +542,9 @@ END;; CREATE TABLE phpbb_moderator_cache ( forum_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL, - username VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, group_id INTEGER DEFAULT 0 NOT NULL, - group_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, display_on_index INTEGER DEFAULT 1 NOT NULL );; @@ -571,14 +556,14 @@ CREATE TABLE phpbb_modules ( module_id INTEGER NOT NULL, module_enabled INTEGER DEFAULT 1 NOT NULL, module_display INTEGER DEFAULT 1 NOT NULL, - module_basename VARCHAR(255) DEFAULT '' NOT NULL, - module_class VARCHAR(10) DEFAULT '' NOT NULL, + module_basename VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_class VARCHAR(10) CHARACTER SET NONE DEFAULT '' NOT NULL, parent_id INTEGER DEFAULT 0 NOT NULL, left_id INTEGER DEFAULT 0 NOT NULL, right_id INTEGER DEFAULT 0 NOT NULL, - module_langname VARCHAR(255) DEFAULT '' NOT NULL, - module_mode VARCHAR(255) DEFAULT '' NOT NULL, - module_auth VARCHAR(255) DEFAULT '' NOT NULL + module_langname VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_mode VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_auth VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_modules ADD PRIMARY KEY (module_id);; @@ -602,7 +587,7 @@ END;; CREATE TABLE phpbb_poll_options ( poll_option_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER DEFAULT 0 NOT NULL, - poll_option_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + poll_option_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, poll_option_total INTEGER DEFAULT 0 NOT NULL );; @@ -614,7 +599,7 @@ CREATE TABLE phpbb_poll_votes ( topic_id INTEGER DEFAULT 0 NOT NULL, poll_option_id INTEGER DEFAULT 0 NOT NULL, vote_user_id INTEGER DEFAULT 0 NOT NULL, - vote_user_ip VARCHAR(40) DEFAULT '' NOT NULL + vote_user_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL );; CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes(topic_id);; @@ -628,7 +613,7 @@ CREATE TABLE phpbb_posts ( forum_id INTEGER DEFAULT 0 NOT NULL, poster_id INTEGER DEFAULT 0 NOT NULL, icon_id INTEGER DEFAULT 0 NOT NULL, - poster_ip VARCHAR(40) DEFAULT '' NOT NULL, + poster_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, post_time INTEGER DEFAULT 0 NOT NULL, post_approved INTEGER DEFAULT 1 NOT NULL, post_reported INTEGER DEFAULT 0 NOT NULL, @@ -636,16 +621,16 @@ CREATE TABLE phpbb_posts ( enable_smilies INTEGER DEFAULT 1 NOT NULL, enable_magic_url INTEGER DEFAULT 1 NOT NULL, enable_sig INTEGER DEFAULT 1 NOT NULL, - post_username VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - post_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - post_checksum VARCHAR(32) DEFAULT '' NOT NULL, + post_username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + post_subject VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + post_checksum VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, post_attachment INTEGER DEFAULT 0 NOT NULL, - bbcode_bitfield VARCHAR(252) DEFAULT '' NOT NULL, - bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL, + bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + bbcode_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, post_postcount INTEGER DEFAULT 1 NOT NULL, post_edit_time INTEGER DEFAULT 0 NOT NULL, - post_edit_reason BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + post_edit_reason VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, post_edit_user INTEGER DEFAULT 0 NOT NULL, post_edit_count INTEGER DEFAULT 0 NOT NULL, post_edit_locked INTEGER DEFAULT 0 NOT NULL @@ -658,8 +643,7 @@ CREATE INDEX phpbb_posts_topic_id ON phpbb_posts(topic_id);; CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts(poster_ip);; CREATE INDEX phpbb_posts_poster_id ON phpbb_posts(poster_id);; CREATE INDEX phpbb_posts_post_approved ON phpbb_posts(post_approved);; -CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts(post_postcount);; -CREATE INDEX phpbb_posts_post_time ON phpbb_posts(post_time);; +CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts(topic_id, post_time);; CREATE GENERATOR phpbb_posts_gen;; SET GENERATOR phpbb_posts_gen TO 0;; @@ -678,23 +662,23 @@ CREATE TABLE phpbb_privmsgs ( root_level INTEGER DEFAULT 0 NOT NULL, author_id INTEGER DEFAULT 0 NOT NULL, icon_id INTEGER DEFAULT 0 NOT NULL, - author_ip VARCHAR(40) DEFAULT '' NOT NULL, + author_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, message_time INTEGER DEFAULT 0 NOT NULL, enable_bbcode INTEGER DEFAULT 1 NOT NULL, enable_smilies INTEGER DEFAULT 1 NOT NULL, enable_magic_url INTEGER DEFAULT 1 NOT NULL, enable_sig INTEGER DEFAULT 1 NOT NULL, - message_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - message_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - message_edit_reason BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + message_subject VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + message_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + message_edit_reason VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, message_edit_user INTEGER DEFAULT 0 NOT NULL, message_attachment INTEGER DEFAULT 0 NOT NULL, - bbcode_bitfield VARCHAR(252) DEFAULT '' NOT NULL, - bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL, + bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + bbcode_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, message_edit_time INTEGER DEFAULT 0 NOT NULL, message_edit_count INTEGER DEFAULT 0 NOT NULL, - to_address BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - bcc_address BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + to_address BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + bcc_address BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_privmsgs ADD PRIMARY KEY (msg_id);; @@ -719,7 +703,7 @@ END;; CREATE TABLE phpbb_privmsgs_folder ( folder_id INTEGER NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL, - folder_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + folder_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, pm_count INTEGER DEFAULT 0 NOT NULL );; @@ -744,7 +728,7 @@ CREATE TABLE phpbb_privmsgs_rules ( user_id INTEGER DEFAULT 0 NOT NULL, rule_check INTEGER DEFAULT 0 NOT NULL, rule_connection INTEGER DEFAULT 0 NOT NULL, - rule_string VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + rule_string VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, rule_user_id INTEGER DEFAULT 0 NOT NULL, rule_group_id INTEGER DEFAULT 0 NOT NULL, rule_action INTEGER DEFAULT 0 NOT NULL, @@ -787,15 +771,15 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to(user_id, folder # Table: 'phpbb_profile_fields' CREATE TABLE phpbb_profile_fields ( field_id INTEGER NOT NULL, - field_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + field_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, field_type INTEGER DEFAULT 0 NOT NULL, - field_ident VARCHAR(20) DEFAULT '' NOT NULL, - field_length VARCHAR(20) DEFAULT '' NOT NULL, - field_minlen VARCHAR(255) DEFAULT '' NOT NULL, - field_maxlen VARCHAR(255) DEFAULT '' NOT NULL, - field_novalue VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - field_default_value VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - field_validation VARCHAR(7) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + field_ident VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, + field_length VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, + field_minlen VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + field_maxlen VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + field_novalue VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + field_default_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, field_required INTEGER DEFAULT 0 NOT NULL, field_show_on_reg INTEGER DEFAULT 0 NOT NULL, field_hide INTEGER DEFAULT 0 NOT NULL, @@ -834,7 +818,7 @@ CREATE TABLE phpbb_profile_fields_lang ( lang_id INTEGER DEFAULT 0 NOT NULL, option_id INTEGER DEFAULT 0 NOT NULL, field_type INTEGER DEFAULT 0 NOT NULL, - lang_value VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + lang_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_profile_fields_lang ADD PRIMARY KEY (field_id, lang_id, option_id);; @@ -844,9 +828,9 @@ ALTER TABLE phpbb_profile_fields_lang ADD PRIMARY KEY (field_id, lang_id, option CREATE TABLE phpbb_profile_lang ( field_id INTEGER DEFAULT 0 NOT NULL, lang_id INTEGER DEFAULT 0 NOT NULL, - lang_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - lang_explain BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - lang_default_value VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + lang_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + lang_explain BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + lang_default_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_profile_lang ADD PRIMARY KEY (field_id, lang_id);; @@ -855,10 +839,10 @@ ALTER TABLE phpbb_profile_lang ADD PRIMARY KEY (field_id, lang_id);; # Table: 'phpbb_ranks' CREATE TABLE phpbb_ranks ( rank_id INTEGER NOT NULL, - rank_title VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + rank_title VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, rank_min INTEGER DEFAULT 0 NOT NULL, rank_special INTEGER DEFAULT 0 NOT NULL, - rank_image VARCHAR(255) DEFAULT '' NOT NULL + rank_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_ranks ADD PRIMARY KEY (rank_id);; @@ -884,7 +868,7 @@ CREATE TABLE phpbb_reports ( user_notify INTEGER DEFAULT 0 NOT NULL, report_closed INTEGER DEFAULT 0 NOT NULL, report_time INTEGER DEFAULT 0 NOT NULL, - report_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);; @@ -904,8 +888,8 @@ END;; # Table: 'phpbb_reports_reasons' CREATE TABLE phpbb_reports_reasons ( reason_id INTEGER NOT NULL, - reason_title VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - reason_description BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + reason_title VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + reason_description BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, reason_order INTEGER DEFAULT 0 NOT NULL );; @@ -925,10 +909,10 @@ END;; # Table: 'phpbb_search_results' CREATE TABLE phpbb_search_results ( - search_key VARCHAR(32) DEFAULT '' NOT NULL, + search_key VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, search_time INTEGER DEFAULT 0 NOT NULL, - search_keywords BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - search_authors BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + search_keywords BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + search_authors BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_search_results ADD PRIMARY KEY (search_key);; @@ -937,7 +921,7 @@ ALTER TABLE phpbb_search_results ADD PRIMARY KEY (search_key);; # Table: 'phpbb_search_wordlist' CREATE TABLE phpbb_search_wordlist ( word_id INTEGER NOT NULL, - word_text VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + word_text VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, word_common INTEGER DEFAULT 0 NOT NULL );; @@ -968,14 +952,14 @@ CREATE INDEX phpbb_search_wordmatch_post_id ON phpbb_search_wordmatch(post_id);; # Table: 'phpbb_sessions' CREATE TABLE phpbb_sessions ( - session_id CHAR(32) DEFAULT '' NOT NULL, + session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, session_user_id INTEGER DEFAULT 0 NOT NULL, session_last_visit INTEGER DEFAULT 0 NOT NULL, session_start INTEGER DEFAULT 0 NOT NULL, session_time INTEGER DEFAULT 0 NOT NULL, - session_ip VARCHAR(40) DEFAULT '' NOT NULL, - session_browser VARCHAR(150) DEFAULT '' NOT NULL, - session_page VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + session_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, + session_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL, + session_page VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, session_viewonline INTEGER DEFAULT 1 NOT NULL, session_autologin INTEGER DEFAULT 0 NOT NULL, session_admin INTEGER DEFAULT 0 NOT NULL @@ -988,9 +972,9 @@ CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions(session_user_id);; # Table: 'phpbb_sessions_keys' CREATE TABLE phpbb_sessions_keys ( - key_id CHAR(32) DEFAULT '' NOT NULL, + key_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL, - last_ip VARCHAR(40) DEFAULT '' NOT NULL, + last_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, last_login INTEGER DEFAULT 0 NOT NULL );; @@ -1001,8 +985,8 @@ CREATE INDEX phpbb_sessions_keys_last_login ON phpbb_sessions_keys(last_login);; # Table: 'phpbb_sitelist' CREATE TABLE phpbb_sitelist ( site_id INTEGER NOT NULL, - site_ip VARCHAR(40) DEFAULT '' NOT NULL, - site_hostname VARCHAR(255) DEFAULT '' NOT NULL, + site_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, + site_hostname VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, ip_exclude INTEGER DEFAULT 0 NOT NULL );; @@ -1023,9 +1007,9 @@ END;; # Table: 'phpbb_smilies' CREATE TABLE phpbb_smilies ( smiley_id INTEGER NOT NULL, - code VARCHAR(17) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - emotion VARCHAR(17) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - smiley_url VARCHAR(50) DEFAULT '' NOT NULL, + code VARCHAR(50) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + emotion VARCHAR(50) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + smiley_url VARCHAR(50) CHARACTER SET NONE DEFAULT '' NOT NULL, smiley_width INTEGER DEFAULT 0 NOT NULL, smiley_height INTEGER DEFAULT 0 NOT NULL, smiley_order INTEGER DEFAULT 0 NOT NULL, @@ -1050,8 +1034,8 @@ END;; # Table: 'phpbb_styles' CREATE TABLE phpbb_styles ( style_id INTEGER NOT NULL, - style_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - style_copyright VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + style_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + style_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, style_active INTEGER DEFAULT 1 NOT NULL, template_id INTEGER DEFAULT 0 NOT NULL, theme_id INTEGER DEFAULT 0 NOT NULL, @@ -1079,10 +1063,10 @@ END;; # Table: 'phpbb_styles_template' CREATE TABLE phpbb_styles_template ( template_id INTEGER NOT NULL, - template_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - template_copyright VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - template_path VARCHAR(100) DEFAULT '' NOT NULL, - bbcode_bitfield VARCHAR(252) DEFAULT 'kNg=' NOT NULL, + template_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, + bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL, template_storedb INTEGER DEFAULT 0 NOT NULL );; @@ -1104,10 +1088,10 @@ END;; # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( template_id INTEGER NOT NULL, - template_filename VARCHAR(100) DEFAULT '' NOT NULL, - template_included BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + template_filename VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, + template_included BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, template_mtime INTEGER DEFAULT 0 NOT NULL, - template_data BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + template_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data(template_id);; @@ -1127,12 +1111,12 @@ END;; # Table: 'phpbb_styles_theme' CREATE TABLE phpbb_styles_theme ( theme_id INTEGER NOT NULL, - theme_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - theme_copyright VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - theme_path VARCHAR(100) DEFAULT '' NOT NULL, + theme_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + theme_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + theme_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, theme_storedb INTEGER DEFAULT 0 NOT NULL, theme_mtime INTEGER DEFAULT 0 NOT NULL, - theme_data BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL + theme_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_styles_theme ADD PRIMARY KEY (theme_id);; @@ -1153,103 +1137,103 @@ END;; # Table: 'phpbb_styles_imageset' CREATE TABLE phpbb_styles_imageset ( imageset_id INTEGER NOT NULL, - imageset_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - imageset_copyright VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - imageset_path VARCHAR(100) DEFAULT '' NOT NULL, - site_logo VARCHAR(200) DEFAULT '' NOT NULL, - upload_bar VARCHAR(200) DEFAULT '' NOT NULL, - poll_left VARCHAR(200) DEFAULT '' NOT NULL, - poll_center VARCHAR(200) DEFAULT '' NOT NULL, - poll_right VARCHAR(200) DEFAULT '' NOT NULL, - icon_friend VARCHAR(200) DEFAULT '' NOT NULL, - icon_foe VARCHAR(200) DEFAULT '' NOT NULL, - forum_link VARCHAR(200) DEFAULT '' NOT NULL, - forum_read VARCHAR(200) DEFAULT '' NOT NULL, - forum_read_locked VARCHAR(200) DEFAULT '' NOT NULL, - forum_read_subforum VARCHAR(200) DEFAULT '' NOT NULL, - forum_unread VARCHAR(200) DEFAULT '' NOT NULL, - forum_unread_locked VARCHAR(200) DEFAULT '' NOT NULL, - forum_unread_subforum VARCHAR(200) DEFAULT '' NOT NULL, - topic_moved VARCHAR(200) DEFAULT '' NOT NULL, - topic_read VARCHAR(200) DEFAULT '' NOT NULL, - topic_read_mine VARCHAR(200) DEFAULT '' NOT NULL, - topic_read_hot VARCHAR(200) DEFAULT '' NOT NULL, - topic_read_hot_mine VARCHAR(200) DEFAULT '' NOT NULL, - topic_read_locked VARCHAR(200) DEFAULT '' NOT NULL, - topic_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread_mine VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread_hot VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread_hot_mine VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread_locked VARCHAR(200) DEFAULT '' NOT NULL, - topic_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - sticky_read VARCHAR(200) DEFAULT '' NOT NULL, - sticky_read_mine VARCHAR(200) DEFAULT '' NOT NULL, - sticky_read_locked VARCHAR(200) DEFAULT '' NOT NULL, - sticky_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - sticky_unread VARCHAR(200) DEFAULT '' NOT NULL, - sticky_unread_mine VARCHAR(200) DEFAULT '' NOT NULL, - sticky_unread_locked VARCHAR(200) DEFAULT '' NOT NULL, - sticky_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - announce_read VARCHAR(200) DEFAULT '' NOT NULL, - announce_read_mine VARCHAR(200) DEFAULT '' NOT NULL, - announce_read_locked VARCHAR(200) DEFAULT '' NOT NULL, - announce_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - announce_unread VARCHAR(200) DEFAULT '' NOT NULL, - announce_unread_mine VARCHAR(200) DEFAULT '' NOT NULL, - announce_unread_locked VARCHAR(200) DEFAULT '' NOT NULL, - announce_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - global_read VARCHAR(200) DEFAULT '' NOT NULL, - global_read_mine VARCHAR(200) DEFAULT '' NOT NULL, - global_read_locked VARCHAR(200) DEFAULT '' NOT NULL, - global_read_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - global_unread VARCHAR(200) DEFAULT '' NOT NULL, - global_unread_mine VARCHAR(200) DEFAULT '' NOT NULL, - global_unread_locked VARCHAR(200) DEFAULT '' NOT NULL, - global_unread_locked_mine VARCHAR(200) DEFAULT '' NOT NULL, - pm_read VARCHAR(200) DEFAULT '' NOT NULL, - pm_unread VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_aim VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_email VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_icq VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_jabber VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_msnm VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_pm VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_yahoo VARCHAR(200) DEFAULT '' NOT NULL, - icon_contact_www VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_delete VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_edit VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_info VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_quote VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_report VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_target VARCHAR(200) DEFAULT '' NOT NULL, - icon_post_target_unread VARCHAR(200) DEFAULT '' NOT NULL, - icon_topic_attach VARCHAR(200) DEFAULT '' NOT NULL, - icon_topic_latest VARCHAR(200) DEFAULT '' NOT NULL, - icon_topic_newest VARCHAR(200) DEFAULT '' NOT NULL, - icon_topic_reported VARCHAR(200) DEFAULT '' NOT NULL, - icon_topic_unapproved VARCHAR(200) DEFAULT '' NOT NULL, - icon_user_online VARCHAR(200) DEFAULT '' NOT NULL, - icon_user_offline VARCHAR(200) DEFAULT '' NOT NULL, - icon_user_profile VARCHAR(200) DEFAULT '' NOT NULL, - icon_user_search VARCHAR(200) DEFAULT '' NOT NULL, - icon_user_warn VARCHAR(200) DEFAULT '' NOT NULL, - button_pm_forward VARCHAR(200) DEFAULT '' NOT NULL, - button_pm_new VARCHAR(200) DEFAULT '' NOT NULL, - button_pm_reply VARCHAR(200) DEFAULT '' NOT NULL, - button_topic_locked VARCHAR(200) DEFAULT '' NOT NULL, - button_topic_new VARCHAR(200) DEFAULT '' NOT NULL, - button_topic_reply VARCHAR(200) DEFAULT '' NOT NULL, - user_icon1 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon2 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon3 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon4 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon5 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon6 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon7 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon8 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon9 VARCHAR(200) DEFAULT '' NOT NULL, - user_icon10 VARCHAR(200) DEFAULT '' NOT NULL + imageset_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + imageset_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + imageset_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, + site_logo VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + upload_bar VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + poll_left VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + poll_center VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + poll_right VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_friend VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_foe VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_link VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_read_subforum VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_unread_subforum VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_moved VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read_hot VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read_hot_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread_hot VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread_hot_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + sticky_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + announce_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + global_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + pm_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + pm_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_aim VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_email VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_icq VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_jabber VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_msnm VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_pm VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_yahoo VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_contact_www VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_delete VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_edit VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_info VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_quote VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_report VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_target VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_post_target_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_topic_attach VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_topic_latest VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_topic_newest VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_topic_reported VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_topic_unapproved VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_user_online VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_user_offline VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_user_profile VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_user_search VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + icon_user_warn VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_pm_forward VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_pm_new VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_pm_reply VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_topic_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_topic_new VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + button_topic_reply VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon1 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon2 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon3 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon4 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon5 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon6 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon7 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon8 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon9 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_icon10 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_styles_imageset ADD PRIMARY KEY (imageset_id);; @@ -1275,7 +1259,7 @@ CREATE TABLE phpbb_topics ( topic_attachment INTEGER DEFAULT 0 NOT NULL, topic_approved INTEGER DEFAULT 1 NOT NULL, topic_reported INTEGER DEFAULT 0 NOT NULL, - topic_title BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + topic_title VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, topic_poster INTEGER DEFAULT 0 NOT NULL, topic_time INTEGER DEFAULT 0 NOT NULL, topic_time_limit INTEGER DEFAULT 0 NOT NULL, @@ -1285,19 +1269,19 @@ CREATE TABLE phpbb_topics ( topic_status INTEGER DEFAULT 0 NOT NULL, topic_type INTEGER DEFAULT 0 NOT NULL, topic_first_post_id INTEGER DEFAULT 0 NOT NULL, - topic_first_poster_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - topic_first_poster_colour VARCHAR(6) DEFAULT '' NOT NULL, + topic_first_poster_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + topic_first_poster_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, topic_last_post_id INTEGER DEFAULT 0 NOT NULL, topic_last_poster_id INTEGER DEFAULT 0 NOT NULL, - topic_last_poster_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - topic_last_poster_colour VARCHAR(6) DEFAULT '' NOT NULL, - topic_last_post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + topic_last_poster_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + topic_last_poster_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, + topic_last_post_subject VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, topic_last_post_time INTEGER DEFAULT 0 NOT NULL, topic_last_view_time INTEGER DEFAULT 0 NOT NULL, topic_moved_id INTEGER DEFAULT 0 NOT NULL, topic_bumped INTEGER DEFAULT 0 NOT NULL, topic_bumper INTEGER DEFAULT 0 NOT NULL, - poll_title BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + poll_title VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, poll_start INTEGER DEFAULT 0 NOT NULL, poll_length INTEGER DEFAULT 0 NOT NULL, poll_max_options INTEGER DEFAULT 1 NOT NULL, @@ -1310,6 +1294,7 @@ ALTER TABLE phpbb_topics ADD PRIMARY KEY (topic_id);; CREATE INDEX phpbb_topics_forum_id ON phpbb_topics(forum_id);; CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics(forum_id, topic_type);; CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics(topic_last_post_time);; +CREATE INDEX phpbb_topics_topic_approved ON phpbb_topics(topic_approved);; CREATE INDEX phpbb_topics_fid_time_moved ON phpbb_topics(forum_id, topic_last_post_time, topic_moved_id);; CREATE GENERATOR phpbb_topics_gen;; @@ -1373,21 +1358,21 @@ CREATE TABLE phpbb_users ( user_id INTEGER NOT NULL, user_type INTEGER DEFAULT 0 NOT NULL, group_id INTEGER DEFAULT 3 NOT NULL, - user_permissions BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, + user_permissions BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, user_perm_from INTEGER DEFAULT 0 NOT NULL, - user_ip VARCHAR(40) DEFAULT '' NOT NULL, + user_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, user_regdate INTEGER DEFAULT 0 NOT NULL, - username VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_password VARCHAR(14) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, user_passchg INTEGER DEFAULT 0 NOT NULL, - user_email VARCHAR(34) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, + user_email VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, user_email_hash DOUBLE PRECISION DEFAULT 0 NOT NULL, - user_birthday VARCHAR(10) DEFAULT '' NOT NULL, + user_birthday VARCHAR(10) CHARACTER SET NONE DEFAULT '' NOT NULL, user_lastvisit INTEGER DEFAULT 0 NOT NULL, user_lastmark INTEGER DEFAULT 0 NOT NULL, user_lastpost_time INTEGER DEFAULT 0 NOT NULL, - user_lastpage VARCHAR(67) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_last_confirm_key VARCHAR(10) DEFAULT '' NOT NULL, + user_lastpage VARCHAR(200) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_last_confirm_key VARCHAR(10) CHARACTER SET NONE DEFAULT '' NOT NULL, user_last_search INTEGER DEFAULT 0 NOT NULL, user_warnings INTEGER DEFAULT 0 NOT NULL, user_last_warning INTEGER DEFAULT 0 NOT NULL, @@ -1395,13 +1380,13 @@ CREATE TABLE phpbb_users ( user_inactive_reason INTEGER DEFAULT 0 NOT NULL, user_inactive_time INTEGER DEFAULT 0 NOT NULL, user_posts INTEGER DEFAULT 0 NOT NULL, - user_lang VARCHAR(30) DEFAULT '' NOT NULL, + user_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL, user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL, user_dst INTEGER DEFAULT 0 NOT NULL, - user_dateformat VARCHAR(10) CHARACTER SET UNICODE_FSS DEFAULT 'd M Y H:i' NOT NULL, + user_dateformat VARCHAR(30) CHARACTER SET UTF8 DEFAULT 'd M Y H:i' NOT NULL COLLATE UNICODE, user_style INTEGER DEFAULT 0 NOT NULL, user_rank INTEGER DEFAULT 0 NOT NULL, - user_colour VARCHAR(6) DEFAULT '' NOT NULL, + user_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, user_new_privmsg INTEGER DEFAULT 0 NOT NULL, user_unread_privmsg INTEGER DEFAULT 0 NOT NULL, user_last_privmsg INTEGER DEFAULT 0 NOT NULL, @@ -1409,11 +1394,11 @@ CREATE TABLE phpbb_users ( user_full_folder INTEGER DEFAULT -3 NOT NULL, user_emailtime INTEGER DEFAULT 0 NOT NULL, user_topic_show_days INTEGER DEFAULT 0 NOT NULL, - user_topic_sortby_type VARCHAR(1) DEFAULT 't' NOT NULL, - user_topic_sortby_dir VARCHAR(1) DEFAULT 'd' NOT NULL, + user_topic_sortby_type VARCHAR(1) CHARACTER SET NONE DEFAULT 't' NOT NULL, + user_topic_sortby_dir VARCHAR(1) CHARACTER SET NONE DEFAULT 'd' NOT NULL, user_post_show_days INTEGER DEFAULT 0 NOT NULL, - user_post_sortby_type VARCHAR(1) DEFAULT 't' NOT NULL, - user_post_sortby_dir VARCHAR(1) DEFAULT 'a' NOT NULL, + user_post_sortby_type VARCHAR(1) CHARACTER SET NONE DEFAULT 't' NOT NULL, + user_post_sortby_dir VARCHAR(1) CHARACTER SET NONE DEFAULT 'a' NOT NULL, user_notify INTEGER DEFAULT 0 NOT NULL, user_notify_pm INTEGER DEFAULT 1 NOT NULL, user_notify_type INTEGER DEFAULT 0 NOT NULL, @@ -1423,24 +1408,24 @@ CREATE TABLE phpbb_users ( user_allow_viewemail INTEGER DEFAULT 1 NOT NULL, user_allow_massemail INTEGER DEFAULT 1 NOT NULL, user_options INTEGER DEFAULT 893 NOT NULL, - user_avatar VARCHAR(255) DEFAULT '' NOT NULL, + user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, user_avatar_type INTEGER DEFAULT 0 NOT NULL, user_avatar_width INTEGER DEFAULT 0 NOT NULL, user_avatar_height INTEGER DEFAULT 0 NOT NULL, - user_sig BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - user_sig_bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL, - user_sig_bbcode_bitfield VARCHAR(252) DEFAULT '' NOT NULL, - user_from VARCHAR(34) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_icq VARCHAR(15) DEFAULT '' NOT NULL, - user_aim VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_yim VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_msnm VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_jabber VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_website VARCHAR(67) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_occ VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - user_interests BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, - user_actkey VARCHAR(32) DEFAULT '' NOT NULL, - user_newpasswd VARCHAR(11) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + user_sig_bbcode_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_sig_bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_from VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_icq VARCHAR(15) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_aim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_yim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_msnm VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_jabber VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_website VARCHAR(200) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_occ VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, + user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, + user_newpasswd VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);; @@ -1487,8 +1472,8 @@ END;; # Table: 'phpbb_words' CREATE TABLE phpbb_words ( word_id INTEGER NOT NULL, - word VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL, - replacement VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL + word VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + replacement VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; ALTER TABLE phpbb_words ADD PRIMARY KEY (word_id);; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 3e78b80161..2170adca2a 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -21,13 +21,13 @@ CREATE TABLE [phpbb_attachments] ( [physical_filename] [varchar] (255) DEFAULT ('') NOT NULL , [real_filename] [varchar] (255) DEFAULT ('') NOT NULL , [download_count] [int] DEFAULT (0) NOT NULL , - [attach_comment] [text] DEFAULT ('') NOT NULL , + [attach_comment] [varchar] (4000) DEFAULT ('') NOT NULL , [extension] [varchar] (100) DEFAULT ('') NOT NULL , [mimetype] [varchar] (100) DEFAULT ('') NOT NULL , [filesize] [int] DEFAULT (0) NOT NULL , [filetime] [int] DEFAULT (0) NOT NULL , [thumbnail] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_attachments] WITH NOCHECK ADD @@ -101,10 +101,10 @@ GO CREATE TABLE [phpbb_acl_roles] ( [role_id] [int] IDENTITY (1, 1) NOT NULL , [role_name] [varchar] (255) DEFAULT ('') NOT NULL , - [role_description] [text] DEFAULT ('') NOT NULL , + [role_description] [varchar] (4000) DEFAULT ('') NOT NULL , [role_type] [varchar] (10) DEFAULT ('') NOT NULL , [role_order] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD @@ -203,7 +203,7 @@ CREATE TABLE [phpbb_bbcodes] ( [bbcode_tag] [varchar] (16) DEFAULT ('') NOT NULL , [bbcode_helpline] [varchar] (255) DEFAULT ('') NOT NULL , [display_on_posting] [int] DEFAULT (0) NOT NULL , - [bbcode_match] [text] DEFAULT ('') NOT NULL , + [bbcode_match] [varchar] (4000) DEFAULT ('') NOT NULL , [bbcode_tpl] [text] DEFAULT ('') NOT NULL , [first_pass_match] [text] DEFAULT ('') NOT NULL , [first_pass_replace] [text] DEFAULT ('') NOT NULL , @@ -246,11 +246,11 @@ GO CREATE TABLE [phpbb_bots] ( [bot_id] [int] IDENTITY (1, 1) NOT NULL , [bot_active] [int] DEFAULT (1) NOT NULL , - [bot_name] [text] DEFAULT ('') NOT NULL , + [bot_name] [varchar] (255) DEFAULT ('') NOT NULL , [user_id] [int] DEFAULT (0) NOT NULL , [bot_agent] [varchar] (255) DEFAULT ('') NOT NULL , [bot_ip] [varchar] (255) DEFAULT ('') NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_bots] WITH NOCHECK ADD @@ -268,7 +268,7 @@ GO Table: 'phpbb_config' */ CREATE TABLE [phpbb_config] ( - [config_name] [varchar] (252) DEFAULT ('') NOT NULL , + [config_name] [varchar] (255) DEFAULT ('') NOT NULL , [config_value] [varchar] (255) DEFAULT ('') NOT NULL , [is_dynamic] [int] DEFAULT (0) NOT NULL ) ON [PRIMARY] @@ -313,7 +313,7 @@ GO */ CREATE TABLE [phpbb_disallow] ( [disallow_id] [int] IDENTITY (1, 1) NOT NULL , - [disallow_username] [varchar] (252) DEFAULT ('') NOT NULL + [disallow_username] [varchar] (255) DEFAULT ('') NOT NULL ) ON [PRIMARY] GO @@ -334,7 +334,7 @@ CREATE TABLE [phpbb_drafts] ( [topic_id] [int] DEFAULT (0) NOT NULL , [forum_id] [int] DEFAULT (0) NOT NULL , [save_time] [int] DEFAULT (0) NOT NULL , - [draft_subject] [text] DEFAULT ('') NOT NULL , + [draft_subject] [varchar] (100) DEFAULT ('') NOT NULL , [draft_message] [text] DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -401,18 +401,18 @@ CREATE TABLE [phpbb_forums] ( [left_id] [int] DEFAULT (0) NOT NULL , [right_id] [int] DEFAULT (0) NOT NULL , [forum_parents] [text] DEFAULT ('') NOT NULL , - [forum_name] [text] DEFAULT ('') NOT NULL , - [forum_desc] [text] DEFAULT ('') NOT NULL , - [forum_desc_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [forum_name] [varchar] (255) DEFAULT ('') NOT NULL , + [forum_desc] [varchar] (4000) DEFAULT ('') NOT NULL , + [forum_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [forum_desc_options] [int] DEFAULT (7) NOT NULL , [forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , [forum_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_password] [varchar] (40) DEFAULT ('') NOT NULL , [forum_style] [int] DEFAULT (0) NOT NULL , [forum_image] [varchar] (255) DEFAULT ('') NOT NULL , - [forum_rules] [text] DEFAULT ('') NOT NULL , + [forum_rules] [varchar] (4000) DEFAULT ('') NOT NULL , [forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL , - [forum_rules_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [forum_rules_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [forum_rules_options] [int] DEFAULT (7) NOT NULL , [forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL , [forum_topics_per_page] [int] DEFAULT (0) NOT NULL , @@ -423,7 +423,7 @@ CREATE TABLE [phpbb_forums] ( [forum_topics_real] [int] DEFAULT (0) NOT NULL , [forum_last_post_id] [int] DEFAULT (0) NOT NULL , [forum_last_poster_id] [int] DEFAULT (0) NOT NULL , - [forum_last_post_subject] [text] DEFAULT ('') NOT NULL , + [forum_last_post_subject] [varchar] (100) DEFAULT ('') NOT NULL , [forum_last_post_time] [int] DEFAULT (0) NOT NULL , [forum_last_poster_name] [varchar] (255) DEFAULT ('') NOT NULL , [forum_last_poster_colour] [varchar] (6) DEFAULT ('') NOT NULL , @@ -518,9 +518,9 @@ GO CREATE TABLE [phpbb_groups] ( [group_id] [int] IDENTITY (1, 1) NOT NULL , [group_type] [int] DEFAULT (1) NOT NULL , - [group_name] [varchar] (252) DEFAULT ('') NOT NULL , - [group_desc] [text] DEFAULT ('') NOT NULL , - [group_desc_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [group_name] [varchar] (255) DEFAULT ('') NOT NULL , + [group_desc] [varchar] (4000) DEFAULT ('') NOT NULL , + [group_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [group_desc_options] [int] DEFAULT (7) NOT NULL , [group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , [group_display] [int] DEFAULT (0) NOT NULL , @@ -534,7 +534,7 @@ CREATE TABLE [phpbb_groups] ( [group_receive_pm] [int] DEFAULT (0) NOT NULL , [group_message_limit] [int] DEFAULT (0) NOT NULL , [group_legend] [int] DEFAULT (1) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_groups] WITH NOCHECK ADD @@ -608,7 +608,7 @@ CREATE TABLE [phpbb_log] ( [reportee_id] [int] DEFAULT (0) NOT NULL , [log_ip] [varchar] (40) DEFAULT ('') NOT NULL , [log_time] [int] DEFAULT (0) NOT NULL , - [log_operation] [text] DEFAULT ('') NOT NULL , + [log_operation] [varchar] (4000) DEFAULT ('') NOT NULL , [log_data] [text] DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -642,7 +642,7 @@ GO CREATE TABLE [phpbb_moderator_cache] ( [forum_id] [int] DEFAULT (0) NOT NULL , [user_id] [int] DEFAULT (0) NOT NULL , - [username] [varchar] (252) DEFAULT ('') NOT NULL , + [username] [varchar] (255) DEFAULT ('') NOT NULL , [group_id] [int] DEFAULT (0) NOT NULL , [group_name] [varchar] (255) DEFAULT ('') NOT NULL , [display_on_index] [int] DEFAULT (1) NOT NULL @@ -697,9 +697,9 @@ GO CREATE TABLE [phpbb_poll_options] ( [poll_option_id] [int] DEFAULT (0) NOT NULL , [topic_id] [int] DEFAULT (0) NOT NULL , - [poll_option_text] [text] DEFAULT ('') NOT NULL , + [poll_option_text] [varchar] (4000) DEFAULT ('') NOT NULL , [poll_option_total] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO CREATE INDEX [poll_opt_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY] @@ -747,16 +747,16 @@ CREATE TABLE [phpbb_posts] ( [enable_smilies] [int] DEFAULT (1) NOT NULL , [enable_magic_url] [int] DEFAULT (1) NOT NULL , [enable_sig] [int] DEFAULT (1) NOT NULL , - [post_username] [varchar] (252) DEFAULT ('') NOT NULL , - [post_subject] [text] DEFAULT ('') NOT NULL , + [post_username] [varchar] (255) DEFAULT ('') NOT NULL , + [post_subject] [varchar] (100) DEFAULT ('') NOT NULL , [post_text] [text] DEFAULT ('') NOT NULL , [post_checksum] [varchar] (32) DEFAULT ('') NOT NULL , [post_attachment] [int] DEFAULT (0) NOT NULL , - [bbcode_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL , [post_postcount] [int] DEFAULT (1) NOT NULL , [post_edit_time] [int] DEFAULT (0) NOT NULL , - [post_edit_reason] [text] DEFAULT ('') NOT NULL , + [post_edit_reason] [varchar] (255) DEFAULT ('') NOT NULL , [post_edit_user] [int] DEFAULT (0) NOT NULL , [post_edit_count] [int] DEFAULT (0) NOT NULL , [post_edit_locked] [int] DEFAULT (0) NOT NULL @@ -785,10 +785,7 @@ GO CREATE INDEX [post_approved] ON [phpbb_posts]([post_approved]) ON [PRIMARY] GO -CREATE INDEX [post_postcount] ON [phpbb_posts]([post_postcount]) ON [PRIMARY] -GO - -CREATE INDEX [post_time] ON [phpbb_posts]([post_time]) ON [PRIMARY] +CREATE INDEX [tid_post_time] ON [phpbb_posts]([topic_id], [post_time]) ON [PRIMARY] GO @@ -806,17 +803,17 @@ CREATE TABLE [phpbb_privmsgs] ( [enable_smilies] [int] DEFAULT (1) NOT NULL , [enable_magic_url] [int] DEFAULT (1) NOT NULL , [enable_sig] [int] DEFAULT (1) NOT NULL , - [message_subject] [text] DEFAULT ('') NOT NULL , + [message_subject] [varchar] (100) DEFAULT ('') NOT NULL , [message_text] [text] DEFAULT ('') NOT NULL , - [message_edit_reason] [text] DEFAULT ('') NOT NULL , + [message_edit_reason] [varchar] (255) DEFAULT ('') NOT NULL , [message_edit_user] [int] DEFAULT (0) NOT NULL , [message_attachment] [int] DEFAULT (0) NOT NULL , - [bbcode_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL , [message_edit_time] [int] DEFAULT (0) NOT NULL , [message_edit_count] [int] DEFAULT (0) NOT NULL , - [to_address] [text] DEFAULT ('') NOT NULL , - [bcc_address] [text] DEFAULT ('') NOT NULL + [to_address] [varchar] (4000) DEFAULT ('') NOT NULL , + [bcc_address] [varchar] (4000) DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -998,9 +995,9 @@ CREATE TABLE [phpbb_profile_lang] ( [field_id] [int] DEFAULT (0) NOT NULL , [lang_id] [int] DEFAULT (0) NOT NULL , [lang_name] [varchar] (255) DEFAULT ('') NOT NULL , - [lang_explain] [text] DEFAULT ('') NOT NULL , + [lang_explain] [varchar] (4000) DEFAULT ('') NOT NULL , [lang_default_value] [varchar] (255) DEFAULT ('') NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_profile_lang] WITH NOCHECK ADD @@ -1236,7 +1233,7 @@ GO */ CREATE TABLE [phpbb_styles] ( [style_id] [int] IDENTITY (1, 1) NOT NULL , - [style_name] [varchar] (252) DEFAULT ('') NOT NULL , + [style_name] [varchar] (255) DEFAULT ('') NOT NULL , [style_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [style_active] [int] DEFAULT (1) NOT NULL , [template_id] [int] DEFAULT (0) NOT NULL , @@ -1270,10 +1267,10 @@ GO */ CREATE TABLE [phpbb_styles_template] ( [template_id] [int] IDENTITY (1, 1) NOT NULL , - [template_name] [varchar] (252) DEFAULT ('') NOT NULL , + [template_name] [varchar] (255) DEFAULT ('') NOT NULL , [template_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [template_path] [varchar] (100) DEFAULT ('') NOT NULL , - [bbcode_bitfield] [varchar] (252) DEFAULT ('kNg=') NOT NULL , + [bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL , [template_storedb] [int] DEFAULT (0) NOT NULL ) ON [PRIMARY] GO @@ -1313,7 +1310,7 @@ GO */ CREATE TABLE [phpbb_styles_theme] ( [theme_id] [int] IDENTITY (1, 1) NOT NULL , - [theme_name] [varchar] (252) DEFAULT ('') NOT NULL , + [theme_name] [varchar] (255) DEFAULT ('') NOT NULL , [theme_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [theme_path] [varchar] (100) DEFAULT ('') NOT NULL , [theme_storedb] [int] DEFAULT (0) NOT NULL , @@ -1338,7 +1335,7 @@ GO */ CREATE TABLE [phpbb_styles_imageset] ( [imageset_id] [int] IDENTITY (1, 1) NOT NULL , - [imageset_name] [varchar] (252) DEFAULT ('') NOT NULL , + [imageset_name] [varchar] (255) DEFAULT ('') NOT NULL , [imageset_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [imageset_path] [varchar] (100) DEFAULT ('') NOT NULL , [site_logo] [varchar] (200) DEFAULT ('') NOT NULL , @@ -1459,7 +1456,7 @@ CREATE TABLE [phpbb_topics] ( [topic_attachment] [int] DEFAULT (0) NOT NULL , [topic_approved] [int] DEFAULT (1) NOT NULL , [topic_reported] [int] DEFAULT (0) NOT NULL , - [topic_title] [text] DEFAULT ('') NOT NULL , + [topic_title] [varchar] (100) DEFAULT ('') NOT NULL , [topic_poster] [int] DEFAULT (0) NOT NULL , [topic_time] [int] DEFAULT (0) NOT NULL , [topic_time_limit] [int] DEFAULT (0) NOT NULL , @@ -1475,19 +1472,19 @@ CREATE TABLE [phpbb_topics] ( [topic_last_poster_id] [int] DEFAULT (0) NOT NULL , [topic_last_poster_name] [varchar] (255) DEFAULT ('') NOT NULL , [topic_last_poster_colour] [varchar] (6) DEFAULT ('') NOT NULL , - [topic_last_post_subject] [text] DEFAULT ('') NOT NULL , + [topic_last_post_subject] [varchar] (100) DEFAULT ('') NOT NULL , [topic_last_post_time] [int] DEFAULT (0) NOT NULL , [topic_last_view_time] [int] DEFAULT (0) NOT NULL , [topic_moved_id] [int] DEFAULT (0) NOT NULL , [topic_bumped] [int] DEFAULT (0) NOT NULL , [topic_bumper] [int] DEFAULT (0) NOT NULL , - [poll_title] [text] DEFAULT ('') NOT NULL , + [poll_title] [varchar] (100) DEFAULT ('') NOT NULL , [poll_start] [int] DEFAULT (0) NOT NULL , [poll_length] [int] DEFAULT (0) NOT NULL , [poll_max_options] [int] DEFAULT (1) NOT NULL , [poll_last_vote] [int] DEFAULT (0) NOT NULL , [poll_vote_change] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO ALTER TABLE [phpbb_topics] WITH NOCHECK ADD @@ -1506,6 +1503,9 @@ GO CREATE INDEX [last_post_time] ON [phpbb_topics]([topic_last_post_time]) ON [PRIMARY] GO +CREATE INDEX [topic_approved] ON [phpbb_topics]([topic_approved]) ON [PRIMARY] +GO + CREATE INDEX [fid_time_moved] ON [phpbb_topics]([forum_id], [topic_last_post_time], [topic_moved_id]) ON [PRIMARY] GO @@ -1604,7 +1604,7 @@ CREATE TABLE [phpbb_users] ( [user_perm_from] [int] DEFAULT (0) NOT NULL , [user_ip] [varchar] (40) DEFAULT ('') NOT NULL , [user_regdate] [int] DEFAULT (0) NOT NULL , - [username] [varchar] (252) DEFAULT ('') NOT NULL , + [username] [varchar] (255) DEFAULT ('') NOT NULL , [user_password] [varchar] (40) DEFAULT ('') NOT NULL , [user_passchg] [int] DEFAULT (0) NOT NULL , [user_email] [varchar] (100) DEFAULT ('') NOT NULL , @@ -1656,7 +1656,7 @@ CREATE TABLE [phpbb_users] ( [user_avatar_height] [int] DEFAULT (0) NOT NULL , [user_sig] [text] DEFAULT ('') NOT NULL , [user_sig_bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL , - [user_sig_bbcode_bitfield] [varchar] (252) DEFAULT ('') NOT NULL , + [user_sig_bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [user_from] [varchar] (100) DEFAULT ('') NOT NULL , [user_icq] [varchar] (15) DEFAULT ('') NOT NULL , [user_aim] [varchar] (255) DEFAULT ('') NOT NULL , @@ -1665,7 +1665,7 @@ CREATE TABLE [phpbb_users] ( [user_jabber] [varchar] (255) DEFAULT ('') NOT NULL , [user_website] [varchar] (200) DEFAULT ('') NOT NULL , [user_occ] [varchar] (255) DEFAULT ('') NOT NULL , - [user_interests] [text] DEFAULT ('') NOT NULL , + [user_interests] [varchar] (4000) DEFAULT ('') NOT NULL , [user_actkey] [varchar] (32) DEFAULT ('') NOT NULL , [user_newpasswd] [varchar] (32) DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 54b569e9f7..5fee2fc54c 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -102,7 +102,7 @@ CREATE TABLE phpbb_banlist ( PRIMARY KEY (ban_id), KEY ban_end (ban_end), KEY ban_user (ban_userid, ban_exclude), - KEY ban_email (ban_email, ban_exclude), + KEY ban_email (ban_email(255), ban_exclude), KEY ban_ip (ban_ip, ban_exclude) ); @@ -149,7 +149,7 @@ CREATE TABLE phpbb_bots ( # Table: 'phpbb_config' CREATE TABLE phpbb_config ( - config_name varchar(252) DEFAULT '' NOT NULL, + config_name varchar(255) DEFAULT '' NOT NULL, config_value varchar(255) DEFAULT '' NOT NULL, is_dynamic tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (config_name), @@ -223,7 +223,7 @@ CREATE TABLE phpbb_forums ( forum_parents mediumtext DEFAULT '' NOT NULL, forum_name text DEFAULT '' NOT NULL, forum_desc text DEFAULT '' NOT NULL, - forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_uid varchar(5) DEFAULT '' NOT NULL, forum_link text DEFAULT '' NOT NULL, @@ -232,7 +232,7 @@ CREATE TABLE phpbb_forums ( forum_image varchar(255) DEFAULT '' NOT NULL, forum_rules text DEFAULT '' NOT NULL, forum_rules_link text DEFAULT '' NOT NULL, - forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL, forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_rules_uid varchar(5) DEFAULT '' NOT NULL, forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL, @@ -297,7 +297,7 @@ CREATE TABLE phpbb_groups ( group_type tinyint(4) DEFAULT '1' NOT NULL, group_name text DEFAULT '' NOT NULL, group_desc text DEFAULT '' NOT NULL, - group_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, group_desc_uid varchar(5) DEFAULT '' NOT NULL, group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -439,7 +439,7 @@ CREATE TABLE phpbb_posts ( post_text mediumtext DEFAULT '' NOT NULL, post_checksum varchar(32) DEFAULT '' NOT NULL, post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, post_postcount tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, post_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -453,8 +453,7 @@ CREATE TABLE phpbb_posts ( KEY poster_ip (poster_ip), KEY poster_id (poster_id), KEY post_approved (post_approved), - KEY post_postcount (post_postcount), - KEY post_time (post_time) + KEY tid_post_time (topic_id, post_time) ); @@ -475,7 +474,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason text DEFAULT '' NOT NULL, message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL, @@ -717,7 +716,7 @@ CREATE TABLE phpbb_styles ( theme_id tinyint(4) DEFAULT '0' NOT NULL, imageset_id tinyint(4) DEFAULT '0' NOT NULL, PRIMARY KEY (style_id), - UNIQUE style_name (style_name), + UNIQUE style_name (style_name(255)), KEY template_id (template_id), KEY theme_id (theme_id), KEY imageset_id (imageset_id) @@ -730,10 +729,10 @@ CREATE TABLE phpbb_styles_template ( template_name text DEFAULT '' NOT NULL, template_copyright text DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT 'kNg=' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (template_id), - UNIQUE tmplte_nm (template_name) + UNIQUE tmplte_nm (template_name(255)) ); @@ -759,7 +758,7 @@ CREATE TABLE phpbb_styles_theme ( theme_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL, theme_data mediumtext DEFAULT '' NOT NULL, PRIMARY KEY (theme_id), - UNIQUE theme_name (theme_name) + UNIQUE theme_name (theme_name(255)) ); @@ -864,7 +863,7 @@ CREATE TABLE phpbb_styles_imageset ( user_icon9 varchar(200) DEFAULT '' NOT NULL, user_icon10 varchar(200) DEFAULT '' NOT NULL, PRIMARY KEY (imageset_id), - UNIQUE imgset_nm (imageset_name) + UNIQUE imgset_nm (imageset_name(255)) ); @@ -908,6 +907,7 @@ CREATE TABLE phpbb_topics ( KEY forum_id (forum_id), KEY forum_id_type (forum_id, topic_type), KEY last_post_time (topic_last_post_time), + KEY topic_approved (topic_approved), KEY fid_time_moved (forum_id, topic_last_post_time, topic_moved_id) ); @@ -1016,7 +1016,7 @@ CREATE TABLE phpbb_users ( user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, user_sig mediumtext DEFAULT '' NOT NULL, user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL, - user_sig_bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, user_from text DEFAULT '' NOT NULL, user_icq varchar(15) DEFAULT '' NOT NULL, user_aim text DEFAULT '' NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index f907a49fbe..78f365045a 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -138,7 +138,7 @@ CREATE TABLE phpbb_bookmarks ( CREATE TABLE phpbb_bots ( bot_id mediumint(8) UNSIGNED NOT NULL auto_increment, bot_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, - bot_name text DEFAULT '' NOT NULL, + bot_name varchar(255) DEFAULT '' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, bot_agent varchar(255) DEFAULT '' NOT NULL, bot_ip varchar(255) DEFAULT '' NOT NULL, @@ -149,7 +149,7 @@ CREATE TABLE phpbb_bots ( # Table: 'phpbb_config' CREATE TABLE phpbb_config ( - config_name varchar(252) DEFAULT '' NOT NULL, + config_name varchar(255) DEFAULT '' NOT NULL, config_value varchar(255) DEFAULT '' NOT NULL, is_dynamic tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (config_name), @@ -171,7 +171,7 @@ CREATE TABLE phpbb_confirm ( # Table: 'phpbb_disallow' CREATE TABLE phpbb_disallow ( disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment, - disallow_username varchar(252) DEFAULT '' NOT NULL, + disallow_username varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (disallow_id) ) CHARACTER SET `utf8` COLLATE `utf8_general_ci`; @@ -183,7 +183,7 @@ CREATE TABLE phpbb_drafts ( topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, save_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - draft_subject text DEFAULT '' NOT NULL, + draft_subject varchar(100) DEFAULT '' NOT NULL, draft_message mediumtext DEFAULT '' NOT NULL, PRIMARY KEY (draft_id), KEY save_time (save_time) @@ -221,9 +221,9 @@ CREATE TABLE phpbb_forums ( left_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, right_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_parents mediumtext DEFAULT '' NOT NULL, - forum_name text DEFAULT '' NOT NULL, + forum_name varchar(255) DEFAULT '' NOT NULL, forum_desc text DEFAULT '' NOT NULL, - forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_uid varchar(5) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, @@ -232,7 +232,7 @@ CREATE TABLE phpbb_forums ( forum_image varchar(255) DEFAULT '' NOT NULL, forum_rules text DEFAULT '' NOT NULL, forum_rules_link varchar(255) DEFAULT '' NOT NULL, - forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL, forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_rules_uid varchar(5) DEFAULT '' NOT NULL, forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL, @@ -243,7 +243,7 @@ CREATE TABLE phpbb_forums ( forum_topics_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - forum_last_post_subject text DEFAULT '' NOT NULL, + forum_last_post_subject varchar(100) DEFAULT '' NOT NULL, forum_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL, forum_last_poster_name varchar(255) DEFAULT '' NOT NULL, forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL, @@ -295,9 +295,9 @@ CREATE TABLE phpbb_forums_watch ( CREATE TABLE phpbb_groups ( group_id mediumint(8) UNSIGNED NOT NULL auto_increment, group_type tinyint(4) DEFAULT '1' NOT NULL, - group_name varchar(252) DEFAULT '' NOT NULL, + group_name varchar(255) DEFAULT '' NOT NULL, group_desc text DEFAULT '' NOT NULL, - group_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, group_desc_uid varchar(5) DEFAULT '' NOT NULL, group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -367,7 +367,7 @@ CREATE TABLE phpbb_log ( CREATE TABLE phpbb_moderator_cache ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - username varchar(252) DEFAULT '' NOT NULL, + username varchar(255) DEFAULT '' NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, group_name varchar(255) DEFAULT '' NOT NULL, display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, @@ -434,16 +434,16 @@ CREATE TABLE phpbb_posts ( enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, enable_sig tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, - post_username varchar(252) DEFAULT '' NOT NULL, - post_subject text DEFAULT '' NOT NULL, + post_username varchar(255) DEFAULT '' NOT NULL, + post_subject varchar(100) DEFAULT '' NOT NULL, post_text mediumtext DEFAULT '' NOT NULL, post_checksum varchar(32) DEFAULT '' NOT NULL, post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, post_postcount tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, post_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - post_edit_reason text DEFAULT '' NOT NULL, + post_edit_reason varchar(255) DEFAULT '' NOT NULL, post_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, post_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL, post_edit_locked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -453,8 +453,7 @@ CREATE TABLE phpbb_posts ( KEY poster_ip (poster_ip), KEY poster_id (poster_id), KEY post_approved (post_approved), - KEY post_postcount (post_postcount), - KEY post_time (post_time) + KEY tid_post_time (topic_id, post_time) ) CHARACTER SET `utf8` COLLATE `utf8_general_ci`; @@ -470,12 +469,12 @@ CREATE TABLE phpbb_privmsgs ( enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, enable_sig tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, - message_subject text DEFAULT '' NOT NULL, + message_subject varchar(100) DEFAULT '' NOT NULL, message_text mediumtext DEFAULT '' NOT NULL, - message_edit_reason text DEFAULT '' NOT NULL, + message_edit_reason varchar(255) DEFAULT '' NOT NULL, message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL, @@ -710,7 +709,7 @@ CREATE TABLE phpbb_smilies ( # Table: 'phpbb_styles' CREATE TABLE phpbb_styles ( style_id tinyint(4) NOT NULL auto_increment, - style_name varchar(252) DEFAULT '' NOT NULL, + style_name varchar(255) DEFAULT '' NOT NULL, style_copyright varchar(255) DEFAULT '' NOT NULL, style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, template_id tinyint(4) DEFAULT '0' NOT NULL, @@ -727,10 +726,10 @@ CREATE TABLE phpbb_styles ( # Table: 'phpbb_styles_template' CREATE TABLE phpbb_styles_template ( template_id tinyint(4) NOT NULL auto_increment, - template_name varchar(252) DEFAULT '' NOT NULL, + template_name varchar(255) DEFAULT '' NOT NULL, template_copyright varchar(255) DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT 'kNg=' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (template_id), UNIQUE tmplte_nm (template_name) @@ -752,7 +751,7 @@ CREATE TABLE phpbb_styles_template_data ( # Table: 'phpbb_styles_theme' CREATE TABLE phpbb_styles_theme ( theme_id tinyint(4) NOT NULL auto_increment, - theme_name varchar(252) DEFAULT '' NOT NULL, + theme_name varchar(255) DEFAULT '' NOT NULL, theme_copyright varchar(255) DEFAULT '' NOT NULL, theme_path varchar(100) DEFAULT '' NOT NULL, theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -766,7 +765,7 @@ CREATE TABLE phpbb_styles_theme ( # Table: 'phpbb_styles_imageset' CREATE TABLE phpbb_styles_imageset ( imageset_id tinyint(4) NOT NULL auto_increment, - imageset_name varchar(252) DEFAULT '' NOT NULL, + imageset_name varchar(255) DEFAULT '' NOT NULL, imageset_copyright varchar(255) DEFAULT '' NOT NULL, imageset_path varchar(100) DEFAULT '' NOT NULL, site_logo varchar(200) DEFAULT '' NOT NULL, @@ -876,7 +875,7 @@ CREATE TABLE phpbb_topics ( topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, topic_approved tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, topic_reported tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - topic_title text DEFAULT '' NOT NULL, + topic_title varchar(100) DEFAULT '' NOT NULL, topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_time int(11) UNSIGNED DEFAULT '0' NOT NULL, topic_time_limit int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -892,13 +891,13 @@ CREATE TABLE phpbb_topics ( topic_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_last_poster_name varchar(255) DEFAULT '' NOT NULL, topic_last_poster_colour varchar(6) DEFAULT '' NOT NULL, - topic_last_post_subject text DEFAULT '' NOT NULL, + topic_last_post_subject varchar(100) DEFAULT '' NOT NULL, topic_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL, topic_last_view_time int(11) UNSIGNED DEFAULT '0' NOT NULL, topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_bumped tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, topic_bumper mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - poll_title text DEFAULT '' NOT NULL, + poll_title varchar(100) DEFAULT '' NOT NULL, poll_start int(11) UNSIGNED DEFAULT '0' NOT NULL, poll_length int(11) UNSIGNED DEFAULT '0' NOT NULL, poll_max_options tinyint(4) DEFAULT '1' NOT NULL, @@ -908,6 +907,7 @@ CREATE TABLE phpbb_topics ( KEY forum_id (forum_id), KEY forum_id_type (forum_id, topic_type), KEY last_post_time (topic_last_post_time), + KEY topic_approved (topic_approved), KEY fid_time_moved (forum_id, topic_last_post_time, topic_moved_id) ) CHARACTER SET `utf8` COLLATE `utf8_general_ci`; @@ -964,7 +964,7 @@ CREATE TABLE phpbb_users ( user_perm_from mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_ip varchar(40) DEFAULT '' NOT NULL, user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL, - username varchar(252) DEFAULT '' NOT NULL, + username varchar(255) DEFAULT '' NOT NULL, user_password varchar(40) DEFAULT '' NOT NULL, user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL, user_email varchar(100) DEFAULT '' NOT NULL, @@ -1016,7 +1016,7 @@ CREATE TABLE phpbb_users ( user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, user_sig mediumtext DEFAULT '' NOT NULL, user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL, - user_sig_bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, user_from varchar(100) DEFAULT '' NOT NULL, user_icq varchar(15) DEFAULT '' NOT NULL, user_aim varchar(255) DEFAULT '' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index a3665563e1..7e1522e56b 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -146,7 +146,7 @@ END; */ CREATE TABLE phpbb_acl_roles ( role_id number(8) NOT NULL, - role_name varchar2(255) DEFAULT '' , + role_name varchar2(765) DEFAULT '' , role_description clob DEFAULT '' , role_type varchar2(10) DEFAULT '' , role_order number(4) DEFAULT '0' NOT NULL, @@ -211,7 +211,7 @@ CREATE TABLE phpbb_banlist ( ban_id number(8) NOT NULL, ban_userid number(8) DEFAULT '0' NOT NULL, ban_ip varchar2(40) DEFAULT '' , - ban_email varchar2(100) DEFAULT '' , + ban_email varchar2(300) DEFAULT '' , ban_start number(11) DEFAULT '0' NOT NULL, ban_end number(11) DEFAULT '0' NOT NULL, ban_exclude number(1) DEFAULT '0' NOT NULL, @@ -288,7 +288,7 @@ CREATE INDEX phpbb_bookmarks_topic_user_id ON phpbb_bookmarks (topic_id, user_id CREATE TABLE phpbb_bots ( bot_id number(8) NOT NULL, bot_active number(1) DEFAULT '1' NOT NULL, - bot_name varchar2(3000) DEFAULT '' , + bot_name varchar2(765) DEFAULT '' , user_id number(8) DEFAULT '0' NOT NULL, bot_agent varchar2(255) DEFAULT '' , bot_ip varchar2(255) DEFAULT '' , @@ -319,7 +319,7 @@ END; Table: 'phpbb_config' */ CREATE TABLE phpbb_config ( - config_name varchar2(252) DEFAULT '' , + config_name varchar2(255) DEFAULT '' , config_value varchar2(255) DEFAULT '' , is_dynamic number(1) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_config PRIMARY KEY (config_name) @@ -349,7 +349,7 @@ CREATE INDEX phpbb_confirm_confirm_type ON phpbb_confirm (confirm_type) */ CREATE TABLE phpbb_disallow ( disallow_id number(8) NOT NULL, - disallow_username varchar2(252) DEFAULT '' , + disallow_username varchar2(756) DEFAULT '' , CONSTRAINT pk_phpbb_disallow PRIMARY KEY (disallow_id) ) / @@ -380,7 +380,7 @@ CREATE TABLE phpbb_drafts ( topic_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, save_time number(11) DEFAULT '0' NOT NULL, - draft_subject varchar2(1000) DEFAULT '' , + draft_subject varchar2(300) DEFAULT '' , draft_message clob DEFAULT '' , CONSTRAINT pk_phpbb_drafts PRIMARY KEY (draft_id) ) @@ -438,7 +438,7 @@ END; */ CREATE TABLE phpbb_extension_groups ( group_id number(8) NOT NULL, - group_name varchar2(255) DEFAULT '' , + group_name varchar2(765) DEFAULT '' , cat_id number(2) DEFAULT '0' NOT NULL, allow_group number(1) DEFAULT '0' NOT NULL, download_mode number(1) DEFAULT '1' NOT NULL, @@ -476,18 +476,18 @@ CREATE TABLE phpbb_forums ( left_id number(8) DEFAULT '0' NOT NULL, right_id number(8) DEFAULT '0' NOT NULL, forum_parents clob DEFAULT '' , - forum_name varchar2(3000) DEFAULT '' , + forum_name varchar2(765) DEFAULT '' , forum_desc clob DEFAULT '' , - forum_desc_bitfield varchar2(252) DEFAULT '' , + forum_desc_bitfield varchar2(255) DEFAULT '' , forum_desc_options number(11) DEFAULT '7' NOT NULL, forum_desc_uid varchar2(5) DEFAULT '' , - forum_link varchar2(255) DEFAULT '' , - forum_password varchar2(40) DEFAULT '' , + forum_link varchar2(765) DEFAULT '' , + forum_password varchar2(120) DEFAULT '' , forum_style number(4) DEFAULT '0' NOT NULL, forum_image varchar2(255) DEFAULT '' , forum_rules clob DEFAULT '' , - forum_rules_link varchar2(255) DEFAULT '' , - forum_rules_bitfield varchar2(252) DEFAULT '' , + forum_rules_link varchar2(765) DEFAULT '' , + forum_rules_bitfield varchar2(255) DEFAULT '' , forum_rules_options number(11) DEFAULT '7' NOT NULL, forum_rules_uid varchar2(5) DEFAULT '' , forum_topics_per_page number(4) DEFAULT '0' NOT NULL, @@ -498,9 +498,9 @@ CREATE TABLE phpbb_forums ( forum_topics_real number(8) DEFAULT '0' NOT NULL, forum_last_post_id number(8) DEFAULT '0' NOT NULL, forum_last_poster_id number(8) DEFAULT '0' NOT NULL, - forum_last_post_subject varchar2(1000) DEFAULT '' , + forum_last_post_subject varchar2(300) DEFAULT '' , forum_last_post_time number(11) DEFAULT '0' NOT NULL, - forum_last_poster_name varchar2(255) DEFAULT '' , + forum_last_poster_name varchar2(765) DEFAULT '' , forum_last_poster_colour varchar2(6) DEFAULT '' , forum_flags number(4) DEFAULT '32' NOT NULL, display_on_index number(1) DEFAULT '1' NOT NULL, @@ -583,9 +583,9 @@ CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch (notify_status CREATE TABLE phpbb_groups ( group_id number(8) NOT NULL, group_type number(4) DEFAULT '1' NOT NULL, - group_name varchar2(252) DEFAULT '' , + group_name varchar2(255) DEFAULT '' , group_desc clob DEFAULT '' , - group_desc_bitfield varchar2(252) DEFAULT '' , + group_desc_bitfield varchar2(255) DEFAULT '' , group_desc_options number(11) DEFAULT '7' NOT NULL, group_desc_uid varchar2(5) DEFAULT '' , group_display number(1) DEFAULT '0' NOT NULL, @@ -662,9 +662,9 @@ CREATE TABLE phpbb_lang ( lang_id number(4) NOT NULL, lang_iso varchar2(30) DEFAULT '' , lang_dir varchar2(30) DEFAULT '' , - lang_english_name varchar2(100) DEFAULT '' , - lang_local_name varchar2(255) DEFAULT '' , - lang_author varchar2(255) DEFAULT '' , + lang_english_name varchar2(300) DEFAULT '' , + lang_local_name varchar2(765) DEFAULT '' , + lang_author varchar2(765) DEFAULT '' , CONSTRAINT pk_phpbb_lang PRIMARY KEY (lang_id) ) / @@ -739,9 +739,9 @@ END; CREATE TABLE phpbb_moderator_cache ( forum_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL, - username varchar2(252) DEFAULT '' , + username varchar2(756) DEFAULT '' , group_id number(8) DEFAULT '0' NOT NULL, - group_name varchar2(255) DEFAULT '' , + group_name varchar2(765) DEFAULT '' , display_on_index number(1) DEFAULT '1' NOT NULL ) / @@ -844,16 +844,16 @@ CREATE TABLE phpbb_posts ( enable_smilies number(1) DEFAULT '1' NOT NULL, enable_magic_url number(1) DEFAULT '1' NOT NULL, enable_sig number(1) DEFAULT '1' NOT NULL, - post_username varchar2(252) DEFAULT '' , - post_subject varchar2(1000) DEFAULT '' , + post_username varchar2(756) DEFAULT '' , + post_subject varchar2(300) DEFAULT '' , post_text clob DEFAULT '' , post_checksum varchar2(32) DEFAULT '' , post_attachment number(1) DEFAULT '0' NOT NULL, - bbcode_bitfield varchar2(252) DEFAULT '' , + bbcode_bitfield varchar2(255) DEFAULT '' , bbcode_uid varchar2(5) DEFAULT '' , post_postcount number(1) DEFAULT '1' NOT NULL, post_edit_time number(11) DEFAULT '0' NOT NULL, - post_edit_reason varchar2(3000) DEFAULT '' , + post_edit_reason varchar2(765) DEFAULT '' , post_edit_user number(8) DEFAULT '0' NOT NULL, post_edit_count number(4) DEFAULT '0' NOT NULL, post_edit_locked number(1) DEFAULT '0' NOT NULL, @@ -871,9 +871,7 @@ CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id) / CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved) / -CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount) -/ -CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time) +CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time) / CREATE SEQUENCE phpbb_posts_seq @@ -906,12 +904,12 @@ CREATE TABLE phpbb_privmsgs ( enable_smilies number(1) DEFAULT '1' NOT NULL, enable_magic_url number(1) DEFAULT '1' NOT NULL, enable_sig number(1) DEFAULT '1' NOT NULL, - message_subject varchar2(1000) DEFAULT '' , + message_subject varchar2(300) DEFAULT '' , message_text clob DEFAULT '' , - message_edit_reason varchar2(3000) DEFAULT '' , + message_edit_reason varchar2(765) DEFAULT '' , message_edit_user number(8) DEFAULT '0' NOT NULL, message_attachment number(1) DEFAULT '0' NOT NULL, - bbcode_bitfield varchar2(252) DEFAULT '' , + bbcode_bitfield varchar2(255) DEFAULT '' , bbcode_uid varchar2(5) DEFAULT '' , message_edit_time number(11) DEFAULT '0' NOT NULL, message_edit_count number(4) DEFAULT '0' NOT NULL, @@ -952,7 +950,7 @@ END; CREATE TABLE phpbb_privmsgs_folder ( folder_id number(8) NOT NULL, user_id number(8) DEFAULT '0' NOT NULL, - folder_name varchar2(255) DEFAULT '' , + folder_name varchar2(765) DEFAULT '' , pm_count number(8) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_privmsgs_folder PRIMARY KEY (folder_id) ) @@ -985,7 +983,7 @@ CREATE TABLE phpbb_privmsgs_rules ( user_id number(8) DEFAULT '0' NOT NULL, rule_check number(8) DEFAULT '0' NOT NULL, rule_connection number(8) DEFAULT '0' NOT NULL, - rule_string varchar2(255) DEFAULT '' , + rule_string varchar2(765) DEFAULT '' , rule_user_id number(8) DEFAULT '0' NOT NULL, rule_group_id number(8) DEFAULT '0' NOT NULL, rule_action number(8) DEFAULT '0' NOT NULL, @@ -1042,15 +1040,15 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folde */ CREATE TABLE phpbb_profile_fields ( field_id number(8) NOT NULL, - field_name varchar2(255) DEFAULT '' , + field_name varchar2(765) DEFAULT '' , field_type number(4) DEFAULT '0' NOT NULL, field_ident varchar2(20) DEFAULT '' , field_length varchar2(20) DEFAULT '' , field_minlen varchar2(255) DEFAULT '' , field_maxlen varchar2(255) DEFAULT '' , - field_novalue varchar2(255) DEFAULT '' , - field_default_value varchar2(255) DEFAULT '' , - field_validation varchar2(20) DEFAULT '' , + field_novalue varchar2(765) DEFAULT '' , + field_default_value varchar2(765) DEFAULT '' , + field_validation varchar2(60) DEFAULT '' , field_required number(1) DEFAULT '0' NOT NULL, field_show_on_reg number(1) DEFAULT '0' NOT NULL, field_hide number(1) DEFAULT '0' NOT NULL, @@ -1100,7 +1098,7 @@ CREATE TABLE phpbb_profile_fields_lang ( lang_id number(8) DEFAULT '0' NOT NULL, option_id number(8) DEFAULT '0' NOT NULL, field_type number(4) DEFAULT '0' NOT NULL, - lang_value varchar2(255) DEFAULT '' , + lang_value varchar2(765) DEFAULT '' , CONSTRAINT pk_phpbb_profile_fields_lang PRIMARY KEY (field_id, lang_id, option_id) ) / @@ -1112,9 +1110,9 @@ CREATE TABLE phpbb_profile_fields_lang ( CREATE TABLE phpbb_profile_lang ( field_id number(8) DEFAULT '0' NOT NULL, lang_id number(8) DEFAULT '0' NOT NULL, - lang_name varchar2(255) DEFAULT '' , + lang_name varchar2(765) DEFAULT '' , lang_explain clob DEFAULT '' , - lang_default_value varchar2(255) DEFAULT '' , + lang_default_value varchar2(765) DEFAULT '' , CONSTRAINT pk_phpbb_profile_lang PRIMARY KEY (field_id, lang_id) ) / @@ -1125,7 +1123,7 @@ CREATE TABLE phpbb_profile_lang ( */ CREATE TABLE phpbb_ranks ( rank_id number(8) NOT NULL, - rank_title varchar2(255) DEFAULT '' , + rank_title varchar2(765) DEFAULT '' , rank_min number(8) DEFAULT '0' NOT NULL, rank_special number(1) DEFAULT '0' NOT NULL, rank_image varchar2(255) DEFAULT '' , @@ -1188,7 +1186,7 @@ END; */ CREATE TABLE phpbb_reports_reasons ( reason_id number(4) NOT NULL, - reason_title varchar2(255) DEFAULT '' , + reason_title varchar2(765) DEFAULT '' , reason_description clob DEFAULT '' , reason_order number(4) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_reports_reasons PRIMARY KEY (reason_id) @@ -1230,7 +1228,7 @@ CREATE TABLE phpbb_search_results ( */ CREATE TABLE phpbb_search_wordlist ( word_id number(8) NOT NULL, - word_text varchar2(255) DEFAULT '' , + word_text varchar2(765) DEFAULT '' , word_common number(1) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_search_wordlist PRIMARY KEY (word_id), CONSTRAINT u_phpbb_wrd_txt UNIQUE (word_text) @@ -1280,7 +1278,7 @@ CREATE TABLE phpbb_sessions ( session_time number(11) DEFAULT '0' NOT NULL, session_ip varchar2(40) DEFAULT '' , session_browser varchar2(150) DEFAULT '' , - session_page varchar2(255) DEFAULT '' , + session_page varchar2(765) DEFAULT '' , session_viewonline number(1) DEFAULT '1' NOT NULL, session_autologin number(1) DEFAULT '0' NOT NULL, session_admin number(1) DEFAULT '0' NOT NULL, @@ -1342,8 +1340,8 @@ END; */ CREATE TABLE phpbb_smilies ( smiley_id number(8) NOT NULL, - code varchar2(50) DEFAULT '' , - emotion varchar2(50) DEFAULT '' , + code varchar2(150) DEFAULT '' , + emotion varchar2(150) DEFAULT '' , smiley_url varchar2(50) DEFAULT '' , smiley_width number(4) DEFAULT '0' NOT NULL, smiley_height number(4) DEFAULT '0' NOT NULL, @@ -1377,8 +1375,8 @@ END; */ CREATE TABLE phpbb_styles ( style_id number(4) NOT NULL, - style_name varchar2(252) DEFAULT '' , - style_copyright varchar2(255) DEFAULT '' , + style_name varchar2(756) DEFAULT '' , + style_copyright varchar2(765) DEFAULT '' , style_active number(1) DEFAULT '1' NOT NULL, template_id number(4) DEFAULT '0' NOT NULL, theme_id number(4) DEFAULT '0' NOT NULL, @@ -1416,10 +1414,10 @@ END; */ CREATE TABLE phpbb_styles_template ( template_id number(4) NOT NULL, - template_name varchar2(252) DEFAULT '' , - template_copyright varchar2(255) DEFAULT '' , + template_name varchar2(756) DEFAULT '' , + template_copyright varchar2(765) DEFAULT '' , template_path varchar2(100) DEFAULT '' , - bbcode_bitfield varchar2(252) DEFAULT 'kNg=' NOT NULL, + bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL, template_storedb number(1) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id), CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name) @@ -1481,8 +1479,8 @@ END; */ CREATE TABLE phpbb_styles_theme ( theme_id number(4) NOT NULL, - theme_name varchar2(252) DEFAULT '' , - theme_copyright varchar2(255) DEFAULT '' , + theme_name varchar2(756) DEFAULT '' , + theme_copyright varchar2(765) DEFAULT '' , theme_path varchar2(100) DEFAULT '' , theme_storedb number(1) DEFAULT '0' NOT NULL, theme_mtime number(11) DEFAULT '0' NOT NULL, @@ -1514,8 +1512,8 @@ END; */ CREATE TABLE phpbb_styles_imageset ( imageset_id number(4) NOT NULL, - imageset_name varchar2(252) DEFAULT '' , - imageset_copyright varchar2(255) DEFAULT '' , + imageset_name varchar2(756) DEFAULT '' , + imageset_copyright varchar2(765) DEFAULT '' , imageset_path varchar2(100) DEFAULT '' , site_logo varchar2(200) DEFAULT '' , upload_bar varchar2(200) DEFAULT '' , @@ -1643,7 +1641,7 @@ CREATE TABLE phpbb_topics ( topic_attachment number(1) DEFAULT '0' NOT NULL, topic_approved number(1) DEFAULT '1' NOT NULL, topic_reported number(1) DEFAULT '0' NOT NULL, - topic_title varchar2(1000) DEFAULT '' , + topic_title varchar2(300) DEFAULT '' , topic_poster number(8) DEFAULT '0' NOT NULL, topic_time number(11) DEFAULT '0' NOT NULL, topic_time_limit number(11) DEFAULT '0' NOT NULL, @@ -1653,19 +1651,19 @@ CREATE TABLE phpbb_topics ( topic_status number(3) DEFAULT '0' NOT NULL, topic_type number(3) DEFAULT '0' NOT NULL, topic_first_post_id number(8) DEFAULT '0' NOT NULL, - topic_first_poster_name varchar2(255) DEFAULT '' , + topic_first_poster_name varchar2(765) DEFAULT '' , topic_first_poster_colour varchar2(6) DEFAULT '' , topic_last_post_id number(8) DEFAULT '0' NOT NULL, topic_last_poster_id number(8) DEFAULT '0' NOT NULL, - topic_last_poster_name varchar2(255) DEFAULT '' , + topic_last_poster_name varchar2(765) DEFAULT '' , topic_last_poster_colour varchar2(6) DEFAULT '' , - topic_last_post_subject varchar2(1000) DEFAULT '' , + topic_last_post_subject varchar2(300) DEFAULT '' , topic_last_post_time number(11) DEFAULT '0' NOT NULL, topic_last_view_time number(11) DEFAULT '0' NOT NULL, topic_moved_id number(8) DEFAULT '0' NOT NULL, topic_bumped number(1) DEFAULT '0' NOT NULL, topic_bumper number(8) DEFAULT '0' NOT NULL, - poll_title varchar2(1000) DEFAULT '' , + poll_title varchar2(300) DEFAULT '' , poll_start number(11) DEFAULT '0' NOT NULL, poll_length number(11) DEFAULT '0' NOT NULL, poll_max_options number(4) DEFAULT '1' NOT NULL, @@ -1681,6 +1679,8 @@ CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type) / CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time) / +CREATE INDEX phpbb_topics_topic_approved ON phpbb_topics (topic_approved) +/ CREATE INDEX phpbb_topics_fid_time_moved ON phpbb_topics (forum_id, topic_last_post_time, topic_moved_id) / @@ -1773,16 +1773,16 @@ CREATE TABLE phpbb_users ( user_perm_from number(8) DEFAULT '0' NOT NULL, user_ip varchar2(40) DEFAULT '' , user_regdate number(11) DEFAULT '0' NOT NULL, - username varchar2(252) DEFAULT '' , - user_password varchar2(40) DEFAULT '' , + username varchar2(255) DEFAULT '' , + user_password varchar2(120) DEFAULT '' , user_passchg number(11) DEFAULT '0' NOT NULL, - user_email varchar2(100) DEFAULT '' , + user_email varchar2(300) DEFAULT '' , user_email_hash number(20) DEFAULT '0' NOT NULL, user_birthday varchar2(10) DEFAULT '' , user_lastvisit number(11) DEFAULT '0' NOT NULL, user_lastmark number(11) DEFAULT '0' NOT NULL, user_lastpost_time number(11) DEFAULT '0' NOT NULL, - user_lastpage varchar2(200) DEFAULT '' , + user_lastpage varchar2(600) DEFAULT '' , user_last_confirm_key varchar2(10) DEFAULT '' , user_last_search number(11) DEFAULT '0' NOT NULL, user_warnings number(4) DEFAULT '0' NOT NULL, @@ -1794,7 +1794,7 @@ CREATE TABLE phpbb_users ( user_lang varchar2(30) DEFAULT '' , user_timezone number(5, 2) DEFAULT '0' NOT NULL, user_dst number(1) DEFAULT '0' NOT NULL, - user_dateformat varchar2(30) DEFAULT 'd M Y H:i' NOT NULL, + user_dateformat varchar2(90) DEFAULT 'd M Y H:i' NOT NULL, user_style number(4) DEFAULT '0' NOT NULL, user_rank number(8) DEFAULT '0' NOT NULL, user_colour varchar2(6) DEFAULT '' , @@ -1825,18 +1825,18 @@ CREATE TABLE phpbb_users ( user_avatar_height number(4) DEFAULT '0' NOT NULL, user_sig clob DEFAULT '' , user_sig_bbcode_uid varchar2(5) DEFAULT '' , - user_sig_bbcode_bitfield varchar2(252) DEFAULT '' , - user_from varchar2(100) DEFAULT '' , + user_sig_bbcode_bitfield varchar2(255) DEFAULT '' , + user_from varchar2(300) DEFAULT '' , user_icq varchar2(15) DEFAULT '' , - user_aim varchar2(255) DEFAULT '' , - user_yim varchar2(255) DEFAULT '' , - user_msnm varchar2(255) DEFAULT '' , - user_jabber varchar2(255) DEFAULT '' , - user_website varchar2(200) DEFAULT '' , - user_occ varchar2(255) DEFAULT '' , + user_aim varchar2(765) DEFAULT '' , + user_yim varchar2(765) DEFAULT '' , + user_msnm varchar2(765) DEFAULT '' , + user_jabber varchar2(765) DEFAULT '' , + user_website varchar2(600) DEFAULT '' , + user_occ varchar2(765) DEFAULT '' , user_interests clob DEFAULT '' , user_actkey varchar2(32) DEFAULT '' , - user_newpasswd varchar2(32) DEFAULT '' , + user_newpasswd varchar2(96) DEFAULT '' , CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id) ) / @@ -1901,8 +1901,8 @@ END; */ CREATE TABLE phpbb_words ( word_id number(8) NOT NULL, - word varchar2(255) DEFAULT '' , - replacement varchar2(255) DEFAULT '' , + word varchar2(765) DEFAULT '' , + replacement varchar2(765) DEFAULT '' , CONSTRAINT pk_phpbb_words PRIMARY KEY (word_id) ) / diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index a7ea77c538..bc1f81df98 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -10,7 +10,7 @@ BEGIN; /* Domain definition */ -CREATE DOMAIN varchar_ci AS varchar(252) NOT NULL DEFAULT ''::character varying; +CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; /* Operation Functions @@ -97,7 +97,7 @@ CREATE TABLE phpbb_attachments ( physical_filename varchar(255) DEFAULT '' NOT NULL, real_filename varchar(255) DEFAULT '' NOT NULL, download_count INT4 DEFAULT '0' NOT NULL CHECK (download_count >= 0), - attach_comment varchar(8000) DEFAULT '' NOT NULL, + attach_comment varchar(4000) DEFAULT '' NOT NULL, extension varchar(100) DEFAULT '' NOT NULL, mimetype varchar(100) DEFAULT '' NOT NULL, filesize INT4 DEFAULT '0' NOT NULL CHECK (filesize >= 0), @@ -150,7 +150,7 @@ CREATE SEQUENCE phpbb_acl_roles_seq; CREATE TABLE phpbb_acl_roles ( role_id INT4 DEFAULT nextval('phpbb_acl_roles_seq'), role_name varchar(255) DEFAULT '' NOT NULL, - role_description varchar(8000) DEFAULT '' NOT NULL, + role_description varchar(4000) DEFAULT '' NOT NULL, role_type varchar(10) DEFAULT '' NOT NULL, role_order INT2 DEFAULT '0' NOT NULL CHECK (role_order >= 0), PRIMARY KEY (role_id) @@ -215,7 +215,7 @@ CREATE TABLE phpbb_bbcodes ( bbcode_tag varchar(16) DEFAULT '' NOT NULL, bbcode_helpline varchar(255) DEFAULT '' NOT NULL, display_on_posting INT2 DEFAULT '0' NOT NULL CHECK (display_on_posting >= 0), - bbcode_match varchar(8000) DEFAULT '' NOT NULL, + bbcode_match varchar(4000) DEFAULT '' NOT NULL, bbcode_tpl TEXT DEFAULT '' NOT NULL, first_pass_match TEXT DEFAULT '' NOT NULL, first_pass_replace TEXT DEFAULT '' NOT NULL, @@ -246,7 +246,7 @@ CREATE SEQUENCE phpbb_bots_seq; CREATE TABLE phpbb_bots ( bot_id INT4 DEFAULT nextval('phpbb_bots_seq'), bot_active INT2 DEFAULT '1' NOT NULL CHECK (bot_active >= 0), - bot_name varchar(3000) DEFAULT '' NOT NULL, + bot_name varchar(255) DEFAULT '' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), bot_agent varchar(255) DEFAULT '' NOT NULL, bot_ip varchar(255) DEFAULT '' NOT NULL, @@ -259,7 +259,7 @@ CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active); Table: 'phpbb_config' */ CREATE TABLE phpbb_config ( - config_name varchar(252) DEFAULT '' NOT NULL, + config_name varchar(255) DEFAULT '' NOT NULL, config_value varchar(255) DEFAULT '' NOT NULL, is_dynamic INT2 DEFAULT '0' NOT NULL CHECK (is_dynamic >= 0), PRIMARY KEY (config_name) @@ -287,7 +287,7 @@ CREATE SEQUENCE phpbb_disallow_seq; CREATE TABLE phpbb_disallow ( disallow_id INT4 DEFAULT nextval('phpbb_disallow_seq'), - disallow_username varchar(252) DEFAULT '' NOT NULL, + disallow_username varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (disallow_id) ); @@ -303,7 +303,7 @@ CREATE TABLE phpbb_drafts ( topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), save_time INT4 DEFAULT '0' NOT NULL CHECK (save_time >= 0), - draft_subject varchar(1000) DEFAULT '' NOT NULL, + draft_subject varchar(100) DEFAULT '' NOT NULL, draft_message TEXT DEFAULT '' NOT NULL, PRIMARY KEY (draft_id) ); @@ -353,18 +353,18 @@ CREATE TABLE phpbb_forums ( left_id INT4 DEFAULT '0' NOT NULL CHECK (left_id >= 0), right_id INT4 DEFAULT '0' NOT NULL CHECK (right_id >= 0), forum_parents TEXT DEFAULT '' NOT NULL, - forum_name varchar(3000) DEFAULT '' NOT NULL, - forum_desc varchar(8000) DEFAULT '' NOT NULL, - forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_name varchar(255) DEFAULT '' NOT NULL, + forum_desc varchar(4000) DEFAULT '' NOT NULL, + forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL, forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0), forum_desc_uid varchar(5) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, forum_password varchar(40) DEFAULT '' NOT NULL, forum_style INT2 DEFAULT '0' NOT NULL, forum_image varchar(255) DEFAULT '' NOT NULL, - forum_rules varchar(8000) DEFAULT '' NOT NULL, + forum_rules varchar(4000) DEFAULT '' NOT NULL, forum_rules_link varchar(255) DEFAULT '' NOT NULL, - forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL, + forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL, forum_rules_options INT4 DEFAULT '7' NOT NULL CHECK (forum_rules_options >= 0), forum_rules_uid varchar(5) DEFAULT '' NOT NULL, forum_topics_per_page INT2 DEFAULT '0' NOT NULL, @@ -375,7 +375,7 @@ CREATE TABLE phpbb_forums ( forum_topics_real INT4 DEFAULT '0' NOT NULL CHECK (forum_topics_real >= 0), forum_last_post_id INT4 DEFAULT '0' NOT NULL CHECK (forum_last_post_id >= 0), forum_last_poster_id INT4 DEFAULT '0' NOT NULL CHECK (forum_last_poster_id >= 0), - forum_last_post_subject varchar(1000) DEFAULT '' NOT NULL, + forum_last_post_subject varchar(100) DEFAULT '' NOT NULL, forum_last_post_time INT4 DEFAULT '0' NOT NULL CHECK (forum_last_post_time >= 0), forum_last_poster_name varchar(255) DEFAULT '' NOT NULL, forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL, @@ -438,8 +438,8 @@ CREATE TABLE phpbb_groups ( group_id INT4 DEFAULT nextval('phpbb_groups_seq'), group_type INT2 DEFAULT '1' NOT NULL, group_name varchar_ci DEFAULT '' NOT NULL, - group_desc varchar(8000) DEFAULT '' NOT NULL, - group_desc_bitfield varchar(252) DEFAULT '' NOT NULL, + group_desc varchar(4000) DEFAULT '' NOT NULL, + group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options INT4 DEFAULT '7' NOT NULL CHECK (group_desc_options >= 0), group_desc_uid varchar(5) DEFAULT '' NOT NULL, group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0), @@ -506,7 +506,7 @@ CREATE TABLE phpbb_log ( reportee_id INT4 DEFAULT '0' NOT NULL CHECK (reportee_id >= 0), log_ip varchar(40) DEFAULT '' NOT NULL, log_time INT4 DEFAULT '0' NOT NULL CHECK (log_time >= 0), - log_operation varchar(8000) DEFAULT '' NOT NULL, + log_operation varchar(4000) DEFAULT '' NOT NULL, log_data TEXT DEFAULT '' NOT NULL, PRIMARY KEY (log_id) ); @@ -523,7 +523,7 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id); CREATE TABLE phpbb_moderator_cache ( forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - username varchar(252) DEFAULT '' NOT NULL, + username varchar(255) DEFAULT '' NOT NULL, group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0), group_name varchar(255) DEFAULT '' NOT NULL, display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0) @@ -562,7 +562,7 @@ CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id CREATE TABLE phpbb_poll_options ( poll_option_id INT2 DEFAULT '0' NOT NULL, topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), - poll_option_text varchar(8000) DEFAULT '' NOT NULL, + poll_option_text varchar(4000) DEFAULT '' NOT NULL, poll_option_total INT4 DEFAULT '0' NOT NULL CHECK (poll_option_total >= 0) ); @@ -602,16 +602,16 @@ CREATE TABLE phpbb_posts ( enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), enable_sig INT2 DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), - post_username varchar(252) DEFAULT '' NOT NULL, - post_subject varchar(1000) DEFAULT '' NOT NULL, + post_username varchar(255) DEFAULT '' NOT NULL, + post_subject varchar(100) DEFAULT '' NOT NULL, post_text TEXT DEFAULT '' NOT NULL, post_checksum varchar(32) DEFAULT '' NOT NULL, post_attachment INT2 DEFAULT '0' NOT NULL CHECK (post_attachment >= 0), - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, post_postcount INT2 DEFAULT '1' NOT NULL CHECK (post_postcount >= 0), post_edit_time INT4 DEFAULT '0' NOT NULL CHECK (post_edit_time >= 0), - post_edit_reason varchar(3000) DEFAULT '' NOT NULL, + post_edit_reason varchar(255) DEFAULT '' NOT NULL, post_edit_user INT4 DEFAULT '0' NOT NULL CHECK (post_edit_user >= 0), post_edit_count INT2 DEFAULT '0' NOT NULL CHECK (post_edit_count >= 0), post_edit_locked INT2 DEFAULT '0' NOT NULL CHECK (post_edit_locked >= 0), @@ -623,8 +623,7 @@ CREATE INDEX phpbb_posts_topic_id ON phpbb_posts (topic_id); CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip); CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id); CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved); -CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount); -CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time); +CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time); /* Table: 'phpbb_privmsgs' @@ -642,17 +641,17 @@ CREATE TABLE phpbb_privmsgs ( enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), enable_sig INT2 DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), - message_subject varchar(1000) DEFAULT '' NOT NULL, + message_subject varchar(100) DEFAULT '' NOT NULL, message_text TEXT DEFAULT '' NOT NULL, - message_edit_reason varchar(3000) DEFAULT '' NOT NULL, + message_edit_reason varchar(255) DEFAULT '' NOT NULL, message_edit_user INT4 DEFAULT '0' NOT NULL CHECK (message_edit_user >= 0), message_attachment INT2 DEFAULT '0' NOT NULL CHECK (message_attachment >= 0), - bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, message_edit_time INT4 DEFAULT '0' NOT NULL CHECK (message_edit_time >= 0), message_edit_count INT2 DEFAULT '0' NOT NULL CHECK (message_edit_count >= 0), - to_address varchar(8000) DEFAULT '' NOT NULL, - bcc_address varchar(8000) DEFAULT '' NOT NULL, + to_address varchar(4000) DEFAULT '' NOT NULL, + bcc_address varchar(4000) DEFAULT '' NOT NULL, PRIMARY KEY (msg_id) ); @@ -773,7 +772,7 @@ CREATE TABLE phpbb_profile_lang ( field_id INT4 DEFAULT '0' NOT NULL CHECK (field_id >= 0), lang_id INT4 DEFAULT '0' NOT NULL CHECK (lang_id >= 0), lang_name varchar(255) DEFAULT '' NOT NULL, - lang_explain varchar(8000) DEFAULT '' NOT NULL, + lang_explain varchar(4000) DEFAULT '' NOT NULL, lang_default_value varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (field_id, lang_id) ); @@ -938,7 +937,7 @@ CREATE SEQUENCE phpbb_styles_seq; CREATE TABLE phpbb_styles ( style_id INT2 DEFAULT nextval('phpbb_styles_seq'), - style_name varchar(252) DEFAULT '' NOT NULL, + style_name varchar(255) DEFAULT '' NOT NULL, style_copyright varchar(255) DEFAULT '' NOT NULL, style_active INT2 DEFAULT '1' NOT NULL CHECK (style_active >= 0), template_id INT2 DEFAULT '0' NOT NULL, @@ -959,10 +958,10 @@ CREATE SEQUENCE phpbb_styles_template_seq; CREATE TABLE phpbb_styles_template ( template_id INT2 DEFAULT nextval('phpbb_styles_template_seq'), - template_name varchar(252) DEFAULT '' NOT NULL, + template_name varchar(255) DEFAULT '' NOT NULL, template_copyright varchar(255) DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL, - bbcode_bitfield varchar(252) DEFAULT 'kNg=' NOT NULL, + bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0), PRIMARY KEY (template_id) ); @@ -992,7 +991,7 @@ CREATE SEQUENCE phpbb_styles_theme_seq; CREATE TABLE phpbb_styles_theme ( theme_id INT2 DEFAULT nextval('phpbb_styles_theme_seq'), - theme_name varchar(252) DEFAULT '' NOT NULL, + theme_name varchar(255) DEFAULT '' NOT NULL, theme_copyright varchar(255) DEFAULT '' NOT NULL, theme_path varchar(100) DEFAULT '' NOT NULL, theme_storedb INT2 DEFAULT '0' NOT NULL CHECK (theme_storedb >= 0), @@ -1010,7 +1009,7 @@ CREATE SEQUENCE phpbb_styles_imageset_seq; CREATE TABLE phpbb_styles_imageset ( imageset_id INT2 DEFAULT nextval('phpbb_styles_imageset_seq'), - imageset_name varchar(252) DEFAULT '' NOT NULL, + imageset_name varchar(255) DEFAULT '' NOT NULL, imageset_copyright varchar(255) DEFAULT '' NOT NULL, imageset_path varchar(100) DEFAULT '' NOT NULL, site_logo varchar(200) DEFAULT '' NOT NULL, @@ -1124,7 +1123,7 @@ CREATE TABLE phpbb_topics ( topic_attachment INT2 DEFAULT '0' NOT NULL CHECK (topic_attachment >= 0), topic_approved INT2 DEFAULT '1' NOT NULL CHECK (topic_approved >= 0), topic_reported INT2 DEFAULT '0' NOT NULL CHECK (topic_reported >= 0), - topic_title varchar(1000) DEFAULT '' NOT NULL, + topic_title varchar(100) DEFAULT '' NOT NULL, topic_poster INT4 DEFAULT '0' NOT NULL CHECK (topic_poster >= 0), topic_time INT4 DEFAULT '0' NOT NULL CHECK (topic_time >= 0), topic_time_limit INT4 DEFAULT '0' NOT NULL CHECK (topic_time_limit >= 0), @@ -1140,13 +1139,13 @@ CREATE TABLE phpbb_topics ( topic_last_poster_id INT4 DEFAULT '0' NOT NULL CHECK (topic_last_poster_id >= 0), topic_last_poster_name varchar(255) DEFAULT '' NOT NULL, topic_last_poster_colour varchar(6) DEFAULT '' NOT NULL, - topic_last_post_subject varchar(1000) DEFAULT '' NOT NULL, + topic_last_post_subject varchar(100) DEFAULT '' NOT NULL, topic_last_post_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_post_time >= 0), topic_last_view_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_view_time >= 0), topic_moved_id INT4 DEFAULT '0' NOT NULL CHECK (topic_moved_id >= 0), topic_bumped INT2 DEFAULT '0' NOT NULL CHECK (topic_bumped >= 0), topic_bumper INT4 DEFAULT '0' NOT NULL CHECK (topic_bumper >= 0), - poll_title varchar(1000) DEFAULT '' NOT NULL, + poll_title varchar(100) DEFAULT '' NOT NULL, poll_start INT4 DEFAULT '0' NOT NULL CHECK (poll_start >= 0), poll_length INT4 DEFAULT '0' NOT NULL CHECK (poll_length >= 0), poll_max_options INT2 DEFAULT '1' NOT NULL, @@ -1158,6 +1157,7 @@ CREATE TABLE phpbb_topics ( CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id); CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type); CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time); +CREATE INDEX phpbb_topics_topic_approved ON phpbb_topics (topic_approved); CREATE INDEX phpbb_topics_fid_time_moved ON phpbb_topics (forum_id, topic_last_post_time, topic_moved_id); /* @@ -1276,7 +1276,7 @@ CREATE TABLE phpbb_users ( user_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_height >= 0), user_sig TEXT DEFAULT '' NOT NULL, user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL, - user_sig_bbcode_bitfield varchar(252) DEFAULT '' NOT NULL, + user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, user_from varchar(100) DEFAULT '' NOT NULL, user_icq varchar(15) DEFAULT '' NOT NULL, user_aim varchar(255) DEFAULT '' NOT NULL, @@ -1285,7 +1285,7 @@ CREATE TABLE phpbb_users ( user_jabber varchar(255) DEFAULT '' NOT NULL, user_website varchar(200) DEFAULT '' NOT NULL, user_occ varchar(255) DEFAULT '' NOT NULL, - user_interests varchar(8000) DEFAULT '' NOT NULL, + user_interests varchar(4000) DEFAULT '' NOT NULL, user_actkey varchar(32) DEFAULT '' NOT NULL, user_newpasswd varchar(32) DEFAULT '' NOT NULL, PRIMARY KEY (user_id) diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 0d9e443e3a..fde2206db3 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -146,7 +146,7 @@ CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active); # Table: 'phpbb_config' CREATE TABLE phpbb_config ( - config_name varchar(252) NOT NULL DEFAULT '', + config_name varchar(255) NOT NULL DEFAULT '', config_value varchar(255) NOT NULL DEFAULT '', is_dynamic INTEGER UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (config_name) @@ -168,7 +168,7 @@ CREATE INDEX phpbb_confirm_confirm_type ON phpbb_confirm (confirm_type); # Table: 'phpbb_disallow' CREATE TABLE phpbb_disallow ( disallow_id INTEGER PRIMARY KEY NOT NULL , - disallow_username varchar(252) NOT NULL DEFAULT '' + disallow_username varchar(255) NOT NULL DEFAULT '' ); @@ -216,7 +216,7 @@ CREATE TABLE phpbb_forums ( forum_parents mediumtext(16777215) NOT NULL DEFAULT '', forum_name text(65535) NOT NULL DEFAULT '', forum_desc text(65535) NOT NULL DEFAULT '', - forum_desc_bitfield varchar(252) NOT NULL DEFAULT '', + forum_desc_bitfield varchar(255) NOT NULL DEFAULT '', forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', forum_desc_uid varchar(5) NOT NULL DEFAULT '', forum_link varchar(255) NOT NULL DEFAULT '', @@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums ( forum_image varchar(255) NOT NULL DEFAULT '', forum_rules text(65535) NOT NULL DEFAULT '', forum_rules_link varchar(255) NOT NULL DEFAULT '', - forum_rules_bitfield varchar(252) NOT NULL DEFAULT '', + forum_rules_bitfield varchar(255) NOT NULL DEFAULT '', forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '7', forum_rules_uid varchar(5) NOT NULL DEFAULT '', forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0', @@ -287,9 +287,9 @@ CREATE INDEX phpbb_forums_watch_notify_stat ON phpbb_forums_watch (notify_status CREATE TABLE phpbb_groups ( group_id INTEGER PRIMARY KEY NOT NULL , group_type tinyint(4) NOT NULL DEFAULT '1', - group_name varchar(252) NOT NULL DEFAULT '', + group_name varchar(255) NOT NULL DEFAULT '', group_desc text(65535) NOT NULL DEFAULT '', - group_desc_bitfield varchar(252) NOT NULL DEFAULT '', + group_desc_bitfield varchar(255) NOT NULL DEFAULT '', group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', group_desc_uid varchar(5) NOT NULL DEFAULT '', group_display INTEGER UNSIGNED NOT NULL DEFAULT '0', @@ -355,7 +355,7 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id); CREATE TABLE phpbb_moderator_cache ( forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0', user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - username varchar(252) NOT NULL DEFAULT '', + username varchar(255) NOT NULL DEFAULT '', group_id INTEGER UNSIGNED NOT NULL DEFAULT '0', group_name varchar(255) NOT NULL DEFAULT '', display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1' @@ -421,12 +421,12 @@ CREATE TABLE phpbb_posts ( enable_smilies INTEGER UNSIGNED NOT NULL DEFAULT '1', enable_magic_url INTEGER UNSIGNED NOT NULL DEFAULT '1', enable_sig INTEGER UNSIGNED NOT NULL DEFAULT '1', - post_username varchar(252) NOT NULL DEFAULT '', + post_username varchar(255) NOT NULL DEFAULT '', post_subject text(65535) NOT NULL DEFAULT '', post_text mediumtext(16777215) NOT NULL DEFAULT '', post_checksum varchar(32) NOT NULL DEFAULT '', post_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0', - bbcode_bitfield varchar(252) NOT NULL DEFAULT '', + bbcode_bitfield varchar(255) NOT NULL DEFAULT '', bbcode_uid varchar(5) NOT NULL DEFAULT '', post_postcount INTEGER UNSIGNED NOT NULL DEFAULT '1', post_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0', @@ -441,8 +441,7 @@ CREATE INDEX phpbb_posts_topic_id ON phpbb_posts (topic_id); CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip); CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id); CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved); -CREATE INDEX phpbb_posts_post_postcount ON phpbb_posts (post_postcount); -CREATE INDEX phpbb_posts_post_time ON phpbb_posts (post_time); +CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time); # Table: 'phpbb_privmsgs' CREATE TABLE phpbb_privmsgs ( @@ -461,7 +460,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason text(65535) NOT NULL DEFAULT '', message_edit_user INTEGER UNSIGNED NOT NULL DEFAULT '0', message_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0', - bbcode_bitfield varchar(252) NOT NULL DEFAULT '', + bbcode_bitfield varchar(255) NOT NULL DEFAULT '', bbcode_uid varchar(5) NOT NULL DEFAULT '', message_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0', message_edit_count INTEGER UNSIGNED NOT NULL DEFAULT '0', @@ -686,7 +685,7 @@ CREATE INDEX phpbb_smilies_display_on_post ON phpbb_smilies (display_on_posting) # Table: 'phpbb_styles' CREATE TABLE phpbb_styles ( style_id INTEGER PRIMARY KEY NOT NULL , - style_name varchar(252) NOT NULL DEFAULT '', + style_name varchar(255) NOT NULL DEFAULT '', style_copyright varchar(255) NOT NULL DEFAULT '', style_active INTEGER UNSIGNED NOT NULL DEFAULT '1', template_id tinyint(4) NOT NULL DEFAULT '0', @@ -702,10 +701,10 @@ CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id); # Table: 'phpbb_styles_template' CREATE TABLE phpbb_styles_template ( template_id INTEGER PRIMARY KEY NOT NULL , - template_name varchar(252) NOT NULL DEFAULT '', + template_name varchar(255) NOT NULL DEFAULT '', template_copyright varchar(255) NOT NULL DEFAULT '', template_path varchar(100) NOT NULL DEFAULT '', - bbcode_bitfield varchar(252) NOT NULL DEFAULT 'kNg=', + bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=', template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0' ); @@ -726,7 +725,7 @@ CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (templ # Table: 'phpbb_styles_theme' CREATE TABLE phpbb_styles_theme ( theme_id INTEGER PRIMARY KEY NOT NULL , - theme_name varchar(252) NOT NULL DEFAULT '', + theme_name varchar(255) NOT NULL DEFAULT '', theme_copyright varchar(255) NOT NULL DEFAULT '', theme_path varchar(100) NOT NULL DEFAULT '', theme_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0', @@ -739,7 +738,7 @@ CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_n # Table: 'phpbb_styles_imageset' CREATE TABLE phpbb_styles_imageset ( imageset_id INTEGER PRIMARY KEY NOT NULL , - imageset_name varchar(252) NOT NULL DEFAULT '', + imageset_name varchar(255) NOT NULL DEFAULT '', imageset_copyright varchar(255) NOT NULL DEFAULT '', imageset_path varchar(100) NOT NULL DEFAULT '', site_logo varchar(200) NOT NULL DEFAULT '', @@ -881,6 +880,7 @@ CREATE TABLE phpbb_topics ( CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id); CREATE INDEX phpbb_topics_forum_id_type ON phpbb_topics (forum_id, topic_type); CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time); +CREATE INDEX phpbb_topics_topic_approved ON phpbb_topics (topic_approved); CREATE INDEX phpbb_topics_fid_time_moved ON phpbb_topics (forum_id, topic_last_post_time, topic_moved_id); # Table: 'phpbb_topics_track' @@ -935,7 +935,7 @@ CREATE TABLE phpbb_users ( user_perm_from INTEGER UNSIGNED NOT NULL DEFAULT '0', user_ip varchar(40) NOT NULL DEFAULT '', user_regdate INTEGER UNSIGNED NOT NULL DEFAULT '0', - username varchar(252) NOT NULL DEFAULT '', + username varchar(255) NOT NULL DEFAULT '', user_password varchar(40) NOT NULL DEFAULT '', user_passchg INTEGER UNSIGNED NOT NULL DEFAULT '0', user_email varchar(100) NOT NULL DEFAULT '', @@ -987,7 +987,7 @@ CREATE TABLE phpbb_users ( user_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0', user_sig mediumtext(16777215) NOT NULL DEFAULT '', user_sig_bbcode_uid varchar(5) NOT NULL DEFAULT '', - user_sig_bbcode_bitfield varchar(252) NOT NULL DEFAULT '', + user_sig_bbcode_bitfield varchar(255) NOT NULL DEFAULT '', user_from varchar(100) NOT NULL DEFAULT '', user_icq varchar(15) NOT NULL DEFAULT '', user_aim varchar(255) NOT NULL DEFAULT '', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 936a9dfc79..0933f95aa6 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -161,6 +161,7 @@ $lang = array_merge($lang, array( 'INST_ERR_DB_NO_MYSQL4' => 'The version of MySQL installed on this machine is incompatible with the “MySQL 4.x/5.x” option you have selected. Please try the “MySQL 3.23.x/4.x” option instead.', 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the “MySQL 4.1.x/5.x with MySQLi Extension” option you have selected. Please try the “MySQL 3.23.x/4.x” option instead.', 'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed on this machine requires you to set the NLS_CHARACTERSET parameter to UTF8. Either upgrade your installation to 9.2+ or change the parameter.', + 'INST_ERR_DB_NO_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.', 'INST_ERR_DB_NO_POSTGRES' => 'The database you have selected was not created in UNICODE or UTF8 encoding. Try installing with a database in UNICODE or UTF8 encoding', 'INST_ERR_DB_NO_NAME' => 'No database name specified', 'INST_ERR_EMAIL_INVALID' => 'The email address you entered is invalid',