From e1e8dfd3bec3013f1d4dafa9c5c384242a15d6e4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 15 Jul 2021 11:57:39 +0200
Subject: [PATCH] Add missing SQL log entry for `wcf1_acp_session_virtual`
 during upgrade to 5.4

This entry is required to be able to delete this table later in the process.
---
 com.woltlab.wcf/files_pre_check.tar           | Bin 5632 -> 10240 bytes
 com.woltlab.wcf/package.xml                   |   4 +-
 .../update_com.woltlab.wcf_5.4_fixSqlLog.php  |  70 ++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_fixSqlLog.php

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
index d2cc313a698675afda633b966370c7f21684cc44..16c365c731dd9babe3a4353d1f4c90670fbee06c 100644
GIT binary patch
literal 10240
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

delta 233
zcmZn&XwaFEZf0g;qQGEaU|?=$3Z@N=Abg;Zfr+`9p@N}_fw`f9i5ZZiU|?iwWN5;m
zU@+N`F-4%XxFoR%s5hk~CABy+J#V6;1S?P|Ep4KsG(SkcfdRxwAPv;8ViQw37hd}e
g4Nc6!_8AxfZ8kFo+GlKHWK6Doi}+X;7f7=J0BhMc%K!iX

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c89ce9d0a1..ad5c4b8ef0 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -54,13 +54,15 @@
 		<!--
 tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 	acp/update_com.woltlab.wcf_5.4_checkSystemRequirements.php \
-	acp/update_com.woltlab.wcf_5.4_checkOwnerGroup.php
+	acp/update_com.woltlab.wcf_5.4_checkOwnerGroup.php \
+	acp/update_com.woltlab.wcf_5.4_fixSqlLog.php
 		-->
 		<instruction type="file" run="standalone">files_pre_check.tar</instruction>
 		
 		<!-- Checks that need to happen before the upgrade starts. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_checkSystemRequirements.php</instruction>
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_checkOwnerGroup.php</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_fixSqlLog.php</instruction>
 
 		<!--
 tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_fixSqlLog.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_fixSqlLog.php
new file mode 100644
index 0000000000..b2b3d3327a
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_fixSqlLog.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Adds the missing SQL log entry for wcf1_acp_session_virtual. It might be missing
+ * in communities that were upgraded from 2.1 to 3.0.
+ *
+ * @author  Tim Duesterhus
+ * @copyright   2001-2021 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package WoltLabSuite\Core
+ */
+
+use wcf\system\WCF;
+
+$packageID = 1;
+$sqlTable = "wcf" . WCF_N . "_acp_session_virtual";
+$sqlColumn = '';
+$sqlIndex = '';
+
+$sql = "SELECT  isDone
+        FROM    wcf" . WCF_N . "_package_installation_sql_log
+        WHERE   packageID = ?
+            AND sqlTable = ?
+            AND sqlColumn = ?
+            AND sqlIndex = ?";
+$statement = WCF::getDB()->prepareStatement($sql);
+$statement->execute([
+    $packageID,
+    $sqlTable,
+    $sqlColumn,
+    $sqlIndex,
+]);
+
+$isDone = $statement->fetchSingleColumn();
+
+if ($isDone === false) {
+    // Create the record of no row can be found.
+    $sql = "INSERT INTO wcf" . WCF_N . "_package_installation_sql_log
+                (packageID, sqlTable, sqlColumn, sqlIndex, isDone)
+            VALUES
+                (?, ?, ?, ?, ?)";
+    $statement = WCF::getDB()->prepareStatement($sql);
+    $statement->execute([
+        $packageID,
+        $sqlTable,
+        $sqlColumn,
+        $sqlIndex,
+        1,
+    ]);
+} else {
+    if ($isDone) {
+        // The record exists with isDone = 1. We don't need to do anything.
+    } else {
+        // Mark the record as done, because the table must exist for the ACP to work.
+        $sql = "UPDATE  wcf" . WCF_N . "_package_installation_sql_log
+                SET     isDone = ?
+                WHERE   packageID = ?
+                    AND sqlTable = ?
+                    AND sqlColumn = ?
+                    AND sqlIndex = ?";
+        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement->execute([
+            1,
+            $packageID,
+            $sqlTable,
+            $sqlColumn,
+            $sqlIndex,
+        ]);
+    }
+}
-- 
2.20.1