Attachment 160415 Details for Bug 35539 – Bug 35539: Remove 'finetype' column/field from categories table

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

Bug-35539-Remove-finetype-columnfield-from-categor.patch (text/plain), 7.12 KB, created by David Nind on 2024-01-02 17:35:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

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

Size: 7.12 KB

patch

obsolete

>From 860a7ba6d05c1857b0dec7f8440caf00556ef390 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Tue, 2 Jan 2024 12:23:37 +0000
>Subject: [PATCH] Bug 35539: Remove 'finetype' 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          | 11 +++++------
> 4 files changed, 5 insertions(+), 20 deletions(-)
>
>diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm
>index d0011545ca..461baa973a 100644
>--- a/Koha/Patron/Category.pm
>+++ b/Koha/Patron/Category.pm
>@@ -245,7 +245,6 @@ sub to_api_mapping {
>         password_expiry_days              => 'password_expiry_days',
>         upperagelimit                     => 'upper_age_limit',
>         dateofbirthrequired               => 'lower_age_limit',
>-        finetype                          => 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 67dd3e1c96..488ee9e3c4 100644
>--- a/installer/data/mysql/en/optional/patron_categories.yml
>+++ b/installer/data/mysql/en/optional/patron_categories.yml
>@@ -52,7 +52,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -65,7 +64,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -78,7 +76,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -92,7 +89,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 17
>           dateofbirthrequired: 5
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -105,7 +101,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 17
>           dateofbirthrequired: 5
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -118,7 +113,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 17
>           dateofbirthrequired: 5
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -132,7 +126,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 0
>           issuelimit: ~
>@@ -145,7 +138,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 17
>           dateofbirthrequired: 5
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -159,7 +151,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -172,7 +163,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -185,7 +175,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 1
>           issuelimit: ~
>@@ -199,7 +188,6 @@ tables:
>           enrolmentperiod: 99
>           upperagelimit: 999
>           dateofbirthrequired: 18
>-          finetype: ~
>           enrolmentfee: '0.000000'
>           overduenoticerequired: 0
>           issuelimit: ~
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 86a200d2a3..9b5ae37672 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1779,7 +1779,6 @@ CREATE TABLE `categories` (
>   `password_expiry_days` smallint(6) DEFAULT NULL COMMENT 'number of days after which the patron must reset their password',
>   `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',
>   `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 bbd046a658..8a24c64f5c 100755
>--- a/t/db_dependent/Circulation/GetHardDueDate.t
>+++ b/t/db_dependent/Circulation/GetHardDueDate.t
>@@ -79,7 +79,6 @@ my $samplecat = {
>     enrolmentperiod       => undef,
>     enrolmentperioddate   => undef,
>     dateofbirthrequired   => undef,
>-    finetype              => undef,
>     enrolmentfee          => undef,
>     overduenoticerequired => undef,
>     issuelimit            => undef,
>@@ -88,15 +87,15 @@ my $samplecat = {
>     category_type         => 'A',
> };
> my $query =
>-"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired ,finetype,enrolmentfee,overduenoticerequired,issuelimit ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?,?,?)";
>+"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired,enrolmentfee,overduenoticerequired,issuelimit ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?,?)";
> $dbh->do(
>     $query, {},
>     $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}
>+    $samplecat->{dateofbirthrequired}, $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