From 21f8b51cf4f44c57e7d63884ecd5da0c51370fff Mon Sep 17 00:00:00 2001 From: Marcel de Rooy 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 Signed-off-by: Martin Renvoize --- 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 -> 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