From 3f28c871ebb2b2ae893ce68b79580fa184acc899 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 26 Nov 2020 12:20:39 +0100
Subject: [PATCH] Drop wcf1_session.sessionVariables

---
 com.woltlab.wcf/package.xml                               | 2 +-
 ...pdate_com.woltlab.wcf_5.4_session_4_clean_session.php} | 8 ++++++--
 wcfsetup/setup/db/install.sql                             | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php => update_com.woltlab.wcf_5.4_session_4_clean_session.php} (86%)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 3dea4502d4..20340eccf5 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -73,7 +73,7 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
 		<instruction type="template" />
 		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_3_drop_virtual.php</instruction>
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php</instruction>
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_db.php</instruction>
 		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_removeFiles.php</instruction>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
similarity index 86%
rename from wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php
rename to wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
index 99ebb55d0d..d0364041c2 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
@@ -9,7 +9,7 @@ use wcf\system\database\table\PartialDatabaseTable;
 use wcf\system\WCF;
 
 /**
- * Adjusts wcf1_acp_session and wcf1_acp_session_access_log.
+ * Adjusts wcf1_acp_session, wcf1_acp_session_access_log and wcf1_session.
  * 
  * @author	Tim Duesterhus
  * @copyright	2001-2020 WoltLab GmbH
@@ -34,7 +34,11 @@ $tables = [
 		->columns([
 			NotNullVarchar255DatabaseTableColumn::create('requestMethod')
 				->defaultValue(''),
-		])
+		]),
+	PartialDatabaseTable::create('wcf1_session')
+		->columns([
+			MediumblobDatabaseTableColumn::create('sessionVariables')->drop(),
+		]),
 ];
 
 (new DatabaseTableChangeProcessor(
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 99a0e86205..c66f97c915 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1265,7 +1265,6 @@ CREATE TABLE wcf1_session (
 	parentPageID INT(10),
 	parentPageObjectID INT(10),
 	spiderID INT(10),
-	sessionVariables MEDIUMTEXT,
 	KEY packageID (lastActivityTime, spiderID),
 	KEY pageID (pageID, pageObjectID),
 	KEY parentPageID (parentPageID, parentPageObjectID),
-- 
2.20.1