From f693cd0050902d69e356630137084f901ff2125e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 18 Feb 2025 12:48:38 +0000 Subject: [PATCH] Bug 26573: (QA follow-up) Correction to foreign key --- installer/data/mysql/atomicupdate/bug-26573.pl | 4 ++-- installer/data/mysql/kohastructure.sql | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug-26573.pl b/installer/data/mysql/atomicupdate/bug-26573.pl index b081280d551..264dd89039e 100755 --- a/installer/data/mysql/atomicupdate/bug-26573.pl +++ b/installer/data/mysql/atomicupdate/bug-26573.pl @@ -10,8 +10,8 @@ return { $dbh->do( q{ CREATE TABLE IF NOT EXISTS `borrower_attribute_types_categories` ( - `borrower_attribute_type_code` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, - `categorycode` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, + `borrower_attribute_type_code` varchar(64) NOT NULL, + `categorycode` varchar(10) NOT NULL, KEY `borrower_attribute_type_code` (`borrower_attribute_type_code`), KEY `categorycode` (`categorycode`), CONSTRAINT `borrower_attribute_types_categories_borrower_attribute_type_code` FOREIGN KEY (`borrower_attribute_type_code`) REFERENCES `borrower_attribute_types` (`code`) ON DELETE CASCADE ON UPDATE CASCADE, diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e21ee8a756e..a90f990016f 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1290,8 +1290,8 @@ DROP TABLE IF EXISTS `borrower_attribute_types_categories`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `borrower_attribute_types_categories` ( - `borrower_attribute_type_code` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, - `categorycode` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, + `borrower_attribute_type_code` varchar(64) NOT NULL, + `categorycode` varchar(10) NOT NULL, KEY `borrower_attribute_type_code` (`borrower_attribute_type_code`), KEY `categorycode` (`categorycode`), CONSTRAINT `borrower_attribute_types_categories_borrower_attribute_type_code` FOREIGN KEY (`borrower_attribute_type_code`) REFERENCES `borrower_attribute_types` (`code`) ON DELETE CASCADE ON UPDATE CASCADE, @@ -6770,4 +6770,4 @@ CREATE TABLE `zebraqueue` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-11-25 12:13:27 \ No newline at end of file +-- Dump completed on 2024-11-25 12:13:27 -- 2.48.1