Attachment 85229 Details for Bug 10662 – Bug 10662: (QA follow-up) Make atomic update consistent with kohastructrure. Remove utf8 charset

[patch] Bug 10662: (QA follow-up) Make atomic update consistent with kohastructrure. Remove utf8 charset

Bug-10662-QA-follow-up-Make-atomic-update-consiste.patch (text/plain), 3.08 KB, created by Josef Moravec on 2019-02-17 20:49:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-02-17 20:49:33 UTC

Size: 3.08 KB

patch

obsolete

>From 3a3bc14d9c2bbd0ed2888f62b48b33ccc039d032 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>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 <josef.moravec@gmail.com>
>---
> 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

Actions: View | Diff | Splinter Review

Attachments on bug 10662: 20757 | 20758 | 21954 | 42446 | 42447 | 42448 | 44792 | 44793 | 47675 | 48096 | 49832 | 50254 | 50980 | 51510 | 51511 | 51512 | 51514 | 51562 | 51563 | 51564 | 51565 | 51705 | 53258 | 53259 | 53260 | 53361 | 53362 | 64444 | 64445 | 64446 | 64479 | 64480 | 64481 | 65016 | 65017 | 65018 | 65019 | 68508 | 71008 | 71009 | 71010 | 71011 | 71012 | 71013 | 71014 | 71015 | 78569 | 78570 | 78571 | 78572 | 78573 | 78574 | 78575 | 78576 | 78577 | 78583 | 78601 | 78617 | 78754 | 78756 | 78758 | 78760 | 78762 | 78764 | 78767 | 78769 | 78771 | 78859 | 78860 | 78914 | 78956 | 79039 | 79045 | 81783 | 81784 | 81786 | 81789 | 81790 | 81855 | 81856 | 81861 | 81862 | 81863 | 81864 | 81902 | 82219 | 84318 | 84319 | 84320 | 84321 | 84322 | 85152 | 85224 | 85225 | 85226 | 85227 | 85228 | 85229 | 99739 | 99740 | 99741 | 99742 | 99743 | 99744 | 99745