Attachment 87397 Details for Bug 21336 – Bug 21336: [DO_NOT_PUSH] DBIx changes

[patch] Bug 21336: [DO_NOT_PUSH] DBIx changes

Bug-21336-DONOTPUSH-DBIx-changes.patch (text/plain), 4.04 KB, created by Martin Renvoize (ashimema) on 2019-04-04 08:46:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-04-04 08:46:52 UTC

Size: 4.04 KB

patch

obsolete

>From 4d5ef1602913155561bf20fccdddfaffe453a543 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 29 Mar 2019 07:54:14 +0000
>Subject: [PATCH] Bug 21336: [DO_NOT_PUSH] DBIx changes
>
>MariaDB somehow turns current_timestamp into current_timestamp().
>The needed change is for column flgAnonymized.
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> Koha/Schema/Result/Borrower.pm        | 22 ++++++++++++++++++----
> Koha/Schema/Result/Deletedborrower.pm | 22 ++++++++++++++++++----
> 2 files changed, 36 insertions(+), 8 deletions(-)
>
>diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm
>index 0c439e90b6..5a55da0036 100644
>--- a/Koha/Schema/Result/Borrower.pm
>+++ b/Koha/Schema/Result/Borrower.pm
>@@ -424,7 +424,7 @@ __PACKAGE__->table("borrowers");
> 
>   data_type: 'timestamp'
>   datetime_undef_if_invalid: 1
>-  default_value: current_timestamp
>+  default_value: 'current_timestamp()'
>   is_nullable: 0
> 
> =head2 lastseen
>@@ -451,6 +451,13 @@ __PACKAGE__->table("borrowers");
>   data_type: 'mediumtext'
>   is_nullable: 1
> 
>+=head2 flgAnonymized
>+
>+  accessor: 'flg_anonymized'
>+  data_type: 'tinyint'
>+  default_value: 0
>+  is_nullable: 1
>+
> =cut
> 
> __PACKAGE__->add_columns(
>@@ -633,7 +640,7 @@ __PACKAGE__->add_columns(
>   {
>     data_type => "timestamp",
>     datetime_undef_if_invalid => 1,
>-    default_value => \"current_timestamp",
>+    default_value => "current_timestamp()",
>     is_nullable => 0,
>   },
>   "lastseen",
>@@ -653,6 +660,13 @@ __PACKAGE__->add_columns(
>   { data_type => "integer", default_value => 0, is_nullable => 1 },
>   "overdrive_auth_token",
>   { data_type => "mediumtext", is_nullable => 1 },
>+  "flgAnonymized",
>+  {
>+    accessor      => "flg_anonymized",
>+    data_type     => "tinyint",
>+    default_value => 0,
>+    is_nullable   => 1,
>+  },
> );
> 
> =head1 PRIMARY KEY
>@@ -1521,8 +1535,8 @@ Composing rels: L</aqorder_users> -> ordernumber
> __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber");
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2019-03-22 20:06:37
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dbRPH4TDrnUkzbJdgM5XcQ
>+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-29 08:05:50
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ok1RK9eyaiit+VV1UoocqA
> 
> __PACKAGE__->belongs_to(
>     "guarantor",
>diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm
>index 4d15e35c1f..910e6b8918 100644
>--- a/Koha/Schema/Result/Deletedborrower.pm
>+++ b/Koha/Schema/Result/Deletedborrower.pm
>@@ -421,7 +421,7 @@ __PACKAGE__->table("deletedborrowers");
> 
>   data_type: 'timestamp'
>   datetime_undef_if_invalid: 1
>-  default_value: current_timestamp
>+  default_value: 'current_timestamp()'
>   is_nullable: 0
> 
> =head2 lastseen
>@@ -448,6 +448,13 @@ __PACKAGE__->table("deletedborrowers");
>   data_type: 'mediumtext'
>   is_nullable: 1
> 
>+=head2 flgAnonymized
>+
>+  accessor: 'flg_anonymized'
>+  data_type: 'tinyint'
>+  default_value: 0
>+  is_nullable: 1
>+
> =cut
> 
> __PACKAGE__->add_columns(
>@@ -618,7 +625,7 @@ __PACKAGE__->add_columns(
>   {
>     data_type => "timestamp",
>     datetime_undef_if_invalid => 1,
>-    default_value => \"current_timestamp",
>+    default_value => "current_timestamp()",
>     is_nullable => 0,
>   },
>   "lastseen",
>@@ -638,11 +645,18 @@ __PACKAGE__->add_columns(
>   { data_type => "integer", default_value => 0, is_nullable => 1 },
>   "overdrive_auth_token",
>   { data_type => "mediumtext", is_nullable => 1 },
>+  "flgAnonymized",
>+  {
>+    accessor      => "flg_anonymized",
>+    data_type     => "tinyint",
>+    default_value => 0,
>+    is_nullable   => 1,
>+  },
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DNkNHNcv0lkMH6/seu89hg
>+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-29 08:05:50
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kgyApzJFqun2f7wMqG6DCg
> 
> 
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 21336: 79165 | 79166 | 79167 | 79168 | 79169 | 79170 | 80201 | 80202 | 80203 | 80204 | 80205 | 80206 | 80207 | 80208 | 80213 | 80214 | 80386 | 80387 | 80403 | 81112 | 81113 | 81114 | 81115 | 81116 | 81117 | 81118 | 81119 | 81270 | 81474 | 81475 | 81476 | 81477 | 81478 | 81479 | 81480 | 81481 | 81482 | 81483 | 82051 | 82052 | 82053 | 82054 | 82055 | 82056 | 82057 | 82058 | 82059 | 83202 | 83203 | 83204 | 83205 | 83206 | 83207 | 83208 | 83209 | 83256 | 87158 | 87159 | 87160 | 87161 | 87162 | 87163 | 87164 | 87165 | 87166 | 87167 | 87168 | 87176 | 87177 | 87178 | 87179 | 87180 | 87181 | 87182 | 87183 | 87184 | 87185 | 87387 | 87388 | 87389 | 87390 | 87391 | 87392 | 87393 | 87394 | 87395 | 87396 | 87397 | 87400 | 87401 | 88198 | 88199 | 88217 | 88218