From 80162a8145d1d3c5a75a7651bb1efe2daee5245f Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sun, 20 Aug 2006 12:59:15 +0000 Subject: Minor schema change related to avatars so that they can be > 127px in size Add additional note about the install directory Remove some empty tags from the template git-svn-id: file:///svn/phpbb/trunk@6305 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 1cc5494e53..bf4ca84ade 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1740,8 +1740,8 @@ function get_schema_struct() 'user_options' => array('UINT:11', 893), 'user_avatar' => array('VCHAR', ''), 'user_avatar_type' => array('TINT:2', 0), - 'user_avatar_width' => array('TINT:4', 0), - 'user_avatar_height' => array('TINT:4', 0), + 'user_avatar_width' => array('USINT', 0), + 'user_avatar_height' => array('USINT', 0), 'user_sig' => array('MTEXT', ''), 'user_sig_bbcode_uid' => array('VCHAR:5', ''), 'user_sig_bbcode_bitfield' => array('VCHAR:252', ''), -- cgit v1.2.1 From 4553293053ba5ccdd369a181adda30e6ee0159eb Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Mon, 21 Aug 2006 15:58:48 +0000 Subject: Initial batch of colourization changes. This includes: - schema changes for first post and last post - display in viewforum, search and ucp of first post - update of database on posting Still outstanding - display of last post git-svn-id: file:///svn/phpbb/trunk@6309 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index bf4ca84ade..546fcdbe07 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1612,9 +1612,11 @@ function get_schema_struct() 'topic_type' => array('TINT:3', 0), 'topic_first_post_id' => array('UINT', 0), 'topic_first_poster_name' => array('VCHAR', ''), + 'topic_first_poster_colour' => array('VCHAR:6', ''), 'topic_last_post_id' => array('UINT', 0), 'topic_last_poster_id' => array('UINT', 0), 'topic_last_poster_name' => array('VCHAR', ''), + 'topic_last_poster_colour' => array('VCHAR:6', ''), 'topic_last_post_time' => array('TIMESTAMP', 0), 'topic_last_view_time' => array('TIMESTAMP', 0), 'topic_moved_id' => array('UINT', 0), -- cgit v1.2.1 From b0afc8e6320598734ae20e664be9f840ca501f91 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Tue, 22 Aug 2006 11:01:56 +0000 Subject: Phase 2 of the changes This should now be complete git-svn-id: file:///svn/phpbb/trunk@6311 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 546fcdbe07..f3c03a7a69 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -903,6 +903,7 @@ function get_schema_struct() 'forum_last_poster_id' => array('UINT', 0), 'forum_last_post_time' => array('TIMESTAMP', 0), 'forum_last_poster_name'=> array('VCHAR', ''), + 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), 'display_on_index' => array('BOOL', 1), 'enable_indexing' => array('BOOL', 1), -- cgit v1.2.1 From 6568ab756c636490ce74c5beb63b53a353e49fbe Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Fri, 8 Sep 2006 18:00:38 +0000 Subject: Next phase of last post changes + a few minor bugs Note: This template variable is available but will not be used by default git-svn-id: file:///svn/phpbb/trunk@6360 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index f3c03a7a69..9a0f782db6 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -901,6 +901,7 @@ function get_schema_struct() 'forum_topics_real' => array('UINT', 0), 'forum_last_post_id' => array('UINT', 0), 'forum_last_poster_id' => array('UINT', 0), + 'forum_last_post_subject' => array('XSTEXT', ''), 'forum_last_post_time' => array('TIMESTAMP', 0), 'forum_last_poster_name'=> array('VCHAR', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), @@ -1618,6 +1619,7 @@ function get_schema_struct() 'topic_last_poster_id' => array('UINT', 0), 'topic_last_poster_name' => array('VCHAR', ''), 'topic_last_poster_colour' => array('VCHAR:6', ''), + 'topic_last_post_subject' => array('XSTEXT', ''), 'topic_last_post_time' => array('TIMESTAMP', 0), 'topic_last_view_time' => array('TIMESTAMP', 0), 'topic_moved_id' => array('UINT', 0), -- cgit v1.2.1 From b76222cb6e9ed69ee8ed0c09f0196eaaafd33fad Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 13 Sep 2006 16:08:36 +0000 Subject: - fixed some bugs - changed attachment handling a bit - tried to remove target tags out of the code - do not add session ids to urls for bots as well as not creating a new session on each page view for them I bet i introduced some bugs too. ;) git-svn-id: file:///svn/phpbb/trunk@6364 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 9a0f782db6..e7c7b7756f 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -646,6 +646,7 @@ function get_schema_struct() 'topic_id' => array('UINT', 0), 'in_message' => array('BOOL', 0), 'poster_id' => array('UINT', 0), + 'is_orphan' => array('BOOL', 1), 'physical_filename' => array('VCHAR', ''), 'real_filename' => array('VCHAR', ''), 'download_count' => array('UINT', 0), @@ -662,7 +663,7 @@ function get_schema_struct() 'post_msg_id' => array('INDEX', 'post_msg_id'), 'topic_id' => array('INDEX', 'topic_id'), 'poster_id' => array('INDEX', 'poster_id'), - 'filesize' => array('INDEX', 'filesize'), + 'is_orphan' => array('INDEX', 'is_orphan'), ), ); @@ -1398,8 +1399,8 @@ function get_schema_struct() 'code' => array('VCHAR:50', ''), 'emotion' => array('VCHAR:50', ''), 'smiley_url' => array('VCHAR:50', ''), - 'smiley_width' => array('TINT:4', 0), - 'smiley_height' => array('TINT:4', 0), + 'smiley_width' => array('USINT', 0), + 'smiley_height' => array('USINT', 0), 'smiley_order' => array('UINT', 0), 'display_on_posting'=> array('BOOL', 1), ), -- cgit v1.2.1 From fe1367b31e7711b52f103ade06eec538823d467c Mon Sep 17 00:00:00 2001 From: David M Date: Sat, 16 Sep 2006 06:07:06 +0000 Subject: bug fixes schema changes i really hope nothing went wrong git-svn-id: file:///svn/phpbb/trunk@6371 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 311 ++++++++++++++++++++++------------ 1 file changed, 207 insertions(+), 104 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index e7c7b7756f..2e40616b17 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -25,7 +25,7 @@ if (!is_writeable($schema_path)) $schema_data = get_schema_struct(); $dbms_type_map = array( - 'mysql' => array( + 'mysql_41' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', 'UINT' => 'mediumint(8) UNSIGNED', @@ -37,12 +37,44 @@ $dbms_type_map = array( 'VCHAR:' => 'varchar(%d)', 'CHAR:' => 'char(%d)', 'XSTEXT' => 'text', + 'XSTEXT_UNI'=> 'text', 'STEXT' => 'text', + 'STEXT_UNI' => 'text', 'TEXT' => 'text', + 'TEXT_UNI' => 'text', 'MTEXT' => 'mediumtext', + 'MTEXT_UNI' => 'mediumtext', 'TIMESTAMP' => 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_BIN' => 'varchar(252) /*!40101 CHARACTER SET utf8 */ BINARY', + 'VCHAR_UNI' => 'varchar(255)', + 'VCHAR_UNI:'=> 'varchar(%d)', + 'VCHAR_CI' => 'varchar(252)', + 'VARBINARY' => 'varbinary(255)', + ), + + 'mysql_40' => array( + 'INT:' => 'int(%d)', + 'BINT' => 'bigint(20)', + 'UINT' => 'mediumint(8) UNSIGNED', + 'UINT:' => 'int(%d) UNSIGNED', + 'TINT:' => 'tinyint(%d)', + 'USINT' => 'smallint(4) UNSIGNED', + 'BOOL' => 'tinyint(1) UNSIGNED', + 'VCHAR' => 'varchar(255)', + 'VCHAR:' => 'varchar(%d)', + 'CHAR:' => 'char(%d)', + 'XSTEXT' => 'text', + 'XSTEXT_UNI'=> 'text', + 'STEXT' => 'text', + 'STEXT_UNI' => 'text', + 'TEXT' => 'text', + 'TEXT_UNI' => 'text', + 'MTEXT' => 'mediumtext', + 'MTEXT_UNI' => 'mediumtext', + 'TIMESTAMP' => 'int(11) UNSIGNED', + 'DECIMAL' => 'decimal(5,2)', + 'VCHAR_UNI' => 'varchar(255)', + 'VCHAR_UNI:'=> array('varchar(%d)', 'limit' => array('mult', 3, 255, 'text')), 'VCHAR_CI' => 'varchar(252)', 'VARBINARY' => 'varbinary(255)', ), @@ -62,10 +94,15 @@ $dbms_type_map = array( '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', 'TIMESTAMP' => 'INTEGER', 'DECIMAL' => 'DOUBLE PRECISION', - 'VCHAR_BIN' => 'VARCHAR(84) CHARACTER SET UNICODE_FSS', - 'VCHAR_CI' => 'VARCHAR(252)', + '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)', ), @@ -84,10 +121,15 @@ $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]', 'TIMESTAMP' => '[int]', 'DECIMAL' => '[float]', - 'VCHAR_BIN' => '[nvarchar] (252)', - 'VCHAR_CI' => '[varchar] (252)', + 'VCHAR_UNI' => '[nvarchar] (255)', + 'VCHAR_UNI:'=> '[nvarchar] (%d)', + 'VCHAR_CI' => '[nvarchar] (252)', 'VARBINARY' => '[varbinary] (255)', ), @@ -106,9 +148,14 @@ $dbms_type_map = array( 'STEXT' => 'varchar2(3000)', 'TEXT' => 'clob', 'MTEXT' => 'clob', + 'XSTEXT_UNI'=> 'varchar2(1000)', + 'STEXT_UNI' => 'varchar2(3000)', + 'TEXT_UNI' => 'clob', + 'MTEXT_UNI' => 'clob', 'TIMESTAMP' => 'number(11)', 'DECIMAL' => 'number(5, 2)', - 'VCHAR_BIN' => 'nvarchar2(252)', + 'VCHAR_UNI' => 'varchar2(255)', + 'VCHAR_UNI:'=> 'varchar2(%d)', 'VCHAR_CI' => 'varchar2(252)', 'VARBINARY' => 'raw(255)', ), @@ -128,9 +175,14 @@ $dbms_type_map = array( 'STEXT' => 'text(65535)', 'TEXT' => 'text(65535)', 'MTEXT' => 'mediumtext(16777215)', + 'XSTEXT_UNI'=> 'text(65535)', + 'STEXT_UNI' => 'text(65535)', + 'TEXT_UNI' => 'text(65535)', + 'MTEXT_UNI' => 'mediumtext(16777215)', 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_BIN' => 'nvarchar(252)', + 'VCHAR_UNI' => 'varchar(255)', + 'VCHAR_UNI:'=> 'varchar(%d)', 'VCHAR_CI' => 'varchar(252)', 'VARBINARY' => 'blob', ), @@ -150,9 +202,14 @@ $dbms_type_map = array( 'STEXT' => 'varchar(3000)', 'TEXT' => 'varchar(8000)', 'MTEXT' => 'TEXT', + 'XSTEXT_UNI'=> 'varchar(1000)', + 'STEXT_UNI' => 'varchar(3000)', + 'TEXT_UNI' => 'varchar(8000)', + 'MTEXT_UNI' => 'TEXT', 'TIMESTAMP' => 'INT4', // unsigned 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_BIN' => 'varchar(252)', + 'VCHAR_UNI' => 'varchar(255)', + 'VCHAR_UNI:'=> 'varchar(%d)', 'VCHAR_CI' => 'varchar_ci', 'VARBINARY' => 'bytea', ), @@ -160,7 +217,7 @@ $dbms_type_map = array( // A list of types being unsigned for better reference in some db's $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); -$supported_dbms = array('firebird', 'mssql', 'mysql', 'oracle', 'postgres', 'sqlite'); +$supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite'); foreach ($supported_dbms as $dbms) { @@ -171,7 +228,8 @@ foreach ($supported_dbms as $dbms) // Write Header switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': $line = "#\n# MySQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n"; break; @@ -209,7 +267,8 @@ foreach ($supported_dbms as $dbms) // Write comment about table switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': case 'firebird': case 'sqlite': fwrite($fp, "# Table: '{$table_name}'\n"); @@ -228,7 +287,8 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': case 'firebird': case 'oracle': case 'sqlite': @@ -248,8 +308,42 @@ foreach ($supported_dbms as $dbms) if (strpos($column_data[0], ':') !== false) { list($orig_column_type, $column_length) = explode(':', $column_data[0]); + if (!is_array($dbms_type_map[$dbms][$orig_column_type . ':'])) + { + $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'], $column_length); + } + else + { + if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['rule'])) + { + switch ($dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0]) + { + case 'div': + $column_length /= $dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1]; + $column_length = ceil($column_length); + $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); + break; + } + } - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'], $column_length); + if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['limit'])) + { + switch ($dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0]) + { + case 'mult': + $column_length *= $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1]; + if ($column_length > $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2]) + { + $column_type = $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3]; + } + else + { + $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); + } + break; + } + } + } $orig_column_type .= ':'; } else @@ -266,7 +360,8 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': $line .= "\t{$column_name} {$column_type} "; // For hexadecimal values do not use single quotes @@ -412,7 +507,8 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': case 'postgres': $line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n"; break; @@ -493,7 +589,8 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { - case 'mysql': + case 'mysql_40': + case 'mysql_41': $line .= ($key_data[0] == 'INDEX') ? "\tKEY" : ''; $line .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : ''; $line .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n"; @@ -544,12 +641,18 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { - case 'mysql': + case 'mysql_40': // Remove last line delimiter... $line = substr($line, 0, -2); $line .= "\n);\n\n"; break; + case 'mysql_41': + // Remove last line delimiter... + $line = substr($line, 0, -2); + $line .= "\n) CHARACTER SET `utf8` COLLATE `utf8_general_ci`;\n\n"; + break; + // Create Generator case 'firebird': if ($generator !== false) @@ -632,7 +735,7 @@ foreach ($supported_dbms as $dbms) * VCHAR:x => varchar(x) * TIMESTAMP => int(11) UNSIGNED * DECIMAL => decimal number (5,2) -* VCHAR_BIN => varchar(252) BINARY +* VCHAR_UNI => varchar(252) BINARY * VCHAR_CI => varchar_ci for postgresql, others VCHAR */ function get_schema_struct() @@ -650,7 +753,7 @@ function get_schema_struct() 'physical_filename' => array('VCHAR', ''), 'real_filename' => array('VCHAR', ''), 'download_count' => array('UINT', 0), - 'attach_comment' => array('TEXT', ''), + 'attach_comment' => array('TEXT_UNI', ''), 'extension' => array('VCHAR:100', ''), 'mimetype' => array('VCHAR:100', ''), 'filesize' => array('UINT:20', 0), @@ -698,8 +801,8 @@ function get_schema_struct() $schema_data['phpbb_acl_roles'] = array( 'COLUMNS' => array( 'role_id' => array('UINT', NULL, 'auto_increment'), - 'role_name' => array('VCHAR', ''), - 'role_description' => array('TEXT', ''), + 'role_name' => array('VCHAR_UNI', ''), + 'role_description' => array('TEXT_UNI', ''), 'role_type' => array('VCHAR:10', ''), 'role_order' => array('USINT', 0), ), @@ -738,7 +841,7 @@ function get_schema_struct() 'ban_id' => array('UINT', NULL, 'auto_increment'), 'ban_userid' => array('UINT', 0), 'ban_ip' => array('VCHAR:40', ''), - 'ban_email' => array('VCHAR:100', ''), + 'ban_email' => array('VCHAR_UNI:100', ''), 'ban_start' => array('TIMESTAMP', 0), 'ban_end' => array('TIMESTAMP', 0), 'ban_exclude' => array('BOOL', 0), @@ -789,7 +892,7 @@ function get_schema_struct() 'COLUMNS' => array( 'bot_id' => array('UINT', NULL, 'auto_increment'), 'bot_active' => array('BOOL', 1), - 'bot_name' => array('STEXT', ''), + 'bot_name' => array('STEXT_UNI', ''), 'user_id' => array('UINT', 0), 'bot_agent' => array('VCHAR', ''), 'bot_ip' => array('VCHAR', ''), @@ -828,7 +931,7 @@ function get_schema_struct() $schema_data['phpbb_disallow'] = array( 'COLUMNS' => array( 'disallow_id' => array('UINT', NULL, 'auto_increment'), - 'disallow_username' => array('VCHAR:252', ''), + 'disallow_username' => array('VCHAR_UNI:252', ''), ), 'PRIMARY_KEY' => 'disallow_id', ); @@ -840,8 +943,8 @@ function get_schema_struct() 'topic_id' => array('UINT', 0), 'forum_id' => array('UINT', 0), 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT', ''), - 'draft_message' => array('MTEXT', ''), + 'draft_subject' => array('XSTEXT_UNI', ''), + 'draft_message' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'draft_id', 'KEYS' => array( @@ -861,7 +964,7 @@ function get_schema_struct() $schema_data['phpbb_extension_groups'] = array( 'COLUMNS' => array( 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_name' => array('VCHAR', ''), + 'group_name' => array('VCHAR_UNI', ''), 'cat_id' => array('TINT:2', 0), 'allow_group' => array('BOOL', 0), 'download_mode' => array('BOOL', 1), @@ -880,17 +983,17 @@ function get_schema_struct() 'left_id' => array('UINT', 0), 'right_id' => array('UINT', 0), 'forum_parents' => array('MTEXT', ''), - 'forum_name' => array('STEXT', ''), - 'forum_desc' => array('TEXT', ''), + 'forum_name' => array('STEXT_UNI', ''), + 'forum_desc' => array('TEXT_UNI', ''), 'forum_desc_bitfield' => array('VCHAR:252', ''), 'forum_desc_options' => array('UINT:11', 0), 'forum_desc_uid' => array('VCHAR:5', ''), - 'forum_link' => array('VCHAR', ''), - 'forum_password' => array('VCHAR:40', ''), + 'forum_link' => array('VCHAR_UNI', ''), + 'forum_password' => array('VCHAR_UNI:40', ''), 'forum_style' => array('TINT:4', 0), 'forum_image' => array('VCHAR', ''), - 'forum_rules' => array('TEXT', ''), - 'forum_rules_link' => array('VCHAR', ''), + 'forum_rules' => array('TEXT_UNI', ''), + 'forum_rules_link' => array('VCHAR_UNI', ''), 'forum_rules_bitfield' => array('VCHAR:252', ''), 'forum_rules_options' => array('UINT:11', 0), 'forum_rules_uid' => array('VCHAR:5', ''), @@ -902,9 +1005,9 @@ function get_schema_struct() 'forum_topics_real' => array('UINT', 0), 'forum_last_post_id' => array('UINT', 0), 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT', ''), + 'forum_last_post_subject' => array('XSTEXT_UNI', ''), 'forum_last_post_time' => array('TIMESTAMP', 0), - 'forum_last_poster_name'=> array('VCHAR', ''), + 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), 'display_on_index' => array('BOOL', 1), @@ -959,7 +1062,7 @@ function get_schema_struct() 'group_id' => array('UINT', NULL, 'auto_increment'), 'group_type' => array('TINT:4', 1), 'group_name' => array('VCHAR_CI', ''), - 'group_desc' => array('TEXT', ''), + 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:252', ''), 'group_desc_options' => array('UINT:11', 0), 'group_desc_uid' => array('VCHAR:5', ''), @@ -1001,9 +1104,9 @@ function get_schema_struct() 'lang_id' => array('TINT:4', NULL, 'auto_increment'), 'lang_iso' => array('VCHAR:30', ''), 'lang_dir' => array('VCHAR:30', ''), - 'lang_english_name' => array('VCHAR:100', ''), - 'lang_local_name' => array('VCHAR:255', ''), - 'lang_author' => array('VCHAR:255', ''), + 'lang_english_name' => array('VCHAR_UNI:100', ''), + 'lang_local_name' => array('VCHAR_UNI:255', ''), + 'lang_author' => array('VCHAR_UNI:255', ''), ), 'PRIMARY_KEY' => 'lang_id', 'KEYS' => array( @@ -1021,8 +1124,8 @@ function get_schema_struct() 'reportee_id' => array('UINT', 0), 'log_ip' => array('VCHAR:40', ''), 'log_time' => array('TIMESTAMP', 0), - 'log_operation' => array('TEXT', ''), - 'log_data' => array('MTEXT', ''), + 'log_operation' => array('TEXT_UNI', ''), + 'log_data' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'log_id', 'KEYS' => array( @@ -1038,9 +1141,9 @@ function get_schema_struct() 'COLUMNS' => array( 'forum_id' => array('UINT', 0), 'user_id' => array('UINT', 0), - 'username' => array('VCHAR:252', ''), + 'username' => array('VCHAR_UNI:252', ''), 'group_id' => array('UINT', 0), - 'group_name' => array('VCHAR', ''), + 'group_name' => array('VCHAR_UNI', ''), 'display_on_index' => array('BOOL', 1), ), 'KEYS' => array( @@ -1075,7 +1178,7 @@ function get_schema_struct() 'COLUMNS' => array( 'poll_option_id' => array('TINT:4', 0), 'topic_id' => array('UINT', 0), - 'poll_option_text' => array('TEXT', ''), + 'poll_option_text' => array('TEXT_UNI', ''), 'poll_option_total' => array('UINT', 0), ), 'KEYS' => array( @@ -1113,9 +1216,9 @@ function get_schema_struct() 'enable_smilies' => array('BOOL', 1), 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), - 'post_username' => array('VCHAR:252', ''), - 'post_subject' => array('XSTEXT', ''), - 'post_text' => array('MTEXT', ''), + 'post_username' => array('VCHAR_UNI:252', ''), + 'post_subject' => array('XSTEXT_UNI', ''), + 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), 'post_encoding' => array('VCHAR:20', 'iso-8859-1'), 'post_attachment' => array('BOOL', 0), @@ -1123,7 +1226,7 @@ function get_schema_struct() 'bbcode_uid' => array('VCHAR:5', ''), 'post_postcount' => array('BOOL', 1), 'post_edit_time' => array('TIMESTAMP', 0), - 'post_edit_reason' => array('STEXT', ''), + 'post_edit_reason' => array('STEXT_UNI', ''), 'post_edit_user' => array('UINT', 0), 'post_edit_count' => array('USINT', 0), 'post_edit_locked' => array('BOOL', 0), @@ -1152,9 +1255,9 @@ function get_schema_struct() 'enable_smilies' => array('BOOL', 1), 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT', ''), - 'message_text' => array('MTEXT', ''), - 'message_edit_reason' => array('STEXT', ''), + 'message_subject' => array('XSTEXT_UNI', ''), + 'message_text' => array('MTEXT_UNI', ''), + 'message_edit_reason' => array('STEXT_UNI', ''), 'message_edit_user' => array('UINT', 0), 'message_encoding' => array('VCHAR:20', 'iso-8859-1'), 'message_attachment' => array('BOOL', 0), @@ -1162,8 +1265,8 @@ function get_schema_struct() 'bbcode_uid' => array('VCHAR:5', ''), 'message_edit_time' => array('TIMESTAMP', 0), 'message_edit_count' => array('USINT', 0), - 'to_address' => array('TEXT', ''), - 'bcc_address' => array('TEXT', ''), + 'to_address' => array('TEXT_UNI', ''), + 'bcc_address' => array('TEXT_UNI', ''), ), 'PRIMARY_KEY' => 'msg_id', 'KEYS' => array( @@ -1178,7 +1281,7 @@ function get_schema_struct() 'COLUMNS' => array( 'folder_id' => array('UINT', NULL, 'auto_increment'), 'user_id' => array('UINT', 0), - 'folder_name' => array('VCHAR', ''), + 'folder_name' => array('VCHAR_UNI', ''), 'pm_count' => array('UINT', 0), ), 'PRIMARY_KEY' => 'folder_id', @@ -1193,7 +1296,7 @@ function get_schema_struct() 'user_id' => array('UINT', 0), 'rule_check' => array('UINT', 0), 'rule_connection' => array('UINT', 0), - 'rule_string' => array('VCHAR', ''), + 'rule_string' => array('VCHAR_UNI', ''), 'rule_user_id' => array('UINT', 0), 'rule_group_id' => array('UINT', 0), 'rule_action' => array('UINT', 0), @@ -1228,15 +1331,15 @@ function get_schema_struct() $schema_data['phpbb_profile_fields'] = array( 'COLUMNS' => array( 'field_id' => array('UINT', NULL, 'auto_increment'), - 'field_name' => array('VCHAR', ''), + 'field_name' => array('VCHAR_UNI', ''), 'field_type' => array('TINT:4', 0), 'field_ident' => array('VCHAR:20', ''), 'field_length' => array('VCHAR:20', ''), 'field_minlen' => array('VCHAR', ''), 'field_maxlen' => array('VCHAR', ''), - 'field_novalue' => array('VCHAR', ''), - 'field_default_value' => array('VCHAR', ''), - 'field_validation' => array('VCHAR:20', ''), + 'field_novalue' => array('VCHAR_UNI', ''), + 'field_default_value' => array('VCHAR_UNI', ''), + 'field_validation' => array('VCHAR_UNI:20', ''), 'field_required' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0), 'field_hide' => array('BOOL', 0), @@ -1264,7 +1367,7 @@ function get_schema_struct() 'lang_id' => array('UINT', 0), 'option_id' => array('UINT', 0), 'field_type' => array('TINT:4', 0), - 'lang_value' => array('VCHAR', ''), + 'lang_value' => array('VCHAR_UNI', ''), ), 'PRIMARY_KEY' => array('field_id', 'lang_id', 'option_id'), ); @@ -1273,9 +1376,9 @@ function get_schema_struct() 'COLUMNS' => array( 'field_id' => array('UINT', 0), 'lang_id' => array('UINT', 0), - 'lang_name' => array('VCHAR', ''), - 'lang_explain' => array('TEXT', ''), - 'lang_default_value' => array('VCHAR', ''), + 'lang_name' => array('VCHAR_UNI', ''), + 'lang_explain' => array('TEXT_UNI', ''), + 'lang_default_value' => array('VCHAR_UNI', ''), ), 'PRIMARY_KEY' => array('field_id', 'lang_id'), ); @@ -1283,7 +1386,7 @@ function get_schema_struct() $schema_data['phpbb_ranks'] = array( 'COLUMNS' => array( 'rank_id' => array('UINT', NULL, 'auto_increment'), - 'rank_title' => array('VCHAR', ''), + 'rank_title' => array('VCHAR_UNI', ''), 'rank_min' => array('UINT', 0), 'rank_special' => array('BOOL', 0), 'rank_image' => array('VCHAR', ''), @@ -1300,7 +1403,7 @@ function get_schema_struct() 'user_notify' => array('BOOL', 0), 'report_closed' => array('BOOL', 0), 'report_time' => array('TIMESTAMP', 0), - 'report_text' => array('MTEXT', ''), + 'report_text' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'report_id', ); @@ -1308,8 +1411,8 @@ function get_schema_struct() $schema_data['phpbb_reports_reasons'] = array( 'COLUMNS' => array( 'reason_id' => array('USINT', NULL, 'auto_increment'), - 'reason_title' => array('VCHAR', ''), - 'reason_description' => array('MTEXT', ''), + 'reason_title' => array('VCHAR_UNI', ''), + 'reason_description' => array('MTEXT_UNI', ''), 'reason_order' => array('USINT', 0), ), 'PRIMARY_KEY' => 'reason_id', @@ -1319,7 +1422,7 @@ function get_schema_struct() 'COLUMNS' => array( 'search_key' => array('VCHAR:32', ''), 'search_time' => array('TIMESTAMP', 0), - 'search_keywords' => array('MTEXT', ''), + 'search_keywords' => array('MTEXT_UNI', ''), 'search_authors' => array('MTEXT', ''), ), 'PRIMARY_KEY' => 'search_key', @@ -1328,7 +1431,7 @@ function get_schema_struct() $schema_data['phpbb_search_wordlist'] = array( 'COLUMNS' => array( 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word_text' => array('VCHAR_BIN', ''), + 'word_text' => array('VCHAR_UNI', ''), 'word_common' => array('BOOL', 0), ), 'PRIMARY_KEY' => 'word_id', @@ -1358,7 +1461,7 @@ function get_schema_struct() 'session_time' => array('TIMESTAMP', 0), 'session_ip' => array('VCHAR:40', ''), 'session_browser' => array('VCHAR:150', ''), - 'session_page' => array('VCHAR', ''), + 'session_page' => array('VCHAR_UNI', ''), 'session_viewonline' => array('BOOL', 1), 'session_autologin' => array('BOOL', 0), 'session_admin' => array('BOOL', 0), @@ -1396,8 +1499,8 @@ function get_schema_struct() $schema_data['phpbb_smilies'] = array( 'COLUMNS' => array( 'smiley_id' => array('UINT', NULL, 'auto_increment'), - 'code' => array('VCHAR:50', ''), - 'emotion' => array('VCHAR:50', ''), + 'code' => array('VCHAR_UNI:50', ''), + 'emotion' => array('VCHAR_UNI:50', ''), 'smiley_url' => array('VCHAR:50', ''), 'smiley_width' => array('USINT', 0), 'smiley_height' => array('USINT', 0), @@ -1413,8 +1516,8 @@ function get_schema_struct() $schema_data['phpbb_styles'] = array( 'COLUMNS' => array( 'style_id' => array('TINT:4', NULL, 'auto_increment'), - 'style_name' => array('VCHAR:252', ''), - 'style_copyright' => array('VCHAR', ''), + 'style_name' => array('VCHAR_UNI:252', ''), + 'style_copyright' => array('VCHAR_UNI', ''), 'style_active' => array('BOOL', 1), 'template_id' => array('TINT:4', 0), 'theme_id' => array('TINT:4', 0), @@ -1432,8 +1535,8 @@ function get_schema_struct() $schema_data['phpbb_styles_template'] = array( 'COLUMNS' => array( 'template_id' => array('TINT:4', NULL, 'auto_increment'), - 'template_name' => array('VCHAR:252', ''), - 'template_copyright' => array('VCHAR', ''), + 'template_name' => array('VCHAR_UNI:252', ''), + 'template_copyright' => array('VCHAR_UNI', ''), 'template_path' => array('VCHAR:100', ''), 'bbcode_bitfield' => array('VCHAR:252', 'kNg='), 'template_storedb' => array('BOOL', 0), @@ -1450,7 +1553,7 @@ function get_schema_struct() 'template_filename' => array('VCHAR:100', ''), 'template_included' => array('TEXT', ''), 'template_mtime' => array('TIMESTAMP', 0), - 'template_data' => array('MTEXT', ''), + 'template_data' => array('MTEXT_UNI', ''), ), 'KEYS' => array( 'tid' => array('INDEX', 'template_id'), @@ -1461,12 +1564,12 @@ function get_schema_struct() $schema_data['phpbb_styles_theme'] = array( 'COLUMNS' => array( 'theme_id' => array('TINT:4', NULL, 'auto_increment'), - 'theme_name' => array('VCHAR:252', ''), - 'theme_copyright' => array('VCHAR', ''), + 'theme_name' => array('VCHAR_UNI:252', ''), + 'theme_copyright' => array('VCHAR_UNI', ''), 'theme_path' => array('VCHAR:100', ''), 'theme_storedb' => array('BOOL', 0), 'theme_mtime' => array('TIMESTAMP', 0), - 'theme_data' => array('MTEXT', ''), + 'theme_data' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'theme_id', 'KEYS' => array( @@ -1477,8 +1580,8 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset'] = array( 'COLUMNS' => array( 'imageset_id' => array('TINT:4', NULL, 'auto_increment'), - 'imageset_name' => array('VCHAR:252', ''), - 'imageset_copyright' => array('VCHAR', ''), + 'imageset_name' => array('VCHAR_UNI:252', ''), + 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), 'site_logo' => array('VCHAR:200', ''), @@ -1604,7 +1707,7 @@ function get_schema_struct() 'topic_attachment' => array('BOOL', 0), 'topic_approved' => array('BOOL', 1), 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT', ''), + 'topic_title' => array('XSTEXT_UNI', ''), 'topic_poster' => array('UINT', 0), 'topic_time' => array('TIMESTAMP', 0), 'topic_time_limit' => array('TIMESTAMP', 0), @@ -1614,19 +1717,19 @@ function get_schema_struct() 'topic_status' => array('TINT:3', 0), 'topic_type' => array('TINT:3', 0), 'topic_first_post_id' => array('UINT', 0), - 'topic_first_poster_name' => array('VCHAR', ''), + 'topic_first_poster_name' => array('VCHAR_UNI', ''), 'topic_first_poster_colour' => array('VCHAR:6', ''), 'topic_last_post_id' => array('UINT', 0), 'topic_last_poster_id' => array('UINT', 0), - 'topic_last_poster_name' => array('VCHAR', ''), + 'topic_last_poster_name' => array('VCHAR_UNI', ''), 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT', ''), + 'topic_last_post_subject' => array('XSTEXT_UNI', ''), 'topic_last_post_time' => array('TIMESTAMP', 0), 'topic_last_view_time' => array('TIMESTAMP', 0), 'topic_moved_id' => array('UINT', 0), 'topic_bumped' => array('BOOL', 0), 'topic_bumper' => array('UINT', 0), - 'poll_title' => array('XSTEXT', ''), + 'poll_title' => array('XSTEXT_UNI', ''), 'poll_start' => array('TIMESTAMP', 0), 'poll_length' => array('TIMESTAMP', 0), 'poll_max_options' => array('TINT:4', 1), @@ -1701,15 +1804,15 @@ function get_schema_struct() 'user_ip' => array('VCHAR:40', ''), 'user_regdate' => array('TIMESTAMP', 0), 'username' => array('VCHAR_CI', ''), - 'user_password' => array('VCHAR:40', ''), + 'user_password' => array('VCHAR_UNI:40', ''), 'user_passchg' => array('TIMESTAMP', 0), - 'user_email' => array('VCHAR:100', ''), + 'user_email' => array('VCHAR_UNI:100', ''), 'user_email_hash' => array('BINT', 0), 'user_birthday' => array('VCHAR:10', ''), 'user_lastvisit' => array('TIMESTAMP', 0), 'user_lastmark' => array('TIMESTAMP', 0), 'user_lastpost_time' => array('TIMESTAMP', 0), - 'user_lastpage' => array('VCHAR:200', ''), + 'user_lastpage' => array('VCHAR_UNI:200', ''), 'user_last_confirm_key' => array('VCHAR:10', ''), 'user_last_search' => array('TIMESTAMP', 0), 'user_warnings' => array('TINT:4', 0), @@ -1719,7 +1822,7 @@ function get_schema_struct() 'user_lang' => array('VCHAR:30', ''), 'user_timezone' => array('DECIMAL', 0), 'user_dst' => array('BOOL', 0), - 'user_dateformat' => array('VCHAR:30', 'd M Y H:i'), + 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), 'user_style' => array('TINT:4', 0), 'user_rank' => array('UINT', 0), 'user_colour' => array('VCHAR:6', ''), @@ -1748,20 +1851,20 @@ function get_schema_struct() 'user_avatar_type' => array('TINT:2', 0), 'user_avatar_width' => array('USINT', 0), 'user_avatar_height' => array('USINT', 0), - 'user_sig' => array('MTEXT', ''), + 'user_sig' => array('MTEXT_UNI', ''), 'user_sig_bbcode_uid' => array('VCHAR:5', ''), 'user_sig_bbcode_bitfield' => array('VCHAR:252', ''), - 'user_from' => array('VCHAR:100', ''), + 'user_from' => array('VCHAR_UNI:100', ''), 'user_icq' => array('VCHAR:15', ''), - 'user_aim' => array('VCHAR', ''), - 'user_yim' => array('VCHAR', ''), - 'user_msnm' => array('VCHAR', ''), - 'user_jabber' => array('VCHAR', ''), - 'user_website' => array('VCHAR:200', ''), - 'user_occ' => array('VCHAR', ''), - 'user_interests' => array('TEXT', ''), + 'user_aim' => array('VCHAR_UNI', ''), + 'user_yim' => array('VCHAR_UNI', ''), + 'user_msnm' => array('VCHAR_UNI', ''), + 'user_jabber' => array('VCHAR_UNI', ''), + 'user_website' => array('VCHAR_UNI:200', ''), + 'user_occ' => array('VCHAR_UNI', ''), + 'user_interests' => array('TEXT_UNI', ''), 'user_actkey' => array('VCHAR:32', ''), - 'user_newpasswd' => array('VCHAR:32', ''), + 'user_newpasswd' => array('VCHAR_UNI:32', ''), ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( @@ -1786,8 +1889,8 @@ function get_schema_struct() $schema_data['phpbb_words'] = array( 'COLUMNS' => array( 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word' => array('VCHAR', ''), - 'replacement' => array('VCHAR', ''), + 'word' => array('VCHAR_UNI', ''), + 'replacement' => array('VCHAR_UNI', ''), ), 'PRIMARY_KEY' => 'word_id', ); -- cgit v1.2.1 From ea065f3e67ee0c0cb28c88569042461dd8cf2c27 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 17 Sep 2006 22:02:28 +0000 Subject: - no more encoding mixture, say hello to UTF-8 (I'll add a validation solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762] - take local server time into consideration for birthday/age calculation - faster active topic search - allow changing active topic time frame [Bug #4150] - reload stylesheet on language change [Bug #4222] git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 2e40616b17..98a4e14740 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1220,7 +1220,6 @@ function get_schema_struct() 'post_subject' => array('XSTEXT_UNI', ''), 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), - 'post_encoding' => array('VCHAR:20', 'iso-8859-1'), 'post_attachment' => array('BOOL', 0), 'bbcode_bitfield' => array('VCHAR:252', ''), 'bbcode_uid' => array('VCHAR:5', ''), @@ -1259,7 +1258,6 @@ function get_schema_struct() 'message_text' => array('MTEXT_UNI', ''), 'message_edit_reason' => array('STEXT_UNI', ''), 'message_edit_user' => array('UINT', 0), - 'message_encoding' => array('VCHAR:20', 'iso-8859-1'), 'message_attachment' => array('BOOL', 0), 'bbcode_bitfield' => array('VCHAR:252', ''), 'bbcode_uid' => array('VCHAR:5', ''), -- cgit v1.2.1 From b7dab9cdab72b6463121856d26dcfea0eb0df376 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 19 Sep 2006 04:50:02 +0000 Subject: - Oracle now works with large amounts of text - MSSQL now works :P (sans UTF-8 support) - The current schema files work well enough to install, etc. but must be tightened. Will get to it when I get some time... git-svn-id: file:///svn/phpbb/trunk@6381 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 98a4e14740..c655a2245a 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -73,9 +73,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)', ), @@ -121,16 +121,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'=> '[text]', + 'STEXT_UNI' => '[text]', + 'TEXT_UNI' => '[text]', + '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] (252)', + 'VARBINARY' => '[varchar] (255)', ), 'oracle' => array( @@ -863,12 +863,12 @@ function get_schema_struct() 'bbcode_tag' => array('VCHAR:16', ''), 'bbcode_helpline' => array('VCHAR', ''), 'display_on_posting' => array('BOOL', 0), - 'bbcode_match' => array('TEXT', ''), - 'bbcode_tpl' => array('MTEXT', ''), - 'first_pass_match' => array('MTEXT', ''), - 'first_pass_replace' => array('MTEXT', ''), - 'second_pass_match' => array('MTEXT', ''), - 'second_pass_replace' => array('MTEXT', ''), + 'bbcode_match' => array('TEXT_UNI', ''), + 'bbcode_tpl' => array('MTEXT_UNI', ''), + 'first_pass_match' => array('MTEXT_UNI', ''), + 'first_pass_replace' => array('MTEXT_UNI', ''), + 'second_pass_match' => array('MTEXT_UNI', ''), + 'second_pass_replace' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'bbcode_id', 'KEYS' => array( -- cgit v1.2.1 From 1d7e3e0fd95fb5baf92937d1f911649cb1a665e9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 22 Sep 2006 22:14:05 +0000 Subject: some tiny fixes here and there git-svn-id: file:///svn/phpbb/trunk@6383 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index c655a2245a..2477b4aea5 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -986,7 +986,7 @@ function get_schema_struct() 'forum_name' => array('STEXT_UNI', ''), 'forum_desc' => array('TEXT_UNI', ''), 'forum_desc_bitfield' => array('VCHAR:252', ''), - 'forum_desc_options' => array('UINT:11', 0), + 'forum_desc_options' => array('UINT:11', 7), 'forum_desc_uid' => array('VCHAR:5', ''), 'forum_link' => array('VCHAR_UNI', ''), 'forum_password' => array('VCHAR_UNI:40', ''), @@ -995,7 +995,7 @@ function get_schema_struct() 'forum_rules' => array('TEXT_UNI', ''), 'forum_rules_link' => array('VCHAR_UNI', ''), 'forum_rules_bitfield' => array('VCHAR:252', ''), - 'forum_rules_options' => array('UINT:11', 0), + 'forum_rules_options' => array('UINT:11', 7), 'forum_rules_uid' => array('VCHAR:5', ''), 'forum_topics_per_page' => array('TINT:4', 0), 'forum_type' => array('TINT:4', 0), @@ -1064,7 +1064,7 @@ function get_schema_struct() 'group_name' => array('VCHAR_CI', ''), 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:252', ''), - 'group_desc_options' => array('UINT:11', 0), + 'group_desc_options' => array('UINT:11', 7), 'group_desc_uid' => array('VCHAR:5', ''), 'group_display' => array('BOOL', 0), 'group_avatar' => array('VCHAR', ''), -- cgit v1.2.1 From cb31a4446d2ca40860c6d08bc34a30f10c70f8e5 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sun, 24 Sep 2006 12:24:22 +0000 Subject: Forgot this one yesterday git-svn-id: file:///svn/phpbb/trunk@6400 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 2477b4aea5..cad8c7fbe6 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1816,6 +1816,8 @@ function get_schema_struct() 'user_warnings' => array('TINT:4', 0), 'user_last_warning' => array('TIMESTAMP', 0), 'user_login_attempts' => array('TINT:4', 0), + 'user_inactive_reason' => array('TINT:2', 0), + 'user_inactive_time' => array('TIMESTAMP', 0), 'user_posts' => array('UINT', 0), 'user_lang' => array('VCHAR:30', ''), 'user_timezone' => array('DECIMAL', 0), -- cgit v1.2.1 From 734492958eaa2f193db304fd5d4cf050390eff1a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 26 Sep 2006 19:59:41 +0000 Subject: These changes should let olympus scale a little bit better. i haven't adjusted the schemas but added the details to create_schema_files - david is able to build them then in line with his changes. :) git-svn-id: file:///svn/phpbb/trunk@6411 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index cad8c7fbe6..7a0bec11e2 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1237,8 +1237,7 @@ function get_schema_struct() 'poster_ip' => array('INDEX', 'poster_ip'), 'poster_id' => array('INDEX', 'poster_id'), 'post_approved' => array('INDEX', 'post_approved'), - 'post_postcount' => array('INDEX', 'post_postcount'), - 'post_time' => array('INDEX', 'post_time'), + 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), ), ); @@ -1739,6 +1738,7 @@ function get_schema_struct() 'forum_id' => array('INDEX', 'forum_id'), 'forum_id_type' => array('INDEX', array('forum_id', 'topic_type')), 'last_post_time' => array('INDEX', 'topic_last_post_time'), + 'topic_approved' => array('INDEX', 'topic_approved'), 'fid_time_moved' => array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')), ), ); -- cgit v1.2.1 From bc15445b58403c92ebca9e23ef3d9a59fbdccc92 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 1 Oct 2006 08:48:32 +0000 Subject: - forgot to make the same change to the ODBC driver - MySQL 3.x works now - FirebirdSQL is now on the same level as MySQL and PostgreSQL, zero hacks exist inside the core code now git-svn-id: file:///svn/phpbb/trunk@6422 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 145 +++++++++++++++++----------------- 1 file changed, 74 insertions(+), 71 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') 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 << Date: Mon, 2 Oct 2006 15:32:41 +0000 Subject: #4572 git-svn-id: file:///svn/phpbb/trunk@6430 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 2aad6c3900..96c46eca22 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -354,6 +354,10 @@ foreach ($supported_dbms as $dbms) { $orig_column_type = $column_data[0]; $column_type = $dbms_type_map[$dbms][$column_data[0]]; + if ($column_type == 'text') + { + $modded_array[$column_name] = $column_type; + } } // Adjust default value if db-dependant specified -- cgit v1.2.1 From 5284f321789b5d0456b48a529ed59a99956020e8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 3 Oct 2006 18:35:59 +0000 Subject: - extend config checking to include check for writeable path - removed not utilized user_allow_email column from schema - removed inactive groups (they had no use at all, since inactive users are not able to login) The only benefit those brought are distinguish users - but this is no longer needed too due to the inactive code present. This also allows us to retain group memberships as well as default settings for users being set inactive due to profile changes. - rewrote user_active_flip to support multiple users and a mode, as well as coping with the aforementioned changes - implemented updated jabber class to support SRV server records and for better jabberd2 support. - jabber errors now logged to the error log with a full transaction - fixed user_delete calls to include usernames where possible and also update last post information correctly - implemented additioal checks to user management to cope with common mistakes - On installation, guess the required mysql schema as best as possible. Users now only need to decide if they want to use the mysqli extension or not (mysqli selected by default) and no longer need to know their mysql version. - founders do not need to re-activate their account on profile changes - remove older session if re-authentication was successful (re-authentication always assigns a new session id) - set the cookie directly instead of using php's function - added inactive_remind to see which users got deactivated because of reminders (or re-activation) sent out hopefully not introduced too many bugs - those testing with CVS releases, please concentrate on user registration, activation, profile changes (email/password)... git-svn-id: file:///svn/phpbb/trunk@6436 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 96c46eca22..a490ed4cae 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1870,7 +1870,6 @@ function get_schema_struct() 'user_notify_pm' => array('BOOL', 1), 'user_notify_type' => array('TINT:4', 0), 'user_allow_pm' => array('BOOL', 1), - 'user_allow_email' => array('BOOL', 1), 'user_allow_viewonline' => array('BOOL', 1), 'user_allow_viewemail' => array('BOOL', 1), 'user_allow_massemail' => array('BOOL', 1), -- cgit v1.2.1 From c63392c89e063fc8b8c430e0f6b76e2e9cf42753 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 10 Oct 2006 01:46:59 +0000 Subject: new collation for MySQL >= 4.1.3, should be a tad faster git-svn-id: file:///svn/phpbb/trunk@6473 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index a490ed4cae..d88613f26f 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -678,7 +678,7 @@ foreach ($supported_dbms as $dbms) case 'mysql_41': // Remove last line delimiter... $line = substr($line, 0, -2); - $line .= "\n) CHARACTER SET `utf8` COLLATE `utf8_general_ci`;\n\n"; + $line .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;\n\n"; break; // Create Generator -- cgit v1.2.1 From 31463d2ccc1b2df8ed41ed055e57059f50b9a960 Mon Sep 17 00:00:00 2001 From: David M Date: Wed, 11 Oct 2006 19:56:27 +0000 Subject: #4700 git-svn-id: file:///svn/phpbb/trunk@6480 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index d88613f26f..7e5232a445 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -373,7 +373,7 @@ foreach ($supported_dbms as $dbms) $line .= "\t{$column_name} {$column_type} "; // For hexadecimal values do not use single quotes - if (!is_null($column_data[1])) + if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text') { $line .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; } -- cgit v1.2.1 From c65048bd9132175e9ba780457fdf00438932c5fe Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 13 Oct 2006 22:10:18 +0000 Subject: - introducing clean usernames, needs to be tested more, I'm not sure I didn't miss anything - homograph list should probably be extended git-svn-id: file:///svn/phpbb/trunk@6494 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 7e5232a445..f4a4f80e60 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1830,6 +1830,7 @@ function get_schema_struct() 'user_ip' => array('VCHAR:40', ''), 'user_regdate' => array('TIMESTAMP', 0), 'username' => array('VCHAR_CI', ''), + 'username_clean' => array('VCHAR_CI', ''), 'user_password' => array('VCHAR_UNI:40', ''), 'user_passchg' => array('TIMESTAMP', 0), 'user_email' => array('VCHAR_UNI:100', ''), @@ -1898,7 +1899,7 @@ function get_schema_struct() 'user_birthday' => array('INDEX', 'user_birthday'), 'user_email_hash' => array('INDEX', 'user_email_hash'), 'user_type' => array('INDEX', 'user_type'), - 'username' => array('INDEX', 'username'), + 'username_clean' => array('INDEX', 'username_clean'), ), ); -- cgit v1.2.1 From 3d0759974b3679aa75f23840e0b2f7c725091560 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 10 Nov 2006 13:49:52 +0000 Subject: - some fixes - added script for easy adjustement of username_clean column within the users table (please see the note i added to the utf8_clean_string() function) git-svn-id: file:///svn/phpbb/trunk@6561 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/develop/create_schema_files.php') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index f4a4f80e60..b6fe49ced1 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); @@ -1899,7 +1899,7 @@ function get_schema_struct() 'user_birthday' => array('INDEX', 'user_birthday'), 'user_email_hash' => array('INDEX', 'user_email_hash'), 'user_type' => array('INDEX', 'user_type'), - 'username_clean' => array('INDEX', 'username_clean'), + 'username_clean' => array('INDEX', 'username_clean'), ), ); -- cgit v1.2.1