Attachment 77111 Details for Bug 19166 – Bug 19166: Correct charset collate

[patch] Bug 19166: Correct charset collate

Bug-19166-Correct-charset-collate.patch (text/plain), 2.91 KB, created by Nick Clemens (kidclamp) on 2018-07-19 13:12:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2018-07-19 13:12:38 UTC

Size: 2.91 KB

patch

obsolete

>From 372b6d7e2aba98f30b0e107e3683a39c48120fb7 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 25 Apr 2018 09:55:48 -0300
>Subject: [PATCH] Bug 19166: Correct charset collate
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Budgets.pm                                    | 4 ++--
> installer/data/mysql/atomicupdate/bug_19166.perl | 2 +-
> installer/data/mysql/kohastructure.sql           | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Budgets.pm b/C4/Budgets.pm
>index 3ce512d..8e7cc86 100644
>--- a/C4/Budgets.pm
>+++ b/C4/Budgets.pm
>@@ -338,7 +338,7 @@ sub GetBudgetSpent {
>             datecancellationprinted IS NULL
>     |);
> 	$sth->execute($budget_id);
>-	my $sum = 0 + $sth->fetchrow_array;
>+    my $sum = 0 + $sth->fetchrow_array;
> 
>     $sth = $dbh->prepare(qq|
>         SELECT SUM(shipmentcost) AS sum
>@@ -369,7 +369,7 @@ sub GetBudgetOrdered {
>             datecancellationprinted IS NULL
>     |);
> 	$sth->execute($budget_id);
>-	my $sum =  0 + $sth->fetchrow_array;
>+    my $sum =  0 + $sth->fetchrow_array;
> 
>     my $adjustments = Koha::InvoiceAdjustments->search({budget_id => $budget_id, encumber_open => 1, closedate => undef},{ join => 'invoiceid' });
>     while ( my $adj = $adjustments->next ){
>diff --git a/installer/data/mysql/atomicupdate/bug_19166.perl b/installer/data/mysql/atomicupdate/bug_19166.perl
>index 76a901c..6088e99 100644
>--- a/installer/data/mysql/atomicupdate/bug_19166.perl
>+++ b/installer/data/mysql/atomicupdate/bug_19166.perl
>@@ -13,7 +13,7 @@ if( CheckVersion( $DBversion ) ) {
>             PRIMARY KEY (adjustment_id),
>             CONSTRAINT invoice_adjustments_fk_invoiceid FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE CASCADE ON UPDATE CASCADE,
>             CONSTRAINT invoice_adjustments_fk_budget_id FOREIGN KEY (budget_id) REFERENCES aqbudgets (budget_id) ON DELETE SET NULL ON UPDATE CASCADE
>-        )
>+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
>         " );
>     $dbh->do("INSERT IGNORE INTO authorised_value_categories (category_name) VALUES ('ADJ_REASON')");
>     SetVersion( $DBversion );
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 8ef1fc2..750b949 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -840,7 +840,7 @@ CREATE TABLE IF NOT EXISTS invoice_adjustments (
>     PRIMARY KEY (adjustment_id),
>     CONSTRAINT invoice_adjustments_fk_invoiceid FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE CASCADE ON UPDATE CASCADE,
>     CONSTRAINT invoice_adjustments_fk_budget_id FOREIGN KEY (budget_id) REFERENCES aqbudgets (budget_id) ON DELETE SET NULL ON UPDATE CASCADE
>-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
> 
> --
> -- Table structure for table `issuingrules`
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19166: 66475 | 66476 | 67599 | 67600 | 67601 | 67602 | 67890 | 70413 | 70414 | 70415 | 70416 | 72702 | 72703 | 72704 | 72705 | 72744 | 72978 | 73481 | 73482 | 73483 | 73484 | 73485 | 73486 | 73487 | 74742 | 74743 | 74744 | 74745 | 74746 | 74747 | 74748 | 74843 | 74893 | 74894 | 74895 | 74896 | 74897 | 74898 | 74899 | 74900 | 75014 | 75043 | 76994 | 76995 | 76996 | 76997 | 76998 | 76999 | 77000 | 77001 | 77002 | 77003 | 77004 | 77104 | 77105 | 77106 | 77107 | 77108 | 77109 | 77110 | 77111 | 77112 | 77113 | 77114 | 77115 | 77116 | 77117 | 77118 | 77119 | 77120 | 77121 | 77122 | 77123 | 77124 | 77125 | 77126 | 77127 | 77128 | 77129 | 77130 | 77131 | 77132 | 77133 | 77134 | 77329