gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 42310: (follow-up) Update Holidays.t for normalized calendar tables 

The normalization commit dropped `repeatable_holidays` and
`special_holidays` but t/db_dependent/Holidays.t still referenced them
directly via raw SQL, so the test blew up on the first
`DELETE FROM special_holidays` with "Table doesn't exist". The earlier
namespace follow-up touched this file but only renamed Koha::Calendar
references, missing the SQL.

Replace the legacy table references with the four new normalized tables:

  repeatable_holidays (weekday set)    -> library_weekly_closures
  repeatable_holidays (weekday NULL)   -> library_repeating_closures
  special_holidays (isexception=0)     -> library_single_closures
  special_holidays (isexception=1)     -> library_closure_exceptions

- Two fixture-cleanup DELETEs now wipe all four new tables.
- The copy_to_branch 'no duplicates' check, previously two raw-SQL
  queries against the old two tables, becomes four queries against the
  new tables, keyed on each table's natural unique key
  (library_id+weekday / library_id+day+month / library_id+date).
- Plan for the copy_to_branch subtest bumps from 8 to 10 to cover the
  two extra duplicate-check assertions.

Test plan:
1. prove t/db_dependent/Holidays.t
2. All 15 top-level tests pass, including the 10 subtest assertions in
   copy_to_branch.

Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Martin Renvoize 2026-04-22 15:36:25 +01:00 committed by Pedro Amorim
parent 811d8bfd37
commit e56aff8dfc
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
1 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
t/db_dependent/Holidays.t
View File

@ -44,7 +44,8 @@ subtest 'is_holiday timezone tests' => sub {
$schema->storage->txn_begin;
$dbh->do("DELETE FROM special_holidays");
$dbh->do("DELETE FROM library_single_closures");
$dbh->do("DELETE FROM library_closure_exceptions");
# Clear cache
Koha::Caches->get_instance->flush_all;
@ -141,8 +142,10 @@ is( $koha_calendar->is_holiday($monday), 0, 'Monday is not a closed day' );
is( $koha_calendar->is_holiday($christmas), 1, 'Christmas is a closed day' );
is( $koha_calendar->is_holiday($newyear), 1, 'New Years day is a closed day' );
$dbh->do("DELETE FROM repeatable_holidays");
$dbh->do("DELETE FROM special_holidays");
$dbh->do("DELETE FROM library_weekly_closures");
$dbh->do("DELETE FROM library_repeating_closures");
$dbh->do("DELETE FROM library_single_closures");
$dbh->do("DELETE FROM library_closure_exceptions");
my $custom_holiday = DateTime->new(
year => 2013,
@ -172,7 +175,7 @@ $schema->storage->txn_rollback;
subtest 'copy_to_branch' => sub {
plan tests => 8;
plan tests => 10;
$schema->storage->txn_begin;
@ -256,40 +259,70 @@ subtest 'copy_to_branch' => sub {
C4::Calendar->new( branchcode => $branch1 )->copy_to_branch($branch2);
#Select all rows with same values from database
my $dbh = C4::Context->dbh;
my $get_repeatable_holidays = "SELECT a.* FROM repeatable_holidays a
JOIN (SELECT branchcode, weekday, day, month, COUNT(*)
FROM repeatable_holidays
GROUP BY branchcode, weekday, day, month HAVING count(*) > 1) b
ON a.branchcode = b.branchcode
AND ( a.weekday = b.weekday OR (a.day = b.day AND a.month = b.month))
ORDER BY a.branchcode;";
my $sth = $dbh->prepare($get_repeatable_holidays);
my $dbh = C4::Context->dbh;
my $get_weekly_closures = "SELECT a.* FROM library_weekly_closures a
JOIN (SELECT library_id, weekday, COUNT(*)
FROM library_weekly_closures
GROUP BY library_id, weekday HAVING count(*) > 1) b
ON a.library_id = b.library_id AND a.weekday = b.weekday
ORDER BY a.library_id;";
my $sth = $dbh->prepare($get_weekly_closures);
$sth->execute;
my @repeatable_holidays;
my @weekly_closures;
while ( my $row = $sth->fetchrow_hashref ) {
push @repeatable_holidays, $row;
push @weekly_closures, $row;
}
is( scalar(@repeatable_holidays), 0, "None of the repeatable holidays were doubled" );
is( scalar(@weekly_closures), 0, "None of the weekly closures were doubled" );
my $get_special_holidays = "SELECT a.* FROM special_holidays a
JOIN (SELECT branchcode, day, month, year, isexception, COUNT(*)
FROM special_holidays
GROUP BY branchcode, day, month, year, isexception HAVING count(*) > 1) b
ON a.branchcode = b.branchcode
AND a.day = b.day AND a.month = b.month AND a.year = b.year AND a.isexception = b.isexception
ORDER BY a.branchcode;";
$sth = $dbh->prepare($get_special_holidays);
my $get_repeating_closures = "SELECT a.* FROM library_repeating_closures a
JOIN (SELECT library_id, day, month, COUNT(*)
FROM library_repeating_closures
GROUP BY library_id, day, month HAVING count(*) > 1) b
ON a.library_id = b.library_id AND a.day = b.day AND a.month = b.month
ORDER BY a.library_id;";
$sth = $dbh->prepare($get_repeating_closures);
$sth->execute;
my @special_holidays;
my @repeating_closures;
while ( my $row = $sth->fetchrow_hashref ) {
push @special_holidays, $row;
push @repeating_closures, $row;
}
is( scalar(@special_holidays), 0, "None of the special holidays were doubled" );
is( scalar(@repeating_closures), 0, "None of the repeating closures were doubled" );
my $get_single_closures = "SELECT a.* FROM library_single_closures a
JOIN (SELECT library_id, date, COUNT(*)
FROM library_single_closures
GROUP BY library_id, date HAVING count(*) > 1) b
ON a.library_id = b.library_id AND a.date = b.date
ORDER BY a.library_id;";
$sth = $dbh->prepare($get_single_closures);
$sth->execute;
my @single_closures;
while ( my $row = $sth->fetchrow_hashref ) {
push @single_closures, $row;
}
is( scalar(@single_closures), 0, "None of the single closures were doubled" );
my $get_closure_exceptions = "SELECT a.* FROM library_closure_exceptions a
JOIN (SELECT library_id, date, COUNT(*)
FROM library_closure_exceptions
GROUP BY library_id, date HAVING count(*) > 1) b
ON a.library_id = b.library_id AND a.date = b.date
ORDER BY a.library_id;";
$sth = $dbh->prepare($get_closure_exceptions);
$sth->execute;
my @closure_exceptions;
while ( my $row = $sth->fetchrow_hashref ) {
push @closure_exceptions, $row;
}
is( scalar(@closure_exceptions), 0, "None of the closure exceptions were doubled" );
$schema->storage->txn_rollback;