From 3a3bc14d9c2bbd0ed2888f62b48b33ccc039d032 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Sun, 17 Feb 2019 20:30:26 +0000 Subject: [PATCH] Bug 10662: (QA follow-up) Make atomic update consistent with kohastructrure. Remove utf8 charset Signed-off-by: Josef Moravec --- installer/data/mysql/atomicupdate/bug_10662.sql | 12 ++++++------ installer/data/mysql/kohastructure.sql | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_10662.sql b/installer/data/mysql/atomicupdate/bug_10662.sql index 288cc5c..d65de7e 100644 --- a/installer/data/mysql/atomicupdate/bug_10662.sql +++ b/installer/data/mysql/atomicupdate/bug_10662.sql @@ -4,11 +4,11 @@ CREATE TABLE IF NOT EXISTS `oai_harvester_biblios` ( `import_oai_biblio_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `oai_repository` varchar(255) NOT NULL, - `oai_identifier` varchar(255) DEFAULT NULL, + `oai_repository` varchar(191) NOT NULL, + `oai_identifier` varchar(191) DEFAULT NULL, `biblionumber` int(11) NOT NULL, PRIMARY KEY (`import_oai_biblio_id`), - UNIQUE KEY `oai_record` (`oai_identifier`,`oai_repository`) USING BTREE, + UNIQUE KEY `oai_record` (`oai_identifier`,`oai_repository` (191)) USING BTREE, KEY `FK_import_oai_biblio_1` (`biblionumber`), CONSTRAINT `FK_import_oai_biblio_1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE NO ACTION ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -39,9 +39,9 @@ CREATE TABLE IF NOT EXISTS `oai_harvester_history` ( CREATE TABLE IF NOT EXISTS `oai_harvester_import_queue` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uuid` varchar(45) CHARACTER SET utf8 NOT NULL, - `status` varchar(45) CHARACTER SET utf8 NOT NULL DEFAULT 'new', - `result` text CHARACTER SET utf8 NOT NULL, + `uuid` varchar(45) NOT NULL, + `status` varchar(45) NOT NULL DEFAULT 'new', + `result` text NOT NULL, `result_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index ab6b337..e4d2157 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -4386,9 +4386,9 @@ CREATE TABLE `oai_harvester_history` ( DROP TABLE IF EXISTS `oai_harvester_import_queue`; CREATE TABLE `oai_harvester_import_queue` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uuid` varchar(45) CHARACTER SET utf8 NOT NULL, - `status` varchar(45) CHARACTER SET utf8 NOT NULL DEFAULT 'new', - `result` text CHARACTER SET utf8 NOT NULL, + `uuid` varchar(45) NOT NULL, + `status` varchar(45) NOT NULL DEFAULT 'new', + `result` text NOT NULL, `result_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- 2.1.4