Attachment 160414 Details for Bug 35539 – Bug 35539: Remove 'bulk' column/field from categories table

[patch] Bug 35539: Remove 'bulk' column/field from categories table

Bug-35539-Remove-bulk-columnfield-from-categories-.patch (text/plain), 7.13 KB, created by David Nind on 2024-01-02 17:35:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-01-02 17:35:40 UTC

Size: 7.13 KB

patch

obsolete

>From 70e2737f6f6c60c46df7f8dfb5562b6ae10e6b06 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Tue, 2 Jan 2024 11:55:36 +0000
>Subject: [PATCH] Bug 35539: Remove 'bulk' column/field from categories table
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> Koha/Patron/Category.pm                          |  1 -
> .../data/mysql/en/optional/patron_categories.yml | 12 ------------
> installer/data/mysql/kohastructure.sql           |  1 -
> t/db_dependent/Circulation/GetHardDueDate.t      | 16 +++++++---------
> 4 files changed, 7 insertions(+), 23 deletions(-)
>
>diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm
>index 2967abe039..d0011545ca 100644
>--- a/Koha/Patron/Category.pm
>+++ b/Koha/Patron/Category.pm
>@@ -246,7 +246,6 @@ sub to_api_mapping {
>         upperagelimit                     => 'upper_age_limit',
>         dateofbirthrequired               => 'lower_age_limit',
>         finetype                          => undef,                                 # Unused
>-        bulk                              => undef,                                 # Unused
>         enrolmentfee                      => 'enrolment_fee',
>         overduenoticerequired             => 'overdue_notice_required',
>         issuelimit                        => undef,                                 # Unused
>diff --git a/installer/data/mysql/en/optional/patron_categories.yml b/installer/data/mysql/en/optional/patron_categories.yml
>index 3fb0a13ef8..67dd3e1c96 100644
>--- a/installer/data/mysql/en/optional/patron_categories.yml
>+++ b/installer/data/mysql/en/optional/patron_categories.yml
>@@ -53,7 +53,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -67,7 +66,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -81,7 +79,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -96,7 +93,6 @@ tables:
>           upperagelimit: 17
>           dateofbirthrequired: 5
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -110,7 +106,6 @@ tables:
>           upperagelimit: 17
>           dateofbirthrequired: 5
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -124,7 +119,6 @@ tables:
>           upperagelimit: 17
>           dateofbirthrequired: 5
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -139,7 +133,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 0
>           issuelimit: ~
>@@ -153,7 +146,6 @@ tables:
>           upperagelimit: 17
>           dateofbirthrequired: 5
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -168,7 +160,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -182,7 +173,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -196,7 +186,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -211,7 +200,6 @@ tables:
>           upperagelimit: 999
>           dateofbirthrequired: 18
>           finetype: ~
>-          bulk: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 0
>           issuelimit: ~
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 16310f0f44..86a200d2a3 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1780,7 +1780,6 @@ CREATE TABLE `categories` (
>   `upperagelimit` smallint(6) DEFAULT NULL COMMENT 'age limit for the patron',
>   `dateofbirthrequired` tinyint(1) DEFAULT NULL COMMENT 'the minimum age required for the patron category',
>   `finetype` varchar(30) DEFAULT NULL COMMENT 'unused in Koha',
>-  `bulk` tinyint(1) DEFAULT NULL,
>   `enrolmentfee` decimal(28,6) DEFAULT NULL COMMENT 'enrollment fee for the patron',
>   `overduenoticerequired` tinyint(1) DEFAULT NULL COMMENT 'are overdue notices sent to this patron category (1 for yes, 0 for no)',
>   `issuelimit` smallint(6) DEFAULT NULL COMMENT 'unused in Koha',
>diff --git a/t/db_dependent/Circulation/GetHardDueDate.t b/t/db_dependent/Circulation/GetHardDueDate.t
>index 53ee08395d..bbd046a658 100755
>--- a/t/db_dependent/Circulation/GetHardDueDate.t
>+++ b/t/db_dependent/Circulation/GetHardDueDate.t
>@@ -80,7 +80,6 @@ my $samplecat = {
>     enrolmentperioddate   => undef,
>     dateofbirthrequired   => undef,
>     finetype              => undef,
>-    bulk                  => undef,
>     enrolmentfee          => undef,
>     overduenoticerequired => undef,
>     issuelimit            => undef,
>@@ -89,16 +88,15 @@ my $samplecat = {
>     category_type         => 'A',
> };
> my $query =
>-"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired ,finetype,bulk,enrolmentfee,overduenoticerequired,issuelimit ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?,?,?,?)";
>+"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired ,finetype,enrolmentfee,overduenoticerequired,issuelimit ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?,?,?)";
> $dbh->do(
>     $query, {},
>-    $samplecat->{categorycode},          $samplecat->{description},
>-    $samplecat->{enrolmentperiod},       $samplecat->{enrolmentperioddate},
>-    $samplecat->{dateofbirthrequired},   $samplecat->{finetype},
>-    $samplecat->{bulk},                  $samplecat->{enrolmentfee},
>-    $samplecat->{overduenoticerequired}, $samplecat->{issuelimit},
>-    $samplecat->{reservefee},            $samplecat->{hidelostitems},
>-    $samplecat->{category_type}
>+    $samplecat->{categorycode},        $samplecat->{description},
>+    $samplecat->{enrolmentperiod},     $samplecat->{enrolmentperioddate},
>+    $samplecat->{dateofbirthrequired}, $samplecat->{finetype},
>+    $samplecat->{enrolmentfee},        $samplecat->{overduenoticerequired},
>+    $samplecat->{issuelimit},          $samplecat->{reservefee},
>+    $samplecat->{hidelostitems},       $samplecat->{category_type}
> );
> 
> my $builder = t::lib::TestBuilder->new;
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35539: 160400 | 160401 | 160402 | 160403 | 160404 | 160413 | 160414 | 160415 | 160416 | 160417 | 160446 | 165724 | 169209 | 169210 | 169211 | 169212 | 169213 | 169214