From 48fc908e6b0d1b18f679278297213738c0647bc1 Mon Sep 17 00:00:00 2001 From: hjpotter92 Date: Fri, 28 Feb 2014 03:58:32 +0530 Subject: [ticket/11875] Upgrade default data type from MEDIUMINT to INT Use 4-byte data type INT(10) for user_id, post_id and topic_id across all tables instead of previously used 3-byte MEDIUMINT(8) PHPBB3-11875 --- phpBB/includes/db/schema_data.php | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php index 0447895433..72e8035821 100644 --- a/phpBB/includes/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php @@ -53,7 +53,7 @@ $schema_data['phpbb_attachments'] = array( 'COLUMNS' => array( 'attach_id' => array('UINT', NULL, 'auto_increment'), 'post_msg_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), 'in_message' => array('BOOL', 0), 'poster_id' => array('UINT', 0), 'is_orphan' => array('BOOL', 1), @@ -135,7 +135,7 @@ $schema_data['phpbb_acl_roles_data'] = array( $schema_data['phpbb_acl_users'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), 'auth_option_id' => array('UINT', 0), 'auth_role_id' => array('UINT', 0), @@ -190,8 +190,8 @@ $schema_data['phpbb_bbcodes'] = array( $schema_data['phpbb_bookmarks'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), + 'user_id' => array('UINT:10', 0), ), 'PRIMARY_KEY' => array('topic_id', 'user_id'), ); @@ -201,7 +201,7 @@ $schema_data['phpbb_bots'] = array( 'bot_id' => array('UINT', NULL, 'auto_increment'), 'bot_active' => array('BOOL', 1), 'bot_name' => array('STEXT_UNI', ''), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'bot_agent' => array('VCHAR', ''), 'bot_ip' => array('VCHAR', ''), ), @@ -257,8 +257,8 @@ $schema_data['phpbb_disallow'] = array( $schema_data['phpbb_drafts'] = array( 'COLUMNS' => array( 'draft_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), + 'topic_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), 'save_time' => array('TIMESTAMP', 0), 'draft_subject' => array('STEXT_UNI', ''), @@ -363,7 +363,7 @@ $schema_data['phpbb_forums'] = array( $schema_data['phpbb_forums_access'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'session_id' => array('CHAR:32', ''), ), 'PRIMARY_KEY' => array('forum_id', 'user_id', 'session_id'), @@ -371,7 +371,7 @@ $schema_data['phpbb_forums_access'] = array( $schema_data['phpbb_forums_track'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), 'mark_time' => array('TIMESTAMP', 0), ), @@ -381,7 +381,7 @@ $schema_data['phpbb_forums_track'] = array( $schema_data['phpbb_forums_watch'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'notify_status' => array('BOOL', 0), ), 'KEYS' => array( @@ -455,9 +455,9 @@ $schema_data['phpbb_log'] = array( 'COLUMNS' => array( 'log_id' => array('UINT', NULL, 'auto_increment'), 'log_type' => array('TINT:4', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), 'reportee_id' => array('UINT', 0), 'log_ip' => array('VCHAR:40', ''), 'log_time' => array('TIMESTAMP', 0), @@ -481,7 +481,7 @@ $schema_data['phpbb_login_attempts'] = array( 'attempt_browser' => array('VCHAR:150', ''), 'attempt_forwarded_for' => array('VCHAR:255', ''), 'attempt_time' => array('TIMESTAMP', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'username' => array('VCHAR_UNI:255', 0), 'username_clean' => array('VCHAR_CI', 0), ), @@ -496,7 +496,7 @@ $schema_data['phpbb_login_attempts'] = array( $schema_data['phpbb_moderator_cache'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'username' => array('VCHAR_UNI:255', ''), 'group_id' => array('UINT', 0), 'group_name' => array('VCHAR_UNI', ''), @@ -561,7 +561,7 @@ $schema_data['phpbb_notifications'] = array( 'notification_type_id' => array('USINT', 0), 'item_id' => array('UINT', 0), 'item_parent_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'notification_read' => array('BOOL', 0), 'notification_time' => array('TIMESTAMP', 1), 'notification_data' => array('TEXT_UNI', ''), @@ -575,7 +575,7 @@ $schema_data['phpbb_notifications'] = array( $schema_data['phpbb_oauth_accounts'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'provider' => array('VCHAR', ''), 'oauth_provider_id' => array('TEXT_UNI', ''), ), @@ -587,7 +587,7 @@ $schema_data['phpbb_oauth_accounts'] = array( $schema_data['phpbb_oauth_tokens'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), // phpbb_users.user_id + 'user_id' => array('UINT:10', 0), // phpbb_users.user_id 'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set 'provider' => array('VCHAR', ''), // Name of the OAuth provider 'oauth_token' => array('MTEXT', ''), // Serialized token @@ -601,7 +601,7 @@ $schema_data['phpbb_oauth_tokens'] = array( $schema_data['phpbb_poll_options'] = array( 'COLUMNS' => array( 'poll_option_id' => array('TINT:4', 0), - 'topic_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), 'poll_option_text' => array('TEXT_UNI', ''), 'poll_option_total' => array('UINT', 0), ), @@ -613,7 +613,7 @@ $schema_data['phpbb_poll_options'] = array( $schema_data['phpbb_poll_votes'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), 'poll_option_id' => array('TINT:4', 0), 'vote_user_id' => array('UINT', 0), 'vote_user_ip' => array('VCHAR:40', ''), @@ -627,8 +627,8 @@ $schema_data['phpbb_poll_votes'] = array( $schema_data['phpbb_posts'] = array( 'COLUMNS' => array( - 'post_id' => array('UINT', NULL, 'auto_increment'), - 'topic_id' => array('UINT', 0), + 'post_id' => array('UINT:10', NULL, 'auto_increment'), + 'topic_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), 'poster_id' => array('UINT', 0), 'icon_id' => array('UINT', 0), @@ -706,7 +706,7 @@ $schema_data['phpbb_privmsgs'] = array( $schema_data['phpbb_privmsgs_folder'] = array( 'COLUMNS' => array( 'folder_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'folder_name' => array('VCHAR_UNI', ''), 'pm_count' => array('UINT', 0), ), @@ -719,7 +719,7 @@ $schema_data['phpbb_privmsgs_folder'] = array( $schema_data['phpbb_privmsgs_rules'] = array( 'COLUMNS' => array( 'rule_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'rule_check' => array('UINT', 0), 'rule_connection' => array('UINT', 0), 'rule_string' => array('VCHAR_UNI', ''), @@ -737,7 +737,7 @@ $schema_data['phpbb_privmsgs_rules'] = array( $schema_data['phpbb_privmsgs_to'] = array( 'COLUMNS' => array( 'msg_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'author_id' => array('UINT', 0), 'pm_deleted' => array('BOOL', 0), 'pm_new' => array('BOOL', 1), @@ -787,7 +787,7 @@ $schema_data['phpbb_profile_fields'] = array( $schema_data['phpbb_profile_fields_data'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'pf_phpbb_location' => array('VCHAR', ''), 'pf_phpbb_interests' => array('TEXT_UNI', ''), 'pf_phpbb_occupation' => array('TEXT_UNI', ''), @@ -832,9 +832,9 @@ $schema_data['phpbb_reports'] = array( 'COLUMNS' => array( 'report_id' => array('UINT', NULL, 'auto_increment'), 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT', 0), + 'post_id' => array('UINT:10', 0), 'pm_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'user_notify' => array('BOOL', 0), 'report_closed' => array('BOOL', 0), 'report_time' => array('TIMESTAMP', 0), @@ -889,7 +889,7 @@ $schema_data['phpbb_search_wordlist'] = array( $schema_data['phpbb_search_wordmatch'] = array( 'COLUMNS' => array( - 'post_id' => array('UINT', 0), + 'post_id' => array('UINT:10', 0), 'word_id' => array('UINT', 0), 'title_match' => array('BOOL', 0), ), @@ -927,7 +927,7 @@ $schema_data['phpbb_sessions'] = array( $schema_data['phpbb_sessions_keys'] = array( 'COLUMNS' => array( 'key_id' => array('CHAR:32', ''), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'last_ip' => array('VCHAR:40', ''), 'last_login' => array('TIMESTAMP', 0), ), @@ -995,7 +995,7 @@ $schema_data['phpbb_teampage'] = array( $schema_data['phpbb_topics'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT', NULL, 'auto_increment'), + 'topic_id' => array('UINT:10', NULL, 'auto_increment'), 'forum_id' => array('UINT', 0), 'icon_id' => array('UINT', 0), 'topic_attachment' => array('BOOL', 0), @@ -1047,8 +1047,8 @@ $schema_data['phpbb_topics'] = array( $schema_data['phpbb_topics_track'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), + 'topic_id' => array('UINT:10', 0), 'forum_id' => array('UINT', 0), 'mark_time' => array('TIMESTAMP', 0), ), @@ -1061,8 +1061,8 @@ $schema_data['phpbb_topics_track'] = array( $schema_data['phpbb_topics_posted'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), + 'topic_id' => array('UINT:10', 0), 'topic_posted' => array('BOOL', 0), ), 'PRIMARY_KEY' => array('user_id', 'topic_id'), @@ -1070,8 +1070,8 @@ $schema_data['phpbb_topics_posted'] = array( $schema_data['phpbb_topics_watch'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT:10', 0), + 'user_id' => array('UINT:10', 0), 'notify_status' => array('BOOL', 0), ), 'KEYS' => array( @@ -1085,7 +1085,7 @@ $schema_data['phpbb_user_notifications'] = array( 'COLUMNS' => array( 'item_type' => array('VCHAR:255', ''), 'item_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'method' => array('VCHAR:255', ''), 'notify' => array('BOOL', 1), ), @@ -1094,7 +1094,7 @@ $schema_data['phpbb_user_notifications'] = array( $schema_data['phpbb_user_group'] = array( 'COLUMNS' => array( 'group_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'group_leader' => array('BOOL', 0), 'user_pending' => array('BOOL', 1), ), @@ -1107,7 +1107,7 @@ $schema_data['phpbb_user_group'] = array( $schema_data['phpbb_users'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', NULL, 'auto_increment'), + 'user_id' => array('UINT:10', NULL, 'auto_increment'), 'user_type' => array('TINT:2', 0), 'group_id' => array('UINT', 3), 'user_permissions' => array('MTEXT', ''), @@ -1192,8 +1192,8 @@ $schema_data['phpbb_users'] = array( $schema_data['phpbb_warnings'] = array( 'COLUMNS' => array( 'warning_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'post_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), + 'post_id' => array('UINT:10', 0), 'log_id' => array('UINT', 0), 'warning_time' => array('TIMESTAMP', 0), ), @@ -1211,7 +1211,7 @@ $schema_data['phpbb_words'] = array( $schema_data['phpbb_zebra'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT', 0), + 'user_id' => array('UINT:10', 0), 'zebra_id' => array('UINT', 0), 'friend' => array('BOOL', 0), 'foe' => array('BOOL', 0), -- cgit v1.2.1 From f6e45ed24420e719a969ffd301cf019ba0aa912a Mon Sep 17 00:00:00 2001 From: hjpotter92 Date: Sun, 2 Mar 2014 21:58:10 +0530 Subject: [ticket/11875] Create new map for UNSIGNED 4-byte integer ULINT => Unsigned Large INTeger --- phpBB/includes/db/schema_data.php | 85 ++++++++++++++++++++------------------- phpBB/phpbb/db/tools.php | 12 +++++- 2 files changed, 53 insertions(+), 44 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php index 72e8035821..dc85ff327b 100644 --- a/phpBB/includes/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php @@ -29,6 +29,7 @@ $schema_data = array(); * Column Types: * INT:x => SIGNED int(x) * BINT => BIGINT +* ULINT => UNSIGNED int(10) * UINT => mediumint(8) UNSIGNED * UINT:x => int(x) UNSIGNED * TINT:x => tinyint(x) @@ -53,7 +54,7 @@ $schema_data['phpbb_attachments'] = array( 'COLUMNS' => array( 'attach_id' => array('UINT', NULL, 'auto_increment'), 'post_msg_id' => array('UINT', 0), - 'topic_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), 'in_message' => array('BOOL', 0), 'poster_id' => array('UINT', 0), 'is_orphan' => array('BOOL', 1), @@ -135,7 +136,7 @@ $schema_data['phpbb_acl_roles_data'] = array( $schema_data['phpbb_acl_users'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), 'auth_option_id' => array('UINT', 0), 'auth_role_id' => array('UINT', 0), @@ -190,8 +191,8 @@ $schema_data['phpbb_bbcodes'] = array( $schema_data['phpbb_bookmarks'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT:10', 0), - 'user_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), + 'user_id' => array('ULINT', 0), ), 'PRIMARY_KEY' => array('topic_id', 'user_id'), ); @@ -201,7 +202,7 @@ $schema_data['phpbb_bots'] = array( 'bot_id' => array('UINT', NULL, 'auto_increment'), 'bot_active' => array('BOOL', 1), 'bot_name' => array('STEXT_UNI', ''), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'bot_agent' => array('VCHAR', ''), 'bot_ip' => array('VCHAR', ''), ), @@ -257,8 +258,8 @@ $schema_data['phpbb_disallow'] = array( $schema_data['phpbb_drafts'] = array( 'COLUMNS' => array( 'draft_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT:10', 0), - 'topic_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), 'save_time' => array('TIMESTAMP', 0), 'draft_subject' => array('STEXT_UNI', ''), @@ -363,7 +364,7 @@ $schema_data['phpbb_forums'] = array( $schema_data['phpbb_forums_access'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'session_id' => array('CHAR:32', ''), ), 'PRIMARY_KEY' => array('forum_id', 'user_id', 'session_id'), @@ -371,7 +372,7 @@ $schema_data['phpbb_forums_access'] = array( $schema_data['phpbb_forums_track'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), 'mark_time' => array('TIMESTAMP', 0), ), @@ -381,7 +382,7 @@ $schema_data['phpbb_forums_track'] = array( $schema_data['phpbb_forums_watch'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'notify_status' => array('BOOL', 0), ), 'KEYS' => array( @@ -455,9 +456,9 @@ $schema_data['phpbb_log'] = array( 'COLUMNS' => array( 'log_id' => array('UINT', NULL, 'auto_increment'), 'log_type' => array('TINT:4', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), - 'topic_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), 'reportee_id' => array('UINT', 0), 'log_ip' => array('VCHAR:40', ''), 'log_time' => array('TIMESTAMP', 0), @@ -481,7 +482,7 @@ $schema_data['phpbb_login_attempts'] = array( 'attempt_browser' => array('VCHAR:150', ''), 'attempt_forwarded_for' => array('VCHAR:255', ''), 'attempt_time' => array('TIMESTAMP', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'username' => array('VCHAR_UNI:255', 0), 'username_clean' => array('VCHAR_CI', 0), ), @@ -496,7 +497,7 @@ $schema_data['phpbb_login_attempts'] = array( $schema_data['phpbb_moderator_cache'] = array( 'COLUMNS' => array( 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'username' => array('VCHAR_UNI:255', ''), 'group_id' => array('UINT', 0), 'group_name' => array('VCHAR_UNI', ''), @@ -561,7 +562,7 @@ $schema_data['phpbb_notifications'] = array( 'notification_type_id' => array('USINT', 0), 'item_id' => array('UINT', 0), 'item_parent_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'notification_read' => array('BOOL', 0), 'notification_time' => array('TIMESTAMP', 1), 'notification_data' => array('TEXT_UNI', ''), @@ -575,7 +576,7 @@ $schema_data['phpbb_notifications'] = array( $schema_data['phpbb_oauth_accounts'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'provider' => array('VCHAR', ''), 'oauth_provider_id' => array('TEXT_UNI', ''), ), @@ -587,7 +588,7 @@ $schema_data['phpbb_oauth_accounts'] = array( $schema_data['phpbb_oauth_tokens'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), // phpbb_users.user_id + 'user_id' => array('ULINT', 0), // phpbb_users.user_id 'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set 'provider' => array('VCHAR', ''), // Name of the OAuth provider 'oauth_token' => array('MTEXT', ''), // Serialized token @@ -601,7 +602,7 @@ $schema_data['phpbb_oauth_tokens'] = array( $schema_data['phpbb_poll_options'] = array( 'COLUMNS' => array( 'poll_option_id' => array('TINT:4', 0), - 'topic_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), 'poll_option_text' => array('TEXT_UNI', ''), 'poll_option_total' => array('UINT', 0), ), @@ -613,7 +614,7 @@ $schema_data['phpbb_poll_options'] = array( $schema_data['phpbb_poll_votes'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), 'poll_option_id' => array('TINT:4', 0), 'vote_user_id' => array('UINT', 0), 'vote_user_ip' => array('VCHAR:40', ''), @@ -627,8 +628,8 @@ $schema_data['phpbb_poll_votes'] = array( $schema_data['phpbb_posts'] = array( 'COLUMNS' => array( - 'post_id' => array('UINT:10', NULL, 'auto_increment'), - 'topic_id' => array('UINT:10', 0), + 'post_id' => array('ULINT', NULL, 'auto_increment'), + 'topic_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), 'poster_id' => array('UINT', 0), 'icon_id' => array('UINT', 0), @@ -706,7 +707,7 @@ $schema_data['phpbb_privmsgs'] = array( $schema_data['phpbb_privmsgs_folder'] = array( 'COLUMNS' => array( 'folder_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'folder_name' => array('VCHAR_UNI', ''), 'pm_count' => array('UINT', 0), ), @@ -719,7 +720,7 @@ $schema_data['phpbb_privmsgs_folder'] = array( $schema_data['phpbb_privmsgs_rules'] = array( 'COLUMNS' => array( 'rule_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'rule_check' => array('UINT', 0), 'rule_connection' => array('UINT', 0), 'rule_string' => array('VCHAR_UNI', ''), @@ -737,7 +738,7 @@ $schema_data['phpbb_privmsgs_rules'] = array( $schema_data['phpbb_privmsgs_to'] = array( 'COLUMNS' => array( 'msg_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'author_id' => array('UINT', 0), 'pm_deleted' => array('BOOL', 0), 'pm_new' => array('BOOL', 1), @@ -787,7 +788,7 @@ $schema_data['phpbb_profile_fields'] = array( $schema_data['phpbb_profile_fields_data'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'pf_phpbb_location' => array('VCHAR', ''), 'pf_phpbb_interests' => array('TEXT_UNI', ''), 'pf_phpbb_occupation' => array('TEXT_UNI', ''), @@ -832,9 +833,9 @@ $schema_data['phpbb_reports'] = array( 'COLUMNS' => array( 'report_id' => array('UINT', NULL, 'auto_increment'), 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT:10', 0), + 'post_id' => array('ULINT', 0), 'pm_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'user_notify' => array('BOOL', 0), 'report_closed' => array('BOOL', 0), 'report_time' => array('TIMESTAMP', 0), @@ -889,7 +890,7 @@ $schema_data['phpbb_search_wordlist'] = array( $schema_data['phpbb_search_wordmatch'] = array( 'COLUMNS' => array( - 'post_id' => array('UINT:10', 0), + 'post_id' => array('ULINT', 0), 'word_id' => array('UINT', 0), 'title_match' => array('BOOL', 0), ), @@ -927,7 +928,7 @@ $schema_data['phpbb_sessions'] = array( $schema_data['phpbb_sessions_keys'] = array( 'COLUMNS' => array( 'key_id' => array('CHAR:32', ''), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'last_ip' => array('VCHAR:40', ''), 'last_login' => array('TIMESTAMP', 0), ), @@ -995,7 +996,7 @@ $schema_data['phpbb_teampage'] = array( $schema_data['phpbb_topics'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT:10', NULL, 'auto_increment'), + 'topic_id' => array('ULINT', NULL, 'auto_increment'), 'forum_id' => array('UINT', 0), 'icon_id' => array('UINT', 0), 'topic_attachment' => array('BOOL', 0), @@ -1047,8 +1048,8 @@ $schema_data['phpbb_topics'] = array( $schema_data['phpbb_topics_track'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), - 'topic_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), 'forum_id' => array('UINT', 0), 'mark_time' => array('TIMESTAMP', 0), ), @@ -1061,8 +1062,8 @@ $schema_data['phpbb_topics_track'] = array( $schema_data['phpbb_topics_posted'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), - 'topic_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), 'topic_posted' => array('BOOL', 0), ), 'PRIMARY_KEY' => array('user_id', 'topic_id'), @@ -1070,8 +1071,8 @@ $schema_data['phpbb_topics_posted'] = array( $schema_data['phpbb_topics_watch'] = array( 'COLUMNS' => array( - 'topic_id' => array('UINT:10', 0), - 'user_id' => array('UINT:10', 0), + 'topic_id' => array('ULINT', 0), + 'user_id' => array('ULINT', 0), 'notify_status' => array('BOOL', 0), ), 'KEYS' => array( @@ -1085,7 +1086,7 @@ $schema_data['phpbb_user_notifications'] = array( 'COLUMNS' => array( 'item_type' => array('VCHAR:255', ''), 'item_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'method' => array('VCHAR:255', ''), 'notify' => array('BOOL', 1), ), @@ -1094,7 +1095,7 @@ $schema_data['phpbb_user_notifications'] = array( $schema_data['phpbb_user_group'] = array( 'COLUMNS' => array( 'group_id' => array('UINT', 0), - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'group_leader' => array('BOOL', 0), 'user_pending' => array('BOOL', 1), ), @@ -1107,7 +1108,7 @@ $schema_data['phpbb_user_group'] = array( $schema_data['phpbb_users'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', NULL, 'auto_increment'), + 'user_id' => array('ULINT', NULL, 'auto_increment'), 'user_type' => array('TINT:2', 0), 'group_id' => array('UINT', 3), 'user_permissions' => array('MTEXT', ''), @@ -1192,8 +1193,8 @@ $schema_data['phpbb_users'] = array( $schema_data['phpbb_warnings'] = array( 'COLUMNS' => array( 'warning_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT:10', 0), - 'post_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), + 'post_id' => array('ULINT', 0), 'log_id' => array('UINT', 0), 'warning_time' => array('TIMESTAMP', 0), ), @@ -1211,7 +1212,7 @@ $schema_data['phpbb_words'] = array( $schema_data['phpbb_zebra'] = array( 'COLUMNS' => array( - 'user_id' => array('UINT:10', 0), + 'user_id' => array('ULINT', 0), 'zebra_id' => array('UINT', 0), 'friend' => array('BOOL', 0), 'foe' => array('BOOL', 0), diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 3a7207e743..7f143873b1 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -44,6 +44,7 @@ class tools 'mysql_41' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', + 'ULINT' => 'INT(10) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', @@ -74,6 +75,7 @@ class tools 'mysql_40' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', + 'ULINT' => 'INT(10) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', @@ -104,6 +106,7 @@ class tools 'firebird' => array( 'INT:' => 'INTEGER', 'BINT' => 'DOUBLE PRECISION', + 'ULINT' => 'INTEGER', 'UINT' => 'INTEGER', 'UINT:' => 'INTEGER', 'TINT:' => 'INTEGER', @@ -134,6 +137,7 @@ class tools 'mssql' => array( 'INT:' => '[int]', 'BINT' => '[float]', + 'ULINT' => '[int]', 'UINT' => '[int]', 'UINT:' => '[int]', 'TINT:' => '[int]', @@ -164,6 +168,7 @@ class tools 'mssqlnative' => array( 'INT:' => '[int]', 'BINT' => '[float]', + 'ULINT' => '[int]', 'UINT' => '[int]', 'UINT:' => '[int]', 'TINT:' => '[int]', @@ -194,6 +199,7 @@ class tools 'oracle' => array( 'INT:' => 'number(%d)', 'BINT' => 'number(20)', + 'ULINT' => 'number(10)', 'UINT' => 'number(8)', 'UINT:' => 'number(%d)', 'TINT:' => 'number(%d)', @@ -224,7 +230,8 @@ class tools 'sqlite' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', - 'UINT' => 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED', + 'ULINT' => 'INTEGER UNSIGNED', // 'int(10) UNSIGNED + 'UINT' => 'INTEGER UNSIGNED', // 'mediumint(8) UNSIGNED', 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', @@ -254,6 +261,7 @@ class tools 'postgres' => array( 'INT:' => 'INT4', 'BINT' => 'INT8', + 'ULINT' => 'INT4', // unsigned 'UINT' => 'INT4', // unsigned 'UINT:' => 'INT4', // unsigned 'USINT' => 'INT2', // unsigned @@ -287,7 +295,7 @@ class tools * A list of types being unsigned for better reference in some db's * @var array */ - var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); + var $unsigned_types = array('ULINT', 'UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); /** * A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules. -- cgit v1.2.1 From 7696f39ac3ecb803468f230129a76dac59f2972b Mon Sep 17 00:00:00 2001 From: hjpotter92 Date: Sun, 2 Mar 2014 23:23:44 +0530 Subject: [ticket/11875] Recreate schemas for install PHPBB3-11875 --- phpBB/install/schemas/mysql_40_schema.sql | 84 +++++++++++++++---------------- phpBB/install/schemas/mysql_41_schema.sql | 84 +++++++++++++++---------------- phpBB/install/schemas/oracle_schema.sql | 84 +++++++++++++++---------------- phpBB/install/schemas/postgres_schema.sql | 78 ++++++++++++++-------------- phpBB/phpbb/db/tools.php | 8 +-- 5 files changed, 169 insertions(+), 169 deletions(-) (limited to 'phpBB') diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 16c26fac4a..93a90e3a7c 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -7,7 +7,7 @@ CREATE TABLE phpbb_attachments ( attach_id mediumint(8) UNSIGNED NOT NULL auto_increment, post_msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, in_message tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, is_orphan tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE phpbb_acl_roles_data ( # Table: 'phpbb_acl_users' CREATE TABLE phpbb_acl_users ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -128,8 +128,8 @@ CREATE TABLE phpbb_bbcodes ( # Table: 'phpbb_bookmarks' CREATE TABLE phpbb_bookmarks ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (topic_id, user_id) ); @@ -139,7 +139,7 @@ CREATE TABLE phpbb_bots ( bot_id mediumint(8) UNSIGNED NOT NULL auto_increment, bot_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, bot_name blob NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, bot_agent varbinary(255) DEFAULT '' NOT NULL, bot_ip varbinary(255) DEFAULT '' NOT NULL, PRIMARY KEY (bot_id), @@ -189,8 +189,8 @@ CREATE TABLE phpbb_disallow ( # Table: 'phpbb_drafts' CREATE TABLE phpbb_drafts ( draft_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) 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 blob NOT NULL, @@ -289,7 +289,7 @@ CREATE TABLE phpbb_forums ( # Table: 'phpbb_forums_access' CREATE TABLE phpbb_forums_access ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, session_id binary(32) DEFAULT '' NOT NULL, PRIMARY KEY (forum_id, user_id, session_id) ); @@ -297,7 +297,7 @@ CREATE TABLE phpbb_forums_access ( # Table: 'phpbb_forums_track' CREATE TABLE phpbb_forums_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, forum_id) @@ -307,7 +307,7 @@ CREATE TABLE phpbb_forums_track ( # Table: 'phpbb_forums_watch' CREATE TABLE phpbb_forums_watch ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, KEY forum_id (forum_id), KEY user_id (user_id), @@ -373,9 +373,9 @@ CREATE TABLE phpbb_lang ( CREATE TABLE phpbb_log ( log_id mediumint(8) UNSIGNED NOT NULL auto_increment, log_type tinyint(4) DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, reportee_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, log_ip varbinary(40) DEFAULT '' NOT NULL, log_time int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -397,7 +397,7 @@ CREATE TABLE phpbb_login_attempts ( attempt_browser varbinary(150) DEFAULT '' NOT NULL, attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL, attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, username blob NOT NULL, username_clean blob NOT NULL, KEY att_ip (attempt_ip, attempt_time), @@ -410,7 +410,7 @@ CREATE TABLE phpbb_login_attempts ( # Table: 'phpbb_moderator_cache' CREATE TABLE phpbb_moderator_cache ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, username blob NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, group_name blob NOT NULL, @@ -469,7 +469,7 @@ CREATE TABLE phpbb_notifications ( notification_type_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL, notification_data blob NOT NULL, @@ -481,7 +481,7 @@ CREATE TABLE phpbb_notifications ( # Table: 'phpbb_oauth_accounts' CREATE TABLE phpbb_oauth_accounts ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, provider varbinary(255) DEFAULT '' NOT NULL, oauth_provider_id blob NOT NULL, PRIMARY KEY (user_id, provider) @@ -490,7 +490,7 @@ CREATE TABLE phpbb_oauth_accounts ( # Table: 'phpbb_oauth_tokens' CREATE TABLE phpbb_oauth_tokens ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, session_id binary(32) DEFAULT '' NOT NULL, provider varbinary(255) DEFAULT '' NOT NULL, oauth_token mediumblob NOT NULL, @@ -502,7 +502,7 @@ CREATE TABLE phpbb_oauth_tokens ( # Table: 'phpbb_poll_options' CREATE TABLE phpbb_poll_options ( poll_option_id tinyint(4) DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, poll_option_text blob NOT NULL, poll_option_total mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, KEY poll_opt_id (poll_option_id), @@ -512,7 +512,7 @@ CREATE TABLE phpbb_poll_options ( # Table: 'phpbb_poll_votes' CREATE TABLE phpbb_poll_votes ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, poll_option_id tinyint(4) DEFAULT '0' NOT NULL, vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, vote_user_ip varbinary(40) DEFAULT '' NOT NULL, @@ -524,8 +524,8 @@ CREATE TABLE phpbb_poll_votes ( # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( - post_id mediumint(8) UNSIGNED NOT NULL auto_increment, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED NOT NULL auto_increment, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -599,7 +599,7 @@ CREATE TABLE phpbb_privmsgs ( # Table: 'phpbb_privmsgs_folder' CREATE TABLE phpbb_privmsgs_folder ( folder_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, folder_name blob NOT NULL, pm_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (folder_id), @@ -610,7 +610,7 @@ CREATE TABLE phpbb_privmsgs_folder ( # Table: 'phpbb_privmsgs_rules' CREATE TABLE phpbb_privmsgs_rules ( rule_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, rule_check mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, rule_connection mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, rule_string blob NOT NULL, @@ -626,7 +626,7 @@ CREATE TABLE phpbb_privmsgs_rules ( # Table: 'phpbb_privmsgs_to' CREATE TABLE phpbb_privmsgs_to ( msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, author_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, pm_deleted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, pm_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, @@ -672,7 +672,7 @@ CREATE TABLE phpbb_profile_fields ( # Table: 'phpbb_profile_fields_data' CREATE TABLE phpbb_profile_fields_data ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, pf_phpbb_location varbinary(255) DEFAULT '' NOT NULL, pf_phpbb_interests blob NOT NULL, pf_phpbb_occupation blob NOT NULL, @@ -717,9 +717,9 @@ CREATE TABLE phpbb_ranks ( CREATE TABLE phpbb_reports ( report_id mediumint(8) UNSIGNED NOT NULL auto_increment, reason_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, pm_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, user_notify tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -770,7 +770,7 @@ CREATE TABLE phpbb_search_wordlist ( # Table: 'phpbb_search_wordmatch' CREATE TABLE phpbb_search_wordmatch ( - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, word_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, title_match tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, UNIQUE unq_mtch (word_id, post_id, title_match), @@ -804,7 +804,7 @@ CREATE TABLE phpbb_sessions ( # Table: 'phpbb_sessions_keys' CREATE TABLE phpbb_sessions_keys ( key_id binary(32) DEFAULT '' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, last_ip varbinary(40) DEFAULT '' NOT NULL, last_login int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (key_id, user_id), @@ -865,7 +865,7 @@ CREATE TABLE phpbb_teampage ( # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( - topic_id mediumint(8) UNSIGNED NOT NULL auto_increment, + topic_id INT(10) UNSIGNED NOT NULL auto_increment, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -915,8 +915,8 @@ CREATE TABLE phpbb_topics ( # Table: 'phpbb_topics_track' CREATE TABLE phpbb_topics_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, topic_id), @@ -927,8 +927,8 @@ CREATE TABLE phpbb_topics_track ( # Table: 'phpbb_topics_posted' CREATE TABLE phpbb_topics_posted ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, topic_posted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, topic_id) ); @@ -936,8 +936,8 @@ CREATE TABLE phpbb_topics_posted ( # Table: 'phpbb_topics_watch' CREATE TABLE phpbb_topics_watch ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, KEY topic_id (topic_id), KEY user_id (user_id), @@ -949,7 +949,7 @@ CREATE TABLE phpbb_topics_watch ( CREATE TABLE phpbb_user_notifications ( item_type varbinary(255) DEFAULT '' NOT NULL, item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, method varbinary(255) DEFAULT '' NOT NULL, notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL ); @@ -958,7 +958,7 @@ CREATE TABLE phpbb_user_notifications ( # Table: 'phpbb_user_group' CREATE TABLE phpbb_user_group ( group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, group_leader tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, user_pending tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, KEY group_id (group_id), @@ -969,7 +969,7 @@ CREATE TABLE phpbb_user_group ( # Table: 'phpbb_users' CREATE TABLE phpbb_users ( - user_id mediumint(8) UNSIGNED NOT NULL auto_increment, + user_id INT(10) UNSIGNED NOT NULL auto_increment, user_type tinyint(2) DEFAULT '0' NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '3' NOT NULL, user_permissions mediumblob NOT NULL, @@ -1052,8 +1052,8 @@ CREATE TABLE phpbb_users ( # Table: 'phpbb_warnings' CREATE TABLE phpbb_warnings ( warning_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, log_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, warning_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (warning_id) @@ -1071,7 +1071,7 @@ CREATE TABLE phpbb_words ( # Table: 'phpbb_zebra' CREATE TABLE phpbb_zebra ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, zebra_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, friend tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, foe tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index b345e1f474..38db154905 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -7,7 +7,7 @@ CREATE TABLE phpbb_attachments ( attach_id mediumint(8) UNSIGNED NOT NULL auto_increment, post_msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, in_message tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, is_orphan tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE phpbb_acl_roles_data ( # Table: 'phpbb_acl_users' CREATE TABLE phpbb_acl_users ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -128,8 +128,8 @@ CREATE TABLE phpbb_bbcodes ( # Table: 'phpbb_bookmarks' CREATE TABLE phpbb_bookmarks ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (topic_id, user_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -139,7 +139,7 @@ CREATE TABLE phpbb_bots ( bot_id mediumint(8) UNSIGNED NOT NULL auto_increment, bot_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, bot_name varchar(255) DEFAULT '' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, bot_agent varchar(255) DEFAULT '' NOT NULL, bot_ip varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (bot_id), @@ -189,8 +189,8 @@ CREATE TABLE phpbb_disallow ( # Table: 'phpbb_drafts' CREATE TABLE phpbb_drafts ( draft_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) 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 varchar(255) DEFAULT '' NOT NULL, @@ -289,7 +289,7 @@ CREATE TABLE phpbb_forums ( # Table: 'phpbb_forums_access' CREATE TABLE phpbb_forums_access ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' NOT NULL, PRIMARY KEY (forum_id, user_id, session_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -297,7 +297,7 @@ CREATE TABLE phpbb_forums_access ( # Table: 'phpbb_forums_track' CREATE TABLE phpbb_forums_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, forum_id) @@ -307,7 +307,7 @@ CREATE TABLE phpbb_forums_track ( # Table: 'phpbb_forums_watch' CREATE TABLE phpbb_forums_watch ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, KEY forum_id (forum_id), KEY user_id (user_id), @@ -373,9 +373,9 @@ CREATE TABLE phpbb_lang ( CREATE TABLE phpbb_log ( log_id mediumint(8) UNSIGNED NOT NULL auto_increment, log_type tinyint(4) DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, reportee_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, log_ip varchar(40) DEFAULT '' NOT NULL, log_time int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -397,7 +397,7 @@ CREATE TABLE phpbb_login_attempts ( attempt_browser varchar(150) DEFAULT '' NOT NULL, attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL, attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, username varchar(255) DEFAULT '0' NOT NULL, username_clean varchar(255) DEFAULT '0' NOT NULL, KEY att_ip (attempt_ip, attempt_time), @@ -410,7 +410,7 @@ CREATE TABLE phpbb_login_attempts ( # Table: 'phpbb_moderator_cache' CREATE TABLE phpbb_moderator_cache ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, username varchar(255) DEFAULT '' NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, group_name varchar(255) DEFAULT '' NOT NULL, @@ -469,7 +469,7 @@ CREATE TABLE phpbb_notifications ( notification_type_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notification_read tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, notification_time int(11) UNSIGNED DEFAULT '1' NOT NULL, notification_data text NOT NULL, @@ -481,7 +481,7 @@ CREATE TABLE phpbb_notifications ( # Table: 'phpbb_oauth_accounts' CREATE TABLE phpbb_oauth_accounts ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, provider varchar(255) DEFAULT '' NOT NULL, oauth_provider_id text NOT NULL, PRIMARY KEY (user_id, provider) @@ -490,7 +490,7 @@ CREATE TABLE phpbb_oauth_accounts ( # Table: 'phpbb_oauth_tokens' CREATE TABLE phpbb_oauth_tokens ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' NOT NULL, provider varchar(255) DEFAULT '' NOT NULL, oauth_token mediumtext NOT NULL, @@ -502,7 +502,7 @@ CREATE TABLE phpbb_oauth_tokens ( # Table: 'phpbb_poll_options' CREATE TABLE phpbb_poll_options ( poll_option_id tinyint(4) DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, poll_option_text text NOT NULL, poll_option_total mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, KEY poll_opt_id (poll_option_id), @@ -512,7 +512,7 @@ CREATE TABLE phpbb_poll_options ( # Table: 'phpbb_poll_votes' CREATE TABLE phpbb_poll_votes ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, poll_option_id tinyint(4) DEFAULT '0' NOT NULL, vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, vote_user_ip varchar(40) DEFAULT '' NOT NULL, @@ -524,8 +524,8 @@ CREATE TABLE phpbb_poll_votes ( # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( - post_id mediumint(8) UNSIGNED NOT NULL auto_increment, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED NOT NULL auto_increment, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -599,7 +599,7 @@ CREATE TABLE phpbb_privmsgs ( # Table: 'phpbb_privmsgs_folder' CREATE TABLE phpbb_privmsgs_folder ( folder_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, folder_name varchar(255) DEFAULT '' NOT NULL, pm_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (folder_id), @@ -610,7 +610,7 @@ CREATE TABLE phpbb_privmsgs_folder ( # Table: 'phpbb_privmsgs_rules' CREATE TABLE phpbb_privmsgs_rules ( rule_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, rule_check mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, rule_connection mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, rule_string varchar(255) DEFAULT '' NOT NULL, @@ -626,7 +626,7 @@ CREATE TABLE phpbb_privmsgs_rules ( # Table: 'phpbb_privmsgs_to' CREATE TABLE phpbb_privmsgs_to ( msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, author_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, pm_deleted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, pm_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, @@ -672,7 +672,7 @@ CREATE TABLE phpbb_profile_fields ( # Table: 'phpbb_profile_fields_data' CREATE TABLE phpbb_profile_fields_data ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, pf_phpbb_location varchar(255) DEFAULT '' NOT NULL, pf_phpbb_interests text NOT NULL, pf_phpbb_occupation text NOT NULL, @@ -717,9 +717,9 @@ CREATE TABLE phpbb_ranks ( CREATE TABLE phpbb_reports ( report_id mediumint(8) UNSIGNED NOT NULL auto_increment, reason_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, pm_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, user_notify tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, @@ -770,7 +770,7 @@ CREATE TABLE phpbb_search_wordlist ( # Table: 'phpbb_search_wordmatch' CREATE TABLE phpbb_search_wordmatch ( - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, word_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, title_match tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, UNIQUE unq_mtch (word_id, post_id, title_match), @@ -804,7 +804,7 @@ CREATE TABLE phpbb_sessions ( # Table: 'phpbb_sessions_keys' CREATE TABLE phpbb_sessions_keys ( key_id char(32) DEFAULT '' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, last_ip varchar(40) DEFAULT '' NOT NULL, last_login int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (key_id, user_id), @@ -865,7 +865,7 @@ CREATE TABLE phpbb_teampage ( # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( - topic_id mediumint(8) UNSIGNED NOT NULL auto_increment, + topic_id INT(10) UNSIGNED NOT NULL auto_increment, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, @@ -915,8 +915,8 @@ CREATE TABLE phpbb_topics ( # Table: 'phpbb_topics_track' CREATE TABLE phpbb_topics_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, topic_id), @@ -927,8 +927,8 @@ CREATE TABLE phpbb_topics_track ( # Table: 'phpbb_topics_posted' CREATE TABLE phpbb_topics_posted ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, topic_posted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (user_id, topic_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -936,8 +936,8 @@ CREATE TABLE phpbb_topics_posted ( # Table: 'phpbb_topics_watch' CREATE TABLE phpbb_topics_watch ( - topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, KEY topic_id (topic_id), KEY user_id (user_id), @@ -949,7 +949,7 @@ CREATE TABLE phpbb_topics_watch ( CREATE TABLE phpbb_user_notifications ( item_type varchar(255) DEFAULT '' NOT NULL, item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, method varchar(255) DEFAULT '' NOT NULL, notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -958,7 +958,7 @@ CREATE TABLE phpbb_user_notifications ( # Table: 'phpbb_user_group' CREATE TABLE phpbb_user_group ( group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, group_leader tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, user_pending tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, KEY group_id (group_id), @@ -969,7 +969,7 @@ CREATE TABLE phpbb_user_group ( # Table: 'phpbb_users' CREATE TABLE phpbb_users ( - user_id mediumint(8) UNSIGNED NOT NULL auto_increment, + user_id INT(10) UNSIGNED NOT NULL auto_increment, user_type tinyint(2) DEFAULT '0' NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '3' NOT NULL, user_permissions mediumtext NOT NULL, @@ -1052,8 +1052,8 @@ CREATE TABLE phpbb_users ( # Table: 'phpbb_warnings' CREATE TABLE phpbb_warnings ( warning_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, + post_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, log_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, warning_time int(11) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (warning_id) @@ -1071,7 +1071,7 @@ CREATE TABLE phpbb_words ( # Table: 'phpbb_zebra' CREATE TABLE phpbb_zebra ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_id INT(10) UNSIGNED DEFAULT '0' NOT NULL, zebra_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, friend tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, foe tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index b819ba2c59..fe3cd8312e 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -49,7 +49,7 @@ CONNECT phpbb/phpbb_password; CREATE TABLE phpbb_attachments ( attach_id number(8) NOT NULL, post_msg_id number(8) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, in_message number(1) DEFAULT '0' NOT NULL, poster_id number(8) DEFAULT '0' NOT NULL, is_orphan number(1) DEFAULT '1' NOT NULL, @@ -195,7 +195,7 @@ CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data (auth_option Table: 'phpbb_acl_users' */ CREATE TABLE phpbb_acl_users ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL, auth_role_id number(8) DEFAULT '0' NOT NULL, @@ -277,8 +277,8 @@ CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes (display_on_posting) Table: 'phpbb_bookmarks' */ CREATE TABLE phpbb_bookmarks ( - topic_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_bookmarks PRIMARY KEY (topic_id, user_id) ) / @@ -291,7 +291,7 @@ CREATE TABLE phpbb_bots ( bot_id number(8) NOT NULL, bot_active number(1) DEFAULT '1' NOT NULL, bot_name varchar2(765) DEFAULT '' , - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, bot_agent varchar2(255) DEFAULT '' , bot_ip varchar2(255) DEFAULT '' , CONSTRAINT pk_phpbb_bots PRIMARY KEY (bot_id) @@ -391,8 +391,8 @@ END; */ CREATE TABLE phpbb_drafts ( draft_id number(8) NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, save_time number(11) DEFAULT '0' NOT NULL, draft_subject varchar2(765) DEFAULT '' , @@ -573,7 +573,7 @@ END; */ CREATE TABLE phpbb_forums_access ( forum_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' , CONSTRAINT pk_phpbb_forums_access PRIMARY KEY (forum_id, user_id, session_id) ) @@ -584,7 +584,7 @@ CREATE TABLE phpbb_forums_access ( Table: 'phpbb_forums_track' */ CREATE TABLE phpbb_forums_track ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_forums_track PRIMARY KEY (user_id, forum_id) @@ -597,7 +597,7 @@ CREATE TABLE phpbb_forums_track ( */ CREATE TABLE phpbb_forums_watch ( forum_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, notify_status number(1) DEFAULT '0' NOT NULL ) / @@ -729,9 +729,9 @@ END; CREATE TABLE phpbb_log ( log_id number(8) NOT NULL, log_type number(4) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, reportee_id number(8) DEFAULT '0' NOT NULL, log_ip varchar2(40) DEFAULT '' , log_time number(11) DEFAULT '0' NOT NULL, @@ -778,7 +778,7 @@ CREATE TABLE phpbb_login_attempts ( attempt_browser varchar2(150) DEFAULT '' , attempt_forwarded_for varchar2(255) DEFAULT '' , attempt_time number(11) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, username varchar2(765) DEFAULT '0' NOT NULL, username_clean varchar2(255) DEFAULT '0' NOT NULL ) @@ -798,7 +798,7 @@ CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id) */ CREATE TABLE phpbb_moderator_cache ( forum_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, username varchar2(765) DEFAULT '' , group_id number(8) DEFAULT '0' NOT NULL, group_name varchar2(765) DEFAULT '' , @@ -906,7 +906,7 @@ CREATE TABLE phpbb_notifications ( notification_type_id number(4) DEFAULT '0' NOT NULL, item_id number(8) DEFAULT '0' NOT NULL, item_parent_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, notification_read number(1) DEFAULT '0' NOT NULL, notification_time number(11) DEFAULT '1' NOT NULL, notification_data clob DEFAULT '' , @@ -939,7 +939,7 @@ END; Table: 'phpbb_oauth_accounts' */ CREATE TABLE phpbb_oauth_accounts ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, provider varchar2(255) DEFAULT '' , oauth_provider_id clob DEFAULT '' , CONSTRAINT pk_phpbb_oauth_accounts PRIMARY KEY (user_id, provider) @@ -951,7 +951,7 @@ CREATE TABLE phpbb_oauth_accounts ( Table: 'phpbb_oauth_tokens' */ CREATE TABLE phpbb_oauth_tokens ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' , provider varchar2(255) DEFAULT '' , oauth_token clob DEFAULT '' @@ -968,7 +968,7 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider) */ CREATE TABLE phpbb_poll_options ( poll_option_id number(4) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, poll_option_text clob DEFAULT '' , poll_option_total number(8) DEFAULT '0' NOT NULL ) @@ -983,7 +983,7 @@ CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id) Table: 'phpbb_poll_votes' */ CREATE TABLE phpbb_poll_votes ( - topic_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, poll_option_id number(4) DEFAULT '0' NOT NULL, vote_user_id number(8) DEFAULT '0' NOT NULL, vote_user_ip varchar2(40) DEFAULT '' @@ -1001,8 +1001,8 @@ CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip) Table: 'phpbb_posts' */ CREATE TABLE phpbb_posts ( - post_id number(8) NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + post_id number(10) NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, poster_id number(8) DEFAULT '0' NOT NULL, icon_id number(8) DEFAULT '0' NOT NULL, @@ -1125,7 +1125,7 @@ END; */ CREATE TABLE phpbb_privmsgs_folder ( folder_id number(8) NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, folder_name varchar2(765) DEFAULT '' , pm_count number(8) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_privmsgs_folder PRIMARY KEY (folder_id) @@ -1156,7 +1156,7 @@ END; */ CREATE TABLE phpbb_privmsgs_rules ( rule_id number(8) NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, rule_check number(8) DEFAULT '0' NOT NULL, rule_connection number(8) DEFAULT '0' NOT NULL, rule_string varchar2(765) DEFAULT '' , @@ -1192,7 +1192,7 @@ END; */ CREATE TABLE phpbb_privmsgs_to ( msg_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, author_id number(8) DEFAULT '0' NOT NULL, pm_deleted number(1) DEFAULT '0' NOT NULL, pm_new number(1) DEFAULT '1' NOT NULL, @@ -1265,7 +1265,7 @@ END; Table: 'phpbb_profile_fields_data' */ CREATE TABLE phpbb_profile_fields_data ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, pf_phpbb_location varchar2(255) DEFAULT '' , pf_phpbb_interests clob DEFAULT '' , pf_phpbb_occupation clob DEFAULT '' , @@ -1338,9 +1338,9 @@ END; CREATE TABLE phpbb_reports ( report_id number(8) NOT NULL, reason_id number(4) DEFAULT '0' NOT NULL, - post_id number(8) DEFAULT '0' NOT NULL, + post_id number(10) DEFAULT '0' NOT NULL, pm_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, user_notify number(1) DEFAULT '0' NOT NULL, report_closed number(1) DEFAULT '0' NOT NULL, report_time number(11) DEFAULT '0' NOT NULL, @@ -1454,7 +1454,7 @@ END; Table: 'phpbb_search_wordmatch' */ CREATE TABLE phpbb_search_wordmatch ( - post_id number(8) DEFAULT '0' NOT NULL, + post_id number(10) DEFAULT '0' NOT NULL, word_id number(8) DEFAULT '0' NOT NULL, title_match number(1) DEFAULT '0' NOT NULL, CONSTRAINT u_phpbb_unq_mtch UNIQUE (word_id, post_id, title_match) @@ -1499,7 +1499,7 @@ CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions (session_forum_id) */ CREATE TABLE phpbb_sessions_keys ( key_id char(32) DEFAULT '' , - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, last_ip varchar2(40) DEFAULT '' , last_login number(11) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_sessions_keys PRIMARY KEY (key_id, user_id) @@ -1641,7 +1641,7 @@ END; Table: 'phpbb_topics' */ CREATE TABLE phpbb_topics ( - topic_id number(8) NOT NULL, + topic_id number(10) NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, icon_id number(8) DEFAULT '0' NOT NULL, topic_attachment number(1) DEFAULT '0' NOT NULL, @@ -1716,8 +1716,8 @@ END; Table: 'phpbb_topics_track' */ CREATE TABLE phpbb_topics_track ( - user_id number(8) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_topics_track PRIMARY KEY (user_id, topic_id) @@ -1733,8 +1733,8 @@ CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id) Table: 'phpbb_topics_posted' */ CREATE TABLE phpbb_topics_posted ( - user_id number(8) DEFAULT '0' NOT NULL, - topic_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, topic_posted number(1) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_topics_posted PRIMARY KEY (user_id, topic_id) ) @@ -1745,8 +1745,8 @@ CREATE TABLE phpbb_topics_posted ( Table: 'phpbb_topics_watch' */ CREATE TABLE phpbb_topics_watch ( - topic_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + topic_id number(10) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, notify_status number(1) DEFAULT '0' NOT NULL ) / @@ -1764,7 +1764,7 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status CREATE TABLE phpbb_user_notifications ( item_type varchar2(255) DEFAULT '' , item_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, method varchar2(255) DEFAULT '' , notify number(1) DEFAULT '1' NOT NULL ) @@ -1776,7 +1776,7 @@ CREATE TABLE phpbb_user_notifications ( */ CREATE TABLE phpbb_user_group ( group_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, group_leader number(1) DEFAULT '0' NOT NULL, user_pending number(1) DEFAULT '1' NOT NULL ) @@ -1793,7 +1793,7 @@ CREATE INDEX phpbb_user_group_group_leader ON phpbb_user_group (group_leader) Table: 'phpbb_users' */ CREATE TABLE phpbb_users ( - user_id number(8) NOT NULL, + user_id number(10) NOT NULL, user_type number(2) DEFAULT '0' NOT NULL, group_id number(8) DEFAULT '3' NOT NULL, user_permissions clob DEFAULT '' , @@ -1898,8 +1898,8 @@ END; */ CREATE TABLE phpbb_warnings ( warning_id number(8) NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, - post_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, + post_id number(10) DEFAULT '0' NOT NULL, log_id number(8) DEFAULT '0' NOT NULL, warning_time number(11) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_warnings PRIMARY KEY (warning_id) @@ -1955,7 +1955,7 @@ END; Table: 'phpbb_zebra' */ CREATE TABLE phpbb_zebra ( - user_id number(8) DEFAULT '0' NOT NULL, + user_id number(10) DEFAULT '0' NOT NULL, zebra_id number(8) DEFAULT '0' NOT NULL, friend number(1) DEFAULT '0' NOT NULL, foe number(1) DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index be8af3c873..031a473a84 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -91,7 +91,7 @@ CREATE SEQUENCE phpbb_attachments_seq; CREATE TABLE phpbb_attachments ( attach_id INT4 DEFAULT nextval('phpbb_attachments_seq'), post_msg_id INT4 DEFAULT '0' NOT NULL CHECK (post_msg_id >= 0), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, in_message INT2 DEFAULT '0' NOT NULL CHECK (in_message >= 0), poster_id INT4 DEFAULT '0' NOT NULL CHECK (poster_id >= 0), is_orphan INT2 DEFAULT '1' NOT NULL CHECK (is_orphan >= 0), @@ -177,7 +177,7 @@ CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data (auth_option Table: 'phpbb_acl_users' */ CREATE TABLE phpbb_acl_users ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), auth_option_id INT4 DEFAULT '0' NOT NULL CHECK (auth_option_id >= 0), auth_role_id INT4 DEFAULT '0' NOT NULL CHECK (auth_role_id >= 0), @@ -234,8 +234,8 @@ CREATE INDEX phpbb_bbcodes_display_on_post ON phpbb_bbcodes (display_on_posting) Table: 'phpbb_bookmarks' */ CREATE TABLE phpbb_bookmarks ( - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, + user_id INT4 DEFAULT '0' NOT NULL, PRIMARY KEY (topic_id, user_id) ); @@ -249,7 +249,7 @@ 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(255) DEFAULT '' NOT NULL, - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, bot_agent varchar(255) DEFAULT '' NOT NULL, bot_ip varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (bot_id) @@ -313,8 +313,8 @@ CREATE SEQUENCE phpbb_drafts_seq; CREATE TABLE phpbb_drafts ( draft_id INT4 DEFAULT nextval('phpbb_drafts_seq'), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, + topic_id INT4 DEFAULT '0' NOT NULL, 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(255) DEFAULT '' NOT NULL, @@ -429,7 +429,7 @@ CREATE INDEX phpbb_forums_forum_lastpost_id ON phpbb_forums (forum_last_post_id) */ CREATE TABLE phpbb_forums_access ( forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' NOT NULL, PRIMARY KEY (forum_id, user_id, session_id) ); @@ -439,7 +439,7 @@ CREATE TABLE phpbb_forums_access ( Table: 'phpbb_forums_track' */ CREATE TABLE phpbb_forums_track ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), mark_time INT4 DEFAULT '0' NOT NULL CHECK (mark_time >= 0), PRIMARY KEY (user_id, forum_id) @@ -451,7 +451,7 @@ CREATE TABLE phpbb_forums_track ( */ CREATE TABLE phpbb_forums_watch ( forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, notify_status INT2 DEFAULT '0' NOT NULL CHECK (notify_status >= 0) ); @@ -533,9 +533,9 @@ CREATE SEQUENCE phpbb_log_seq; CREATE TABLE phpbb_log ( log_id INT4 DEFAULT nextval('phpbb_log_seq'), log_type INT2 DEFAULT '0' NOT NULL, - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, 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), @@ -559,7 +559,7 @@ CREATE TABLE phpbb_login_attempts ( attempt_browser varchar(150) DEFAULT '' NOT NULL, attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL, attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, username varchar(255) DEFAULT '0' NOT NULL, username_clean varchar_ci DEFAULT '0' NOT NULL ); @@ -574,7 +574,7 @@ CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (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), + user_id INT4 DEFAULT '0' 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, @@ -647,7 +647,7 @@ CREATE TABLE phpbb_notifications ( notification_type_id INT2 DEFAULT '0' NOT NULL CHECK (notification_type_id >= 0), item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0), item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, notification_read INT2 DEFAULT '0' NOT NULL CHECK (notification_read >= 0), notification_time INT4 DEFAULT '1' NOT NULL CHECK (notification_time >= 0), notification_data varchar(4000) DEFAULT '' NOT NULL, @@ -661,7 +661,7 @@ CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notificat Table: 'phpbb_oauth_accounts' */ CREATE TABLE phpbb_oauth_accounts ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, provider varchar(255) DEFAULT '' NOT NULL, oauth_provider_id varchar(4000) DEFAULT '' NOT NULL, PRIMARY KEY (user_id, provider) @@ -672,7 +672,7 @@ CREATE TABLE phpbb_oauth_accounts ( Table: 'phpbb_oauth_tokens' */ CREATE TABLE phpbb_oauth_tokens ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, session_id char(32) DEFAULT '' NOT NULL, provider varchar(255) DEFAULT '' NOT NULL, oauth_token TEXT DEFAULT '' NOT NULL @@ -686,7 +686,7 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider); */ CREATE TABLE phpbb_poll_options ( poll_option_id INT2 DEFAULT '0' NOT NULL, - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, poll_option_text varchar(4000) DEFAULT '' NOT NULL, poll_option_total INT4 DEFAULT '0' NOT NULL CHECK (poll_option_total >= 0) ); @@ -698,7 +698,7 @@ CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id); Table: 'phpbb_poll_votes' */ CREATE TABLE phpbb_poll_votes ( - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, poll_option_id INT2 DEFAULT '0' NOT NULL, vote_user_id INT4 DEFAULT '0' NOT NULL CHECK (vote_user_id >= 0), vote_user_ip varchar(40) DEFAULT '' NOT NULL @@ -715,7 +715,7 @@ CREATE SEQUENCE phpbb_posts_seq; CREATE TABLE phpbb_posts ( post_id INT4 DEFAULT nextval('phpbb_posts_seq'), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), poster_id INT4 DEFAULT '0' NOT NULL CHECK (poster_id >= 0), icon_id INT4 DEFAULT '0' NOT NULL CHECK (icon_id >= 0), @@ -797,7 +797,7 @@ CREATE SEQUENCE phpbb_privmsgs_folder_seq; CREATE TABLE phpbb_privmsgs_folder ( folder_id INT4 DEFAULT nextval('phpbb_privmsgs_folder_seq'), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, folder_name varchar(255) DEFAULT '' NOT NULL, pm_count INT4 DEFAULT '0' NOT NULL CHECK (pm_count >= 0), PRIMARY KEY (folder_id) @@ -812,7 +812,7 @@ CREATE SEQUENCE phpbb_privmsgs_rules_seq; CREATE TABLE phpbb_privmsgs_rules ( rule_id INT4 DEFAULT nextval('phpbb_privmsgs_rules_seq'), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, rule_check INT4 DEFAULT '0' NOT NULL CHECK (rule_check >= 0), rule_connection INT4 DEFAULT '0' NOT NULL CHECK (rule_connection >= 0), rule_string varchar(255) DEFAULT '' NOT NULL, @@ -830,7 +830,7 @@ CREATE INDEX phpbb_privmsgs_rules_user_id ON phpbb_privmsgs_rules (user_id); */ CREATE TABLE phpbb_privmsgs_to ( msg_id INT4 DEFAULT '0' NOT NULL CHECK (msg_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, author_id INT4 DEFAULT '0' NOT NULL CHECK (author_id >= 0), pm_deleted INT2 DEFAULT '0' NOT NULL CHECK (pm_deleted >= 0), pm_new INT2 DEFAULT '1' NOT NULL CHECK (pm_new >= 0), @@ -882,7 +882,7 @@ CREATE INDEX phpbb_profile_fields_fld_ordr ON phpbb_profile_fields (field_order) Table: 'phpbb_profile_fields_data' */ CREATE TABLE phpbb_profile_fields_data ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, pf_phpbb_location varchar(255) DEFAULT '' NOT NULL, pf_phpbb_interests varchar(4000) DEFAULT '' NOT NULL, pf_phpbb_occupation varchar(4000) DEFAULT '' NOT NULL, @@ -939,9 +939,9 @@ CREATE SEQUENCE phpbb_reports_seq; CREATE TABLE phpbb_reports ( report_id INT4 DEFAULT nextval('phpbb_reports_seq'), reason_id INT2 DEFAULT '0' NOT NULL CHECK (reason_id >= 0), - post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0), + post_id INT4 DEFAULT '0' NOT NULL, pm_id INT4 DEFAULT '0' NOT NULL CHECK (pm_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, user_notify INT2 DEFAULT '0' NOT NULL CHECK (user_notify >= 0), report_closed INT2 DEFAULT '0' NOT NULL CHECK (report_closed >= 0), report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0), @@ -1004,7 +1004,7 @@ CREATE INDEX phpbb_search_wordlist_wrd_cnt ON phpbb_search_wordlist (word_count) Table: 'phpbb_search_wordmatch' */ CREATE TABLE phpbb_search_wordmatch ( - post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0), + post_id INT4 DEFAULT '0' NOT NULL, word_id INT4 DEFAULT '0' NOT NULL CHECK (word_id >= 0), title_match INT2 DEFAULT '0' NOT NULL CHECK (title_match >= 0) ); @@ -1042,7 +1042,7 @@ CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions (session_forum_id); */ CREATE TABLE phpbb_sessions_keys ( key_id char(32) DEFAULT '' NOT NULL, - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, last_ip varchar(40) DEFAULT '' NOT NULL, last_login INT4 DEFAULT '0' NOT NULL CHECK (last_login >= 0), PRIMARY KEY (key_id, user_id) @@ -1175,8 +1175,8 @@ CREATE INDEX phpbb_topics_fid_time_moved ON phpbb_topics (forum_id, topic_last_p Table: 'phpbb_topics_track' */ CREATE TABLE phpbb_topics_track ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, + topic_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), mark_time INT4 DEFAULT '0' NOT NULL CHECK (mark_time >= 0), PRIMARY KEY (user_id, topic_id) @@ -1189,8 +1189,8 @@ CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id); Table: 'phpbb_topics_posted' */ CREATE TABLE phpbb_topics_posted ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, + topic_id INT4 DEFAULT '0' NOT NULL, topic_posted INT2 DEFAULT '0' NOT NULL CHECK (topic_posted >= 0), PRIMARY KEY (user_id, topic_id) ); @@ -1200,8 +1200,8 @@ CREATE TABLE phpbb_topics_posted ( Table: 'phpbb_topics_watch' */ CREATE TABLE phpbb_topics_watch ( - topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + topic_id INT4 DEFAULT '0' NOT NULL, + user_id INT4 DEFAULT '0' NOT NULL, notify_status INT2 DEFAULT '0' NOT NULL CHECK (notify_status >= 0) ); @@ -1215,7 +1215,7 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status CREATE TABLE phpbb_user_notifications ( item_type varchar(255) DEFAULT '' NOT NULL, item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, method varchar(255) DEFAULT '' NOT NULL, notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0) ); @@ -1226,7 +1226,7 @@ CREATE TABLE phpbb_user_notifications ( */ CREATE TABLE phpbb_user_group ( group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, group_leader INT2 DEFAULT '0' NOT NULL CHECK (group_leader >= 0), user_pending INT2 DEFAULT '1' NOT NULL CHECK (user_pending >= 0) ); @@ -1328,8 +1328,8 @@ CREATE SEQUENCE phpbb_warnings_seq; CREATE TABLE phpbb_warnings ( warning_id INT4 DEFAULT nextval('phpbb_warnings_seq'), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, + post_id INT4 DEFAULT '0' NOT NULL, log_id INT4 DEFAULT '0' NOT NULL CHECK (log_id >= 0), warning_time INT4 DEFAULT '0' NOT NULL CHECK (warning_time >= 0), PRIMARY KEY (warning_id) @@ -1353,7 +1353,7 @@ CREATE TABLE phpbb_words ( Table: 'phpbb_zebra' */ CREATE TABLE phpbb_zebra ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), + user_id INT4 DEFAULT '0' NOT NULL, zebra_id INT4 DEFAULT '0' NOT NULL CHECK (zebra_id >= 0), friend INT2 DEFAULT '0' NOT NULL CHECK (friend >= 0), foe INT2 DEFAULT '0' NOT NULL CHECK (foe >= 0), diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 7f143873b1..18e30d309a 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -230,12 +230,12 @@ class tools 'sqlite' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', - 'ULINT' => 'INTEGER UNSIGNED', // 'int(10) UNSIGNED + 'ULINT' => 'INTEGER UNSIGNED', // 'int(10) UNSIGNED', 'UINT' => 'INTEGER UNSIGNED', // 'mediumint(8) UNSIGNED', 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', - 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', - 'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', + 'USINT' => 'INTEGER UNSIGNED', // 'mediumint(4) UNSIGNED', + 'BOOL' => 'INTEGER UNSIGNED', // 'tinyint(1) UNSIGNED', 'VCHAR' => 'varchar(255)', 'VCHAR:' => 'varchar(%d)', 'CHAR:' => 'char(%d)', @@ -247,7 +247,7 @@ class tools 'STEXT_UNI' => 'text(65535)', 'TEXT_UNI' => 'text(65535)', 'MTEXT_UNI' => 'mediumtext(16777215)', - 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', + 'TIMESTAMP' => 'INTEGER UNSIGNED', // 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', 'DECIMAL:' => 'decimal(%d,2)', 'PDECIMAL' => 'decimal(6,3)', -- cgit v1.2.1 From 31607771e1cbb17d4bf841fd93e7f699427b8814 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 13 Jan 2016 17:02:42 +0100 Subject: [ticket/11875] Add migration file PHPBB3-11875 --- .../migration/data/v320/default_data_type_ids.php | 252 +++++++++++++++++++++ 1 file changed, 252 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php (limited to 'phpBB') diff --git a/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php new file mode 100644 index 0000000000..5fbf343bfb --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php @@ -0,0 +1,252 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v320; + +class default_data_type_ids extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array('\phpbb\db\migration\data\v320\v320a2'); + } + + public function update_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'attachments' => array( + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'acl_users' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'bookmarks' => array( + 'topic_id' => array('ULINT', 0), + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'bots' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'drafts' => array( + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'forums_access' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'forums_track' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'forums_watch' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'log' => array( + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'login_attempts' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'moderator_cache' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'notifications' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'oauth_accounts' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'oauth_tokens' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'poll_options' => array( + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'poll_votes' => array( + 'topicr_id' => array('ULINT', 0), + ), + $this->table_prefix . 'posts' => array( + 'post_id' => array('ULINT', null, 'auto_increment'), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'privmsgs_folder' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'privmsgs_rules' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'privmsgs_to' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'profile_fields_data' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'reports' => array( + 'post_id' => array('ULINT', 0), + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'search_wordmatch' => array( + 'post_id' => array('ULINT', 0), + ), + $this->table_prefix . 'sessions_keys' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'topics' => array( + 'topic_id' => array('ULINT', null, 'auto_increment'), + ), + $this->table_prefix . 'topics_track' => array( + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'topics_posted' => array( + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'topics_watch' => array( + 'user_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'user_notifications' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'user_group' => array( + 'user_id' => array('ULINT', 0), + ), + $this->table_prefix . 'users' => array( + 'user_id' => array('ULINT', null, 'auto_increment'), + ), + $this->table_prefix . 'warnings' => array( + 'user_id' => array('ULINT', 0), + 'post_Id' => array('ULINT', 0), + ), + $this->table_prefix . 'zebra' => array( + 'user_id' => array('ULINT', 0), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'attachments' => array( + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'acl_users' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'bookmarks' => array( + 'topic_id' => array('UINT', 0), + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'bots' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'drafts' => array( + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'forums_access' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'forums_track' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'forums_watch' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'log' => array( + 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'login_attempts' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'moderator_cache' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'notifications' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'oauth_accounts' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'oauth_tokens' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'poll_options' => array( + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'poll_votes' => array( + 'topicr_id' => array('UINT', 0), + ), + $this->table_prefix . 'posts' => array( + 'post_id' => array('UINT', null, 'auto_increment'), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'privmsgs_folder' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'privmsgs_rules' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'privmsgs_to' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'profile_fields_data' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'reports' => array( + 'post_id' => array('UINT', 0), + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'search_wordmatch' => array( + 'post_id' => array('UINT', 0), + ), + $this->table_prefix . 'sessions_keys' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'topics' => array( + 'topic_id' => array('UINT', null, 'auto_increment'), + ), + $this->table_prefix . 'topics_track' => array( + 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'topics_posted' => array( + 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'topics_watch' => array( + 'user_id' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'user_notifications' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'user_group' => array( + 'user_id' => array('UINT', 0), + ), + $this->table_prefix . 'users' => array( + 'user_id' => array('UINT', null, 'auto_increment'), + ), + $this->table_prefix . 'warnings' => array( + 'user_id' => array('UINT', 0), + 'post_Id' => array('UINT', 0), + ), + $this->table_prefix . 'zebra' => array( + 'user_id' => array('UINT', 0), + ), + ), + ); + } +} -- cgit v1.2.1 From 7cd7bb3c015be1355ab634d3cb704c1d764bf8b0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 13 Jan 2016 19:35:04 +0100 Subject: [ticket/11875] Change more columns to use UINT and add missings ones PHPBB3-11875 --- .../migration/data/v320/default_data_type_ids.php | 134 ++++++++++++++++++--- 1 file changed, 120 insertions(+), 14 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php index 5fbf343bfb..ecee09ce77 100644 --- a/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php +++ b/phpBB/phpbb/db/migration/data/v320/default_data_type_ids.php @@ -24,22 +24,36 @@ class default_data_type_ids extends \phpbb\db\migration\migration { return array( 'change_columns' => array( + $this->table_prefix . 'acl_users' => array( + 'user_id' => array('ULINT', 0), + ), $this->table_prefix . 'attachments' => array( + 'attach_id' => array('ULINT', null, 'auto_increment'), + 'post_msg_id' => array('ULINT', 0), + 'poster_id' => array('ULINT', 0), 'topic_id' => array('ULINT', 0), ), - $this->table_prefix . 'acl_users' => array( - 'user_id' => array('ULINT', 0), + $this->table_prefix . 'banlist' => array( + 'ban_id' => array('ULINT', null, 'auto_increment'), + 'ban_userid' => array('ULINT', 0), ), $this->table_prefix . 'bookmarks' => array( 'topic_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'bots' => array( + 'bot_id' => array('ULINT', null, 'auto_increment'), 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'drafts' => array( + 'draft_id' => array('ULINT', null, 'auto_increment'), + 'user_id' => array('ULINT', 0), 'topic_id' => array('ULINT', 0), ), + $this->table_prefix . 'forums' => array( + 'forum_last_post_id' => array('ULINT', 0), + 'forum_last_poster_id' => array('ULINT', 0), + ), $this->table_prefix . 'forums_access' => array( 'user_id' => array('ULINT', 0), ), @@ -50,6 +64,9 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'log' => array( + 'log_id' => array('ULINT', null, 'auto_increment'), + 'post_id' => array('ULINT', 0), + 'reportee_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), 'topic_id' => array('ULINT', 0), ), @@ -65,6 +82,9 @@ class default_data_type_ids extends \phpbb\db\migration\migration $this->table_prefix . 'oauth_accounts' => array( 'user_id' => array('ULINT', 0), ), + $this->table_prefix . 'oauth_states' => array( + 'user_id' => array('ULINT', 0), + ), $this->table_prefix . 'oauth_tokens' => array( 'user_id' => array('ULINT', 0), ), @@ -72,36 +92,63 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'topic_id' => array('ULINT', 0), ), $this->table_prefix . 'poll_votes' => array( - 'topicr_id' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + 'vote_user_id' => array('ULINT', 0), ), $this->table_prefix . 'posts' => array( - 'post_id' => array('ULINT', null, 'auto_increment'), - 'topic_id' => array('ULINT', 0), + 'post_id' => array('ULINT', null, 'auto_increment'), + 'poster_id' => array('ULINT', 0), + 'post_delete_user' => array('ULINT', 0), + 'post_edit_user' => array('ULINT', 0), + 'topic_id' => array('ULINT', 0), + ), + $this->table_prefix . 'privmsgs' => array( + 'author_id' => array('ULINT', 0), + 'message_edit_user' => array('ULINT', 0), + 'msg_id' => array('ULINT', null, 'auto_increment'), ), $this->table_prefix . 'privmsgs_folder' => array( 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'privmsgs_rules' => array( + 'rule_user_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'privmsgs_to' => array( + 'author_id' => array('ULINT', 0), + 'msg_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'profile_fields_data' => array( 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'reports' => array( + 'report_id' => array('ULINT', 0), + 'pm_id' => array('ULINT', 0), 'post_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), ), + $this->table_prefix . 'search_wordlist' => array( + 'word_id' => array('ULINT', null, 'auto_increment'), + ), $this->table_prefix . 'search_wordmatch' => array( 'post_id' => array('ULINT', 0), + 'word_id' => array('ULINT', 0), + ), + $this->table_prefix . 'sessions' => array( + 'session_user_id' => array('ULINT', 0), ), $this->table_prefix . 'sessions_keys' => array( 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'topics' => array( - 'topic_id' => array('ULINT', null, 'auto_increment'), + 'topic_id' => array('ULINT', null, 'auto_increment'), + 'topic_poster' => array('ULINT', 0), + 'topic_first_post_id' => array('ULINT', 0), + 'topic_last_post_id' => array('ULINT', 0), + 'topic_last_poster_id' => array('ULINT', 0), + 'topic_moved_id' => array('ULINT', 0), + 'topic_delete_user' => array('ULINT', 0), ), $this->table_prefix . 'topics_track' => array( 'user_id' => array('ULINT', 0), @@ -116,6 +163,7 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'topic_id' => array('ULINT', 0), ), $this->table_prefix . 'user_notifications' => array( + 'item_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), ), $this->table_prefix . 'user_group' => array( @@ -125,11 +173,16 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'user_id' => array('ULINT', null, 'auto_increment'), ), $this->table_prefix . 'warnings' => array( + 'log_id' => array('ULINT', 0), 'user_id' => array('ULINT', 0), - 'post_Id' => array('ULINT', 0), + 'post_id' => array('ULINT', 0), + ), + $this->table_prefix . 'words' => array( + 'word_id' => array('ULINT', null, 'auto_increment'), ), $this->table_prefix . 'zebra' => array( 'user_id' => array('ULINT', 0), + 'zebra_id' => array('ULINT', 0), ), ), ); @@ -139,22 +192,36 @@ class default_data_type_ids extends \phpbb\db\migration\migration { return array( 'change_columns' => array( + $this->table_prefix . 'acl_users' => array( + 'user_id' => array('UINT', 0), + ), $this->table_prefix . 'attachments' => array( + 'attach_id' => array('UINT', null, 'auto_increment'), + 'post_msg_id' => array('UINT', 0), + 'poster_id' => array('UINT', 0), 'topic_id' => array('UINT', 0), ), - $this->table_prefix . 'acl_users' => array( - 'user_id' => array('UINT', 0), + $this->table_prefix . 'banlist' => array( + 'ban_id' => array('UINT', null, 'auto_increment'), + 'ban_userid' => array('UINT', 0), ), $this->table_prefix . 'bookmarks' => array( 'topic_id' => array('UINT', 0), 'user_id' => array('UINT', 0), ), $this->table_prefix . 'bots' => array( + 'bot_id' => array('UINT', null, 'auto_increment'), 'user_id' => array('UINT', 0), ), $this->table_prefix . 'drafts' => array( + 'draft_id' => array('UINT', null, 'auto_increment'), + 'user_id' => array('UINT', 0), 'topic_id' => array('UINT', 0), ), + $this->table_prefix . 'forums' => array( + 'forum_last_post_id' => array('UINT', 0), + 'forum_last_poster_id' => array('UINT', 0), + ), $this->table_prefix . 'forums_access' => array( 'user_id' => array('UINT', 0), ), @@ -165,6 +232,9 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'user_id' => array('UINT', 0), ), $this->table_prefix . 'log' => array( + 'log_id' => array('UINT', null, 'auto_increment'), + 'post_id' => array('UINT', 0), + 'reportee_id' => array('UINT', 0), 'user_id' => array('UINT', 0), 'topic_id' => array('UINT', 0), ), @@ -180,6 +250,9 @@ class default_data_type_ids extends \phpbb\db\migration\migration $this->table_prefix . 'oauth_accounts' => array( 'user_id' => array('UINT', 0), ), + $this->table_prefix . 'oauth_states' => array( + 'user_id' => array('UINT', 0), + ), $this->table_prefix . 'oauth_tokens' => array( 'user_id' => array('UINT', 0), ), @@ -187,36 +260,63 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'topic_id' => array('UINT', 0), ), $this->table_prefix . 'poll_votes' => array( - 'topicr_id' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + 'vote_user_id' => array('UINT', 0), ), $this->table_prefix . 'posts' => array( - 'post_id' => array('UINT', null, 'auto_increment'), - 'topic_id' => array('UINT', 0), + 'post_id' => array('UINT', null, 'auto_increment'), + 'poster_id' => array('UINT', 0), + 'post_delete_user' => array('UINT', 0), + 'post_edit_user' => array('UINT', 0), + 'topic_id' => array('UINT', 0), + ), + $this->table_prefix . 'privmsgs' => array( + 'author_id' => array('UINT', 0), + 'message_edit_user' => array('UINT', 0), + 'msg_id' => array('UINT', null, 'auto_increment'), ), $this->table_prefix . 'privmsgs_folder' => array( 'user_id' => array('UINT', 0), ), $this->table_prefix . 'privmsgs_rules' => array( + 'rule_user_id' => array('UINT', 0), 'user_id' => array('UINT', 0), ), $this->table_prefix . 'privmsgs_to' => array( + 'author_id' => array('UINT', 0), + 'msg_id' => array('UINT', 0), 'user_id' => array('UINT', 0), ), $this->table_prefix . 'profile_fields_data' => array( 'user_id' => array('UINT', 0), ), $this->table_prefix . 'reports' => array( + 'report_id' => array('UINT', 0), + 'pm_id' => array('UINT', 0), 'post_id' => array('UINT', 0), 'user_id' => array('UINT', 0), ), + $this->table_prefix . 'search_wordlist' => array( + 'word_id' => array('UINT', null, 'auto_increment'), + ), $this->table_prefix . 'search_wordmatch' => array( 'post_id' => array('UINT', 0), + 'word_id' => array('UINT', 0), + ), + $this->table_prefix . 'sessions' => array( + 'session_user_id' => array('UINT', 0), ), $this->table_prefix . 'sessions_keys' => array( 'user_id' => array('UINT', 0), ), $this->table_prefix . 'topics' => array( - 'topic_id' => array('UINT', null, 'auto_increment'), + 'topic_id' => array('UINT', null, 'auto_increment'), + 'topic_poster' => array('UINT', 0), + 'topic_first_post_id' => array('UINT', 0), + 'topic_last_post_id' => array('UINT', 0), + 'topic_last_poster_id' => array('UINT', 0), + 'topic_moved_id' => array('UINT', 0), + 'topic_delete_user' => array('UINT', 0), ), $this->table_prefix . 'topics_track' => array( 'user_id' => array('UINT', 0), @@ -231,6 +331,7 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'topic_id' => array('UINT', 0), ), $this->table_prefix . 'user_notifications' => array( + 'item_id' => array('UINT', 0), 'user_id' => array('UINT', 0), ), $this->table_prefix . 'user_group' => array( @@ -240,11 +341,16 @@ class default_data_type_ids extends \phpbb\db\migration\migration 'user_id' => array('UINT', null, 'auto_increment'), ), $this->table_prefix . 'warnings' => array( + 'log_id' => array('UINT', 0), 'user_id' => array('UINT', 0), - 'post_Id' => array('UINT', 0), + 'post_id' => array('UINT', 0), + ), + $this->table_prefix . 'words' => array( + 'word_id' => array('UINT', null, 'auto_increment'), ), $this->table_prefix . 'zebra' => array( 'user_id' => array('UINT', 0), + 'zebra_id' => array('UINT', 0), ), ), ); -- cgit v1.2.1 From a94c20faa24cd450d697efa65be837075ec3cceb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 13 Jan 2016 19:36:20 +0100 Subject: [ticket/11875] Add back new line PHPBB3-11875 --- phpBB/install/schemas/postgres_schema.sql | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB') diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 890580a8b8..65caba8d1c 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -77,3 +77,4 @@ CREATE OPERATOR =( SORT1= <); COMMIT; + -- cgit v1.2.1