From 55262a6c99c09f64f2779a442b064d8fb68401aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Fri, 8 Jan 2021 16:47:02 +0100
Subject: [PATCH] Drop wcf1_acp_session when upgrading from 5.3

---
 com.woltlab.wcf/package.xml                   |  3 ++-
 ...com.woltlab.wcf_5.4_session_4_drop_acp.php | 26 +++++++++++++++++++
 ...ltlab.wcf_5.4_session_5_clean_session.php} | 14 +---------
 3 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_drop_acp.php
 rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.4_session_4_clean_session.php => update_com.woltlab.wcf_5.4_session_5_clean_session.php} (69%)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c298504d93..9b472776af 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -81,7 +81,8 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
 		
 		<!-- Cleanup for the new session system. -->
 		<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_session.php</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_4_drop_acp.php</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_5_clean_session.php</instruction>
 		
 		<!-- Non-critical database adjustments. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_db.php</instruction>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_drop_acp.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_drop_acp.php
new file mode 100644
index 0000000000..ced693420d
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_drop_acp.php
@@ -0,0 +1,26 @@
+<?php
+
+use wcf\system\database\table\DatabaseTableChangeProcessor;
+use wcf\system\database\table\PartialDatabaseTable;
+use wcf\system\WCF;
+
+/**
+ * Removes the wcf1_acp_session table.
+ * 
+ * @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')
+		->drop(),
+];
+
+(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_5_clean_session.php
similarity index 69%
rename from wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php
rename to wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_5_clean_session.php
index d0364041c2..e1f3e45642 100644
--- 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_5_clean_session.php
@@ -9,7 +9,7 @@ use wcf\system\database\table\PartialDatabaseTable;
 use wcf\system\WCF;
 
 /**
- * Adjusts wcf1_acp_session, wcf1_acp_session_access_log and wcf1_session.
+ * Adjusts wcf1_acp_session_access_log and wcf1_session.
  * 
  * @author	Tim Duesterhus
  * @copyright	2001-2020 WoltLab GmbH
@@ -18,18 +18,6 @@ use wcf\system\WCF;
  */
 
 $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')
-- 
2.20.1