From 030e150d3e38b58d9adf1719febabf51ed720864 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 11 Dec 2019 17:43:52 +0100
Subject: [PATCH] Incorrect foreign key comparison in MySQL 8, Code cleanup,
 Repeatable upgrade for failed DB migrations

---
 com.woltlab.wcf/files_pre.tar                 | Bin 195584 -> 198144 bytes
 com.woltlab.wcf/package.xml                   |  20 +++++++--------
 com.woltlab.wcf/update_5.2.sql                |   2 ++
 com.woltlab.wcf/update_5.2_pre_sql_api.sql    |   6 -----
 ...5.2.php => update_com.woltlab.wcf_5.2.php} |   7 ------
 .../update_com.woltlab.wcf_5.2_prePhpApi.php  |  23 ++++++++++++++++++
 ...te_com.woltlab.wcf_5.2_reactionUpdate.php} |   0
 ...ate_com.woltlab.wcf_5.2_reloadOptions.php} |   0
 .../index/DatabaseTableForeignKey.class.php   |  20 +++++++++++++--
 9 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 com.woltlab.wcf/update_5.2.sql
 delete mode 100644 com.woltlab.wcf/update_5.2_pre_sql_api.sql
 rename wcfsetup/install/files/acp/{update-com.woltlab.wcf_5.2.php => update_com.woltlab.wcf_5.2.php} (96%)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_prePhpApi.php
 rename wcfsetup/install/files/acp/{update-com.woltlab.wcf_5.2_reactionUpdate.php => update_com.woltlab.wcf_5.2_reactionUpdate.php} (100%)
 rename wcfsetup/install/files/acp/{update-com.woltlab.wcf_5.2_reloadOptions.php => update_com.woltlab.wcf_5.2_reloadOptions.php} (100%)

diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar
index 513c0bc6454d9b9f0c41a3a53b01e3a54fdfc84c..dc0774f9d6ffa1eaa3602116baefe76e8a16d995 100644
GIT binary patch
delta 20221
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
a(I?9nAgW~(t*~{3)z3eY{pP<tME(b$@*F(?

delta 20706
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

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 727311d952..6e7472eb89 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -60,23 +60,23 @@
 	<instructions type="update" fromversion="3.1.*">
 		<!-- TODO: Add a check for the minimum version and the PHP requirements! -->
 		
-		<instruction type="sql">update_5.2_pre_sql_api.sql</instruction>
-		
-		<!-- contains 3 PIP-scripts, \wcf\data\option\OptionEditor, \wcf\system\cache\builder\RoutingCacheBuilder, \wcf\system\database\table\ -->
+		<!-- Contains a few PIP-scripts, \wcf\data\option\OptionEditor, \wcf\system\cache\builder\RoutingCacheBuilder and \wcf\system\database\table\* -->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
 		
-		<!-- we need some new categories for execution of reactionUpdate already -->
+		<!-- Required language categories for the reactions. -->
 		<instruction type="language" run="standalone" />
 		
-		<!-- update database structure using new api -->
-		<instruction type="script" flushCache="false">acp/update-com.woltlab.wcf_5.2.php</instruction>
+		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_prePhpApi.php</instruction>
+		
+		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2.php</instruction>
+		
+		<!-- Convert likes to reactions. -->
+		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_reactionUpdate.php</instruction>
 		
-		<!-- convert likes to reactions -->
-		<instruction type="script" flushCache="false">acp/update-com.woltlab.wcf_5.2_reactionUpdate.php</instruction>
+		<instruction type="sql">update_5.2.sql</instruction>
 		
 		<instruction type="option" />
-		<!-- reload options using the new OptionEditor for providing the enterprise-mode option for further requests (required after file-PIP!) -->
-		<instruction type="script">acp/update-com.woltlab.wcf_5.2_reloadOptions.php</instruction>
+		<instruction type="script">acp/update_com.woltlab.wcf_5.2_reloadOptions.php</instruction>
 		
 		<instruction type="coreObject" />
 		
diff --git a/com.woltlab.wcf/update_5.2.sql b/com.woltlab.wcf/update_5.2.sql
new file mode 100644
index 0000000000..5fbc40d4f1
--- /dev/null
+++ b/com.woltlab.wcf/update_5.2.sql
@@ -0,0 +1,2 @@
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorTableBorder', 'rgba(221, 221, 221, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageThemeColor', ''); -- uses `$wcfHeaderBackground` if left empty
diff --git a/com.woltlab.wcf/update_5.2_pre_sql_api.sql b/com.woltlab.wcf/update_5.2_pre_sql_api.sql
deleted file mode 100644
index 3336bfe03c..0000000000
--- a/com.woltlab.wcf/update_5.2_pre_sql_api.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- The database API requires this column in order to work properly. DO NOT MOVE THIS! 
-ALTER TABLE wcf1_package_installation_sql_log ADD COLUMN isDone TINYINT(1) NOT NULL DEFAULT 1;
-
--- Let's do this here too, so we won't need another step for inserting two values
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorTableBorder', 'rgba(221, 221, 221, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageThemeColor', ''); -- uses `$wcfHeaderBackground` if left empty
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.php
similarity index 96%
rename from wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.php
rename to wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.php
index e4896d7914..04d7c03226 100644
--- a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.php
@@ -147,13 +147,6 @@ $tables = [
 				->onDelete('SET NULL')
 		]),
 	
-	// Re-create the key to turn it into a unique key: https://github.com/WoltLab/WCF/issues/3116
-	DatabaseTable::create('wcf1_package')
-		->indices([
-			DatabaseTableIndex::create('package')
-				->columns(['package'])
-				->drop()
-		]),
 	DatabaseTable::create('wcf1_package')
 		->indices([
 			DatabaseTableIndex::create('package')
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_prePhpApi.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_prePhpApi.php
new file mode 100644
index 0000000000..1f9df9dce4
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_prePhpApi.php
@@ -0,0 +1,23 @@
+<?php
+use wcf\system\WCF;
+
+// This script ensures that an upgrade that failed during the SQL changes can be repeated without requiring a rollback.
+
+$dbEditor = WCF::getDB()->getEditor();
+$existingColumns = $dbEditor->getColumns('wcf'.WCF_N.'_package_installation_sql_log');
+$hasIsDoneColumn = false;
+foreach ($existingColumns as $column) {
+	if ($column['name'] === 'isDone') {
+		$hasIsDoneColumn = true;
+		break;
+	}
+}
+
+if (!$hasIsDoneColumn) {
+	$dbEditor->addColumn('wcf'.WCF_N.'_package_installation_sql_log', 'isDone', [
+		'type' => 'tinyint',
+		'length' => 1,
+		'notNull' => 1,
+		'default' => 1,
+	]);
+}
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reactionUpdate.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_reactionUpdate.php
similarity index 100%
rename from wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reactionUpdate.php
rename to wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_reactionUpdate.php
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_reloadOptions.php
similarity index 100%
rename from wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php
rename to wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_reloadOptions.php
diff --git a/wcfsetup/install/files/lib/system/database/table/index/DatabaseTableForeignKey.class.php b/wcfsetup/install/files/lib/system/database/table/index/DatabaseTableForeignKey.class.php
index 65d332aff0..e2edc165d2 100644
--- a/wcfsetup/install/files/lib/system/database/table/index/DatabaseTableForeignKey.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/index/DatabaseTableForeignKey.class.php
@@ -116,8 +116,8 @@ class DatabaseTableForeignKey {
 	public function getData() {
 		return [
 			'columns' => implode(',', $this->getColumns()),
-			'ON DELETE' => $this->getOnDelete(),
-			'ON UPDATE' => $this->getOnUpdate(),
+			'ON DELETE' => $this->normalizeAction($this->getOnDelete()),
+			'ON UPDATE' => $this->normalizeAction($this->getOnUpdate()),
 			'referencedColumns' => implode(',', $this->getReferencedColumns()),
 			'referencedTable' => $this->getReferencedTable()
 		];
@@ -243,6 +243,22 @@ class DatabaseTableForeignKey {
 		return $this;
 	}
 	
+	/**
+	 * In MySQL, `ON * RESTRICT`, `ON * NO ACTION` or omitting it entirely, is completely the same. However,
+	 * MySQL 8 reports `NO ACTION` where MySQL 5.7 would identify the action as `null`. This method normalized
+	 * the action, by always setting it to null if the value is `RESTRICT` or `NO ACTION`.
+	 * 
+	 * @param string $action
+	 * @return string|null
+	 */
+	protected function normalizeAction($action) {
+		if ($action === 'RESTRICT' || $action === 'NO ACTION') {
+			return null;
+		}
+		
+		return $action;
+	}
+	
 	/**
 	 * Returns a `DatabaseTableForeignKey` object with the given name.
 	 * 
-- 
2.20.1