From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 26 Nov 2020 11:20:39 +0000 (+0100)
Subject: Drop wcf1_session.sessionVariables
X-Git-Tag: 5.4.0_Alpha_1~583^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f28c871ebb2b2ae893ce68b79580fa184acc899;p=GitHub%2FWoltLab%2FWCF.git

Drop wcf1_session.sessionVariables
---

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_acp_session.php
deleted file mode 100644
index 99ebb55d0d..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_acp_session.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-use wcf\system\database\table\column\MediumblobDatabaseTableColumn;
-use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
-use wcf\system\database\table\column\VarcharDatabaseTableColumn;
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\database\table\index\DatabaseTableIndex;
-use wcf\system\database\table\PartialDatabaseTable;
-use wcf\system\WCF;
-
-/**
- * Adjusts wcf1_acp_session and wcf1_acp_session_access_log.
- * 
- * @author	Tim Duesterhus
- * @copyright	2001-2020 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core
- */
-
-$tables = [
-	PartialDatabaseTable::create('wcf1_acp_session')
-		->columns([
-			VarcharDatabaseTableColumn::create('requestURI')->drop(),
-			VarcharDatabaseTableColumn::create('requestMethod')->drop(),
-			MediumblobDatabaseTableColumn::create('sessionVariables'),
-		])
-		->indices([
-			DatabaseTableIndex::create()
-				->columns(['userID']),
-			DatabaseTableIndex::create()
-				->columns(['lastActivityTime']),
-		]),
-	PartialDatabaseTable::create('wcf1_acp_session_access_log')
-		->columns([
-			NotNullVarchar255DatabaseTableColumn::create('requestMethod')
-				->defaultValue(''),
-		])
-];
-
-(new DatabaseTableChangeProcessor(
-/** @var ScriptPackageInstallationPlugin $this */
-	$this->installation->getPackage(),
-	$tables,
-	WCF::getDB()->getEditor())
-)->process();
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
new file mode 100644
index 0000000000..d0364041c2
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
@@ -0,0 +1,49 @@
+<?php
+
+use wcf\system\database\table\column\MediumblobDatabaseTableColumn;
+use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
+use wcf\system\database\table\column\VarcharDatabaseTableColumn;
+use wcf\system\database\table\DatabaseTableChangeProcessor;
+use wcf\system\database\table\index\DatabaseTableIndex;
+use wcf\system\database\table\PartialDatabaseTable;
+use wcf\system\WCF;
+
+/**
+ * Adjusts wcf1_acp_session, wcf1_acp_session_access_log and wcf1_session.
+ * 
+ * @author	Tim Duesterhus
+ * @copyright	2001-2020 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core
+ */
+
+$tables = [
+	PartialDatabaseTable::create('wcf1_acp_session')
+		->columns([
+			VarcharDatabaseTableColumn::create('requestURI')->drop(),
+			VarcharDatabaseTableColumn::create('requestMethod')->drop(),
+			MediumblobDatabaseTableColumn::create('sessionVariables'),
+		])
+		->indices([
+			DatabaseTableIndex::create()
+				->columns(['userID']),
+			DatabaseTableIndex::create()
+				->columns(['lastActivityTime']),
+		]),
+	PartialDatabaseTable::create('wcf1_acp_session_access_log')
+		->columns([
+			NotNullVarchar255DatabaseTableColumn::create('requestMethod')
+				->defaultValue(''),
+		]),
+	PartialDatabaseTable::create('wcf1_session')
+		->columns([
+			MediumblobDatabaseTableColumn::create('sessionVariables')->drop(),
+		]),
+];
+
+(new DatabaseTableChangeProcessor(
+/** @var ScriptPackageInstallationPlugin $this */
+	$this->installation->getPackage(),
+	$tables,
+	WCF::getDB()->getEditor())
+)->process();
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),