From 311cda80af58eed0f7631c6b461a083d06b050df Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Tue, 11 Oct 2022 18:41:08 +0200
Subject: [PATCH] Fixed an invalid primary key in web.sql (#7304)

Fixes #7290

Thanks to @Tolimatoi
---
 sql-files/upgrades/upgrade_20221001.sql | 4 ++++
 sql-files/web.sql                       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 sql-files/upgrades/upgrade_20221001.sql

diff --git a/sql-files/upgrades/upgrade_20221001.sql b/sql-files/upgrades/upgrade_20221001.sql
new file mode 100644
index 0000000000..a2c09ba059
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20221001.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `merchant_configs`
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`world_name`, `account_id`, `char_id`, `store_type`)
+;
diff --git a/sql-files/web.sql b/sql-files/web.sql
index d5c952fee1..b0c3311a3e 100644
--- a/sql-files/web.sql
+++ b/sql-files/web.sql
@@ -46,5 +46,5 @@ CREATE TABLE IF NOT EXISTS `merchant_configs` (
   `char_id` INT(11) UNSIGNED NOT NULL,
   `store_type` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   `data` longtext NOT NULL,
-  PRIMARY KEY (`world_name`, `account_id`, `char_id`)
+  PRIMARY KEY (`world_name`, `account_id`, `char_id`, `store_type`)
 ) ENGINE=MyISAM;