Renamed COLLATE to utf8mb4_unicode_ci as per MB

opencart · Dec 12, 2024 · be77e88 · be77e88
1 parent 67fcd66
commit be77e88
Show file tree

Hide file tree

Showing 30 changed files with 211 additions and 211 deletions.
diff --git a/upload/admin/controller/extension/other/recurring.php b/upload/admin/controller/extension/other/recurring.php
@@ -727,7 +727,7 @@ public function install(): void {
 			`comment` text NOT NULL,
 			`date_added` datetime NOT NULL,
 			PRIMARY KEY (`order_recurring_history_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 		");
 
 		// Event

diff --git a/upload/admin/model/extension/advertise/google.php b/upload/admin/model/extension/advertise/google.php
@@ -804,7 +804,7 @@ public function createTables(): void {
             `is_modified` tinyint(1) NOT NULL DEFAULT '0',
             PRIMARY KEY (`product_advertise_google_id`),
             UNIQUE `product_id_store_id` (`product_id`, `store_id`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "googleshopping_product_status` (
             `product_id` int(11),
@@ -815,22 +815,22 @@ public function createTables(): void {
             `item_level_issues` text NOT NULL,
             `google_expiration_date` int(11) NOT NULL DEFAULT '0',
             PRIMARY KEY (`product_id`, `store_id`, `product_variation_id`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "googleshopping_product_target` (
             `product_id` int(11) NOT NULL,
             `store_id` int(11) NOT NULL DEFAULT '0',
             `advertise_google_target_id` int(11) UNSIGNED NOT NULL,
             PRIMARY KEY (`product_id`, `advertise_google_target_id`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "googleshopping_category` (
             `google_product_category` varchar(10) NOT NULL,
             `store_id` int(11) NOT NULL DEFAULT '0',
             `category_id` int(11) NOT NULL,
             INDEX `category_id_store_id` (`category_id`, `store_id`),
             PRIMARY KEY (`google_product_category`, `store_id`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "googleshopping_target` (
             `advertise_google_target_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -844,7 +844,7 @@ public function createTables(): void {
             `status` enum('paused','active') NOT NULL DEFAULT 'paused',
             INDEX `store_id` (`store_id`),
             PRIMARY KEY (`advertise_google_target_id`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/feed/google_base.php b/upload/admin/model/extension/feed/google_base.php
@@ -16,14 +16,14 @@ public function install(): void {
 				`google_base_category_id` int(11) NOT NULL AUTO_INCREMENT,
 				`name` varchar(255) NOT NULL,
 				PRIMARY KEY (`google_base_category_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE `" . DB_PREFIX . "google_base_category_to_category` (
 				`google_base_category_id` int(11) NOT NULL,
 				`category_id` int(11) NOT NULL,
 				PRIMARY KEY (`google_base_category_id`, `category_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/fraud/fraudlabspro.php b/upload/admin/model/extension/fraud/fraudlabspro.php
@@ -61,7 +61,7 @@ public function install(): void {
 				`fraudlabspro_credits` VARCHAR(10) NOT NULL,
 				`api_key` CHAR(32) NOT NULL,
 				PRIMARY KEY (`order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 		");
 
 		$this->db->query("INSERT INTO `" . DB_PREFIX . "order_status` SET `language_id` = '1', `name` = 'Fraud'");

diff --git a/upload/admin/model/extension/fraud/ip.php b/upload/admin/model/extension/fraud/ip.php
@@ -16,7 +16,7 @@ public function install(): void {
 		  `ip` varchar(40) NOT NULL,
 		  `date_added` datetime NOT NULL,
 		  PRIMARY KEY (`ip`)
-		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 		");
 	}
 

diff --git a/upload/admin/model/extension/fraud/maxmind.php b/upload/admin/model/extension/fraud/maxmind.php
@@ -67,7 +67,7 @@ public function install(): void {
 			  `error` text NOT NULL,
 			  `date_added` datetime NOT NULL,
 			  PRIMARY KEY (`order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 		");
 	}
 

diff --git a/upload/admin/model/extension/payment/amazon_login_pay.php b/upload/admin/model/extension/payment/amazon_login_pay.php
@@ -27,7 +27,7 @@ public function install(): void {
 				`total` decimal(15,4) NOT NULL,
 				KEY `amazon_order_reference_id` (`amazon_order_reference_id`),
 				PRIMARY KEY `amazon_login_pay_order_id` (`amazon_login_pay_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 		");
 
 		$this->db->query("
@@ -42,7 +42,7 @@ public function install(): void {
 			  `status` enum(\\'Open\\',\\'Pending\\',\\'Completed\\',\\'Suspended\\',\\'Declined\\',\\'Closed\\',\\'Canceled\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`amazon_login_pay_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 			");
 	}
 

diff --git a/upload/admin/model/extension/payment/bluepay_hosted.php b/upload/admin/model/extension/payment/bluepay_hosted.php
@@ -24,7 +24,7 @@ public function install(): void {
 			  `date_added` datetime NOT NULL,
 			  `date_modified` datetime NOT NULL,
 			  PRIMARY KEY (`bluepay_hosted_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "bluepay_hosted_order_transaction` (
@@ -34,7 +34,7 @@ public function install(): void {
 			  `amount` decimal(15,4) NOT NULL,
 			  `date_added` datetime NOT NULL,
 			  PRIMARY KEY (`bluepay_hosted_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "bluepay_hosted_card` (
@@ -45,7 +45,7 @@ public function install(): void {
 			  `expiry` varchar(5) NOT NULL,
 			  `type` varchar(50) NOT NULL,
 			  PRIMARY KEY (`card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/bluepay_redirect.php b/upload/admin/model/extension/payment/bluepay_redirect.php
@@ -24,7 +24,7 @@ public function install(): void {
 			  `currency_code` varchar(3) NOT NULL,
 			  `total` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`bluepay_redirect_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "bluepay_redirect_order_transaction` (
@@ -34,7 +34,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'rebate\\',\\'void\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`bluepay_redirect_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "bluepay_redirect_card` (
@@ -45,7 +45,7 @@ public function install(): void {
 			  `expiry` varchar(5) NOT NULL,
 			  `type` varchar(50) NOT NULL,
 			  PRIMARY KEY (`card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/cardconnect.php b/upload/admin/model/extension/payment/cardconnect.php
@@ -23,7 +23,7 @@ public function install(): void {
 			  `expiry` varchar(4) NOT NULL DEFAULT '',
 			  `date_added` datetime NOT NULL,
 			  PRIMARY KEY (`cardconnect_card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "cardconnect_order` (
@@ -37,7 +37,7 @@ public function install(): void {
 			  `total` decimal(15,4) NOT NULL DEFAULT '0.0000',
 			  `date_added` datetime NOT NULL,
 			  PRIMARY KEY (`cardconnect_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "cardconnect_order_transaction` (
@@ -50,7 +50,7 @@ public function install(): void {
 			  `date_modified` datetime NOT NULL,
 			  `date_added` datetime NOT NULL,
 			  PRIMARY KEY (`cardconnect_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/cardinity.php b/upload/admin/model/extension/payment/cardinity.php
@@ -151,7 +151,7 @@ public function install(): void {
 			  `order_id` int(11) NOT NULL,
 			  `payment_id` varchar(255),
 			  PRIMARY KEY (`cardinity_order_id`)
-			) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8_general_ci;
 		");
 	}
 

diff --git a/upload/admin/model/extension/payment/eway.php b/upload/admin/model/extension/payment/eway.php
@@ -25,7 +25,7 @@ public function install(): void {
 			  `void_status` int(1) NOT NULL DEFAULT '0',
 			  `refund_status` int(1) NOT NULL DEFAULT '0',
 			  PRIMARY KEY (`eway_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "eway_transactions` (
@@ -36,7 +36,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'refund\\',\\'void\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`eway_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "eway_card` (
@@ -48,7 +48,7 @@ public function install(): void {
 			  `expiry` varchar(5) NOT NULL,
 			  `type` varchar(50) NOT NULL,
 			  PRIMARY KEY (`card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/firstdata.php b/upload/admin/model/extension/payment/firstdata.php
@@ -29,7 +29,7 @@ public function install(): void {
 			  `account` varchar(30) NOT NULL,
 			  `total` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`firstdata_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "firstdata_order_transaction` (
@@ -39,7 +39,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'void\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`firstdata_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "firstdata_card` (
@@ -51,7 +51,7 @@ public function install(): void {
 			  `expire_year` int(2) NOT NULL,
 			  `token` varchar(64) NOT NULL,
 			  PRIMARY KEY (`firstdata_card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/firstdata_remote.php b/upload/admin/model/extension/payment/firstdata_remote.php
@@ -26,7 +26,7 @@ public function install(): void {
 			  `authcode` varchar(30) NOT NULL,
 			  `total` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`firstdata_remote_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "firstdata_remote_order_transaction` (
@@ -36,7 +36,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'refund\\',\\'void\\') DEFAULT NULL,
 			  `amount` DECIMAL(15,4) NOT NULL,
 			  PRIMARY KEY (`firstdata_remote_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "firstdata_remote_card` (
@@ -49,7 +49,7 @@ public function install(): void {
 			  `card_type` varchar(15) NOT NULL,
 			  `token` varchar(64) NOT NULL,
 			  PRIMARY KEY (`firstdata_remote_card_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/g2apay.php b/upload/admin/model/extension/payment/g2apay.php
@@ -23,7 +23,7 @@ public function install(): void {
 				`total` decimal(15,4) NOT NULL,
 				KEY `g2apay_transaction_id` (`g2apay_transaction_id`),
 				PRIMARY KEY `g2apay_order_id` (`g2apay_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "g2apay_order_transaction` (
@@ -33,7 +33,7 @@ public function install(): void {
 			  `type` enum(\\'payment\\',\\'refund\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`g2apay_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/globalpay.php b/upload/admin/model/extension/payment/globalpay.php
@@ -30,7 +30,7 @@ public function install(): void {
 			  `account` varchar(30) NOT NULL,
 			  `total` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`globalpay_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "globalpay_order_transaction` (
@@ -40,7 +40,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'rebate\\',\\'void\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`globalpay_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/globalpay_remote.php b/upload/admin/model/extension/payment/globalpay_remote.php
@@ -30,7 +30,7 @@ public function install(): void {
 			  `account` varchar(30) NOT NULL,
 			  `total` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`globalpay_remote_order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("
 			CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "globalpay_remote_order_transaction` (
@@ -40,7 +40,7 @@ public function install(): void {
 			  `type` enum(\\'auth\\',\\'payment\\',\\'rebate\\',\\'void\\') DEFAULT NULL,
 			  `amount` decimal(15,4) NOT NULL,
 			  PRIMARY KEY (`globalpay_remote_order_transaction_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**

diff --git a/upload/admin/model/extension/payment/laybuy.php b/upload/admin/model/extension/payment/laybuy.php
@@ -389,7 +389,7 @@ public function install(): void {
 			`laybuy_ref_no` int(11) NOT NULL DEFAULT '0',
 			`date_added` datetime NOT NULL,
 			PRIMARY KEY (`laybuy_transaction_id`)
-		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "laybuy_revise_request` (
 			`laybuy_revise_request_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -421,7 +421,7 @@ public function install(): void {
 			`payment_type` tinyint(1) NOT NULL DEFAULT '1',
 			`date_added` datetime NOT NULL,
 			PRIMARY KEY (`laybuy_revise_request_id`)
-		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci");
+		) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
 
 		// Events
 		$this->load->model('setting/event');

diff --git a/upload/admin/model/extension/payment/opayo.php b/upload/admin/model/extension/payment/opayo.php
@@ -22,7 +22,7 @@ public function install(): void {
 			  PRIMARY KEY (`card_id`),
 			  KEY (`customer_id`),
 			  KEY (`token`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "opayo_order` (
 			  `opayo_order_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -42,7 +42,7 @@ public function install(): void {
 			  `date_modified` datetime NOT NULL,
 			  PRIMARY KEY (`opayo_order_id`),
 			  KEY (`order_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "opayo_subscription` (
 			  `opayo_subscription_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -63,7 +63,7 @@ public function install(): void {
 			  PRIMARY KEY (`opayo_subscription_id`),
 			  KEY (`order_id`),
 			  KEY (`subscription_id`)
-			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
 		$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "opayo_subscription_transaction` (
 				`opayo_subscription_transaction_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -73,7 +73,7 @@ public function install(): void {
 				`date_added` datetime NOT NULL,
 				PRIMARY KEY (`opayo_subscription_transaction_id`),
 				KEY (`opayo_order_id`)
-			  ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");
+			  ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 	}
 
 	/**