From a1066724d78e503dfcc2866eb4610be4cf268200 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 14 Nov 2014 13:15:55 +0100 Subject: [PATCH] Splitting changes to the user table into multiple requests --- com.woltlab.wcf/package.xml | 5 +++++ com.woltlab.wcf/update_2.1.0_alpha_1.sql | 11 ++++++----- com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql | 1 + com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql | 1 + com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql | 1 + com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql | 1 + 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql create mode 100644 com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql create mode 100644 com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql create mode 100644 com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index f0df8f3560..d799c79570 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -62,6 +62,11 @@ update_2.1.0_alpha_1.sql + update_user1_2.1.0_alpha_1.sql + update_user2_2.1.0_alpha_1.sql + update_user3_2.1.0_alpha_1.sql + update_user4_2.1.0_alpha_1.sql + acpMenu.xml bbcode.xml clipboardAction.xml diff --git a/com.woltlab.wcf/update_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_2.1.0_alpha_1.sql index add6b1aa5c..3ef6563d0f 100644 --- a/com.woltlab.wcf/update_2.1.0_alpha_1.sql +++ b/com.woltlab.wcf/update_2.1.0_alpha_1.sql @@ -193,6 +193,9 @@ ALTER TABLE wcf1_moderation_queue ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1 ALTER TABLE wcf1_page_menu_item ADD originIsSystem TINYINT(1) NOT NULL DEFAULT 0; +/* truncate table to ensure consistency */ +DELETE FROM wcf1_session; + ALTER TABLE wcf1_session ADD UNIQUE KEY uniqueUserID (userID); ALTER TABLE wcf1_sitemap ADD permissions TEXT NULL; @@ -200,13 +203,11 @@ ALTER TABLE wcf1_sitemap ADD options TEXT NULL; ALTER TABLE wcf1_template_listener ADD niceValue TINYINT(3) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_user ADD banExpires INT(10) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_user ADD disableAvatarExpires INT(10) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_user ADD disableSignatureExpires INT(10) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_user ADD socialNetworkPrivacySettings TEXT; - ALTER TABLE wcf1_user_group_option ADD usersOnly TINYINT(1) NOT NULL DEFAULT 0; +/* truncate table to ensure consistency */ +DELETE FROM wcf1_user_notification; + ALTER TABLE wcf1_user_notification CHANGE authorID authorID INT(10) NULL; ALTER TABLE wcf1_user_notification ADD timesTriggered INT(10) NOT NULL DEFAULT 0; ALTER TABLE wcf1_user_notification ADD guestTimesTriggered INT(10) NOT NULL DEFAULT 0; diff --git a/com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql new file mode 100644 index 0000000000..decb8f7b2c --- /dev/null +++ b/com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql @@ -0,0 +1 @@ +ALTER TABLE wcf1_user ADD banExpires INT(10) NOT NULL DEFAULT 0; diff --git a/com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql new file mode 100644 index 0000000000..41a9d3f1a7 --- /dev/null +++ b/com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql @@ -0,0 +1 @@ +ALTER TABLE wcf1_user ADD disableAvatarExpires INT(10) NOT NULL DEFAULT 0; diff --git a/com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql new file mode 100644 index 0000000000..1407ea3a45 --- /dev/null +++ b/com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql @@ -0,0 +1 @@ +ALTER TABLE wcf1_user ADD disableSignatureExpires INT(10) NOT NULL DEFAULT 0; diff --git a/com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql new file mode 100644 index 0000000000..310f32fd2c --- /dev/null +++ b/com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql @@ -0,0 +1 @@ +ALTER TABLE wcf1_user ADD socialNetworkPrivacySettings TEXT; -- 2.20.1