Attachment 60616 Details for Bug 12461 – Bug 12461 - Remote collates from branchcode rows, add IGNORE for inserts

[patch] Bug 12461 - Remote collates from branchcode rows, add IGNORE for inserts

Bug-12461---Remote-collates-from-branchcode-rows-a.patch (text/plain), 2.97 KB, created by Kyle M Hall (khall) on 2017-02-23 14:55:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2017-02-23 14:55:00 UTC

Size: 2.97 KB

patch

obsolete

>From 91eb8840d4050bf845be087e6209b5a8f23eb6e0 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 23 Feb 2017 14:48:08 +0000
>Subject: [PATCH] Bug 12461 - Remote collates from branchcode rows, add IGNORE
> for inserts
>
>---
> installer/data/mysql/atomicupdate/bug_12461.sql | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_12461.sql b/installer/data/mysql/atomicupdate/bug_12461.sql
>index 3bd1294..f038ba5 100644
>--- a/installer/data/mysql/atomicupdate/bug_12461.sql
>+++ b/installer/data/mysql/atomicupdate/bug_12461.sql
>@@ -8,13 +8,13 @@ CREATE TABLE IF NOT EXISTS club_templates (
>   description text,
>   is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
>   is_email_required tinyint(1) NOT NULL DEFAULT '0',
>-  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
>+  branchcode varchar(10) NULL DEFAULT NULL,
>   date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
>   date_updated timestamp NULL DEFAULT NULL,
>   is_deletable tinyint(1) NOT NULL DEFAULT '1',
>   PRIMARY KEY (id),
>   KEY ct_branchcode (branchcode),
>-  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
>+  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (branchcode) REFERENCES `branches` (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
> 
> --
>@@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS clubs (
>   description text,
>   date_start date DEFAULT NULL,
>   date_end date DEFAULT NULL,
>-  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
>+  branchcode varchar(10) NULL DEFAULT NULL,
>   date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
>   date_updated timestamp NULL DEFAULT NULL,
>   PRIMARY KEY (id),
>@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS club_enrollments (
>   date_canceled timestamp NULL DEFAULT NULL,
>   date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
>   date_updated timestamp NULL DEFAULT NULL,
>-  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
>+  branchcode varchar(10) NULL DEFAULT NULL,
>   PRIMARY KEY (id),
>   KEY club_id (club_id),
>   KEY borrowernumber (borrowernumber),
>@@ -122,9 +122,9 @@ CREATE TABLE IF NOT EXISTS club_fields (
>   CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
> 
>-INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (21, 'clubs', 'Patron clubs', '0');
>+INSERT IGNORE INTO userflags (bit, flag, flagdesc, defaulton) VALUES (21, 'clubs', 'Patron clubs', '0');
> 
>-INSERT INTO permissions (module_bit, code, description) VALUES
>+INSERT IGNORE INTO permissions (module_bit, code, description) VALUES
>    (21, 'edit_templates', 'Create and update club templates'),
>    (21, 'edit_clubs', 'Create and update clubs'),
>    (21, 'enroll', 'Enroll patrons in clubs')
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 12461: 29105 | 30456 | 31567 | 35104 | 36098 | 36099 | 36192 | 38748 | 39181 | 43428 | 47821 | 47824 | 47825 | 47856 | 49110 | 49121 | 50422 | 50423 | 50426 | 50427 | 58818 | 58819 | 58820 | 59272 | 59273 | 60519 | 60520 | 60521 | 60610 | 60611 | 60612 | 60613 | 60614 | 60615 | 60616 | 60617 | 60618 | 60624 | 62778 | 62779 | 62813 | 62814 | 62815