Bugzilla – Attachment 139792 Details for
Bug 23681
Make patron restrictions user definable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23681: (QA follow-up) debarment_types => restriction_types
Bug-23681-QA-follow-up-debarmenttypes--restriction.patch (text/plain), 6.58 KB, created by
Martin Renvoize (ashimema)
on 2022-08-25 11:39:37 UTC
(
hide
)
Description:
Bug 23681: (QA follow-up) debarment_types => restriction_types
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-25 11:39:37 UTC
Size:
6.58 KB
patch
obsolete
>From 99eb9c3f1ffbf7fb57221a3432b7a59c9a79df8c Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 19 Aug 2022 12:42:21 -0300 >Subject: [PATCH] Bug 23681: (QA follow-up) debarment_types => > restriction_types > >The code moved from *debarments* to *restrictions* but the table didn't. >This patch just renames things accordingly. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../data/mysql/atomicupdate/bug_23681.pl | 35 +++++++++++-------- > ...tions.yml => patron_restriction_types.yml} | 2 +- > installer/data/mysql/kohastructure.sql | 17 ++++----- > 3 files changed, 30 insertions(+), 24 deletions(-) > rename installer/data/mysql/en/mandatory/{patron_restrictions.yml => patron_restriction_types.yml} (98%) > >diff --git a/installer/data/mysql/atomicupdate/bug_23681.pl b/installer/data/mysql/atomicupdate/bug_23681.pl >index 422de181bc..c3e30cc05f 100755 >--- a/installer/data/mysql/atomicupdate/bug_23681.pl >+++ b/installer/data/mysql/atomicupdate/bug_23681.pl >@@ -7,24 +7,28 @@ return { > my ($args) = @_; > my ($dbh, $out) = @$args{qw(dbh out)}; > >- $dbh->do(q{ >- CREATE TABLE IF NOT EXISTS debarment_types ( >- code varchar(50) NOT NULL PRIMARY KEY, >- display_text text NOT NULL, >- is_system tinyint(1) NOT NULL DEFAULT 0, >- is_default tinyint(1) NOT NULL DEFAULT 0 >- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; >- }); >- say $out "Added debarment_types table"; >+ unless ( TableExists('restriction_types') ) { >+ $dbh->do(q{ >+ CREATE TABLE `restriction_types` ( >+ `code` varchar(50) NOT NULL, >+ `display_text` text NOT NULL, >+ `is_system` tinyint(1) NOT NULL DEFAULT 0, >+ `is_default` tinyint(1) NOT NULL DEFAULT 0, >+ PRIMARY KEY (`code`) >+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; >+ }); >+ >+ say $out "Added restriction_types table"; >+ } > > $dbh->do(q{ >- INSERT IGNORE INTO debarment_types (code, display_text, is_system, is_default) VALUES >- ('MANUAL', 'Manual', 0, 1), >- ('OVERDUES', 'Overdues', 1, 0), >+ INSERT IGNORE INTO restriction_types (code, display_text, is_system, is_default) VALUES >+ ('MANUAL', 'Manual', 0, 1), >+ ('OVERDUES', 'Overdues', 1, 0), > ('SUSPENSION', 'Suspension', 1, 0), >- ('DISCHARGE', 'Discharge', 1, 0); >+ ('DISCHARGE', 'Discharge', 1, 0); > }); >- say $out "Added system debarment_types"; >+ say $out "Added system restriction_types"; > > unless ( foreign_key_exists('borrower_debarments', 'borrower_debarments_ibfk_2') ) { > $dbh->do(q{ >@@ -33,8 +37,9 @@ return { > }); > $dbh->do(q{ > ALTER TABLE borrower_debarments >- ADD CONSTRAINT borrower_debarments_ibfk_2 FOREIGN KEY (type) REFERENCES debarment_types(code) ON DELETE NO ACTION ON UPDATE CASCADE; >+ ADD CONSTRAINT `borrower_debarments_ibfk_2` FOREIGN KEY (`type`) REFERENCES `restriction_types` (`code`) ON DELETE NO ACTION ON UPDATE CASCADE; > }); >+ > say $out "Added borrower_debarments relation"; > } > >diff --git a/installer/data/mysql/en/mandatory/patron_restrictions.yml b/installer/data/mysql/en/mandatory/patron_restriction_types.yml >similarity index 98% >rename from installer/data/mysql/en/mandatory/patron_restrictions.yml >rename to installer/data/mysql/en/mandatory/patron_restriction_types.yml >index 634803469c..5299692324 100644 >--- a/installer/data/mysql/en/mandatory/patron_restrictions.yml >+++ b/installer/data/mysql/en/mandatory/patron_restriction_types.yml >@@ -21,7 +21,7 @@ description: > - "Default Koha system patron restriction types" > > tables: >- - debarment_types: >+ - restriction_types: > translatable: [] > multiline: [] > rows: >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index b19d86bb79..affa80e9c2 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1187,7 +1187,7 @@ CREATE TABLE `borrower_debarments` ( > `borrower_debarment_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for the restriction', > `borrowernumber` int(11) NOT NULL COMMENT 'foreign key for borrowers.borrowernumber for patron who is restricted', > `expiration` date DEFAULT NULL COMMENT 'expiration date of the restriction', >- `type` varchar(50) NOT NULL COMMENT 'type of restriction, FK to debarment_types.code', >+ `type` varchar(50) NOT NULL COMMENT 'type of restriction, FK to restriction_types.code', > `comment` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'comments about the restriction', > `manager_id` int(11) DEFAULT NULL COMMENT 'foreign key for borrowers.borrowernumber for the librarian managing the restriction', > `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'date the restriction was added', >@@ -1195,7 +1195,7 @@ CREATE TABLE `borrower_debarments` ( > PRIMARY KEY (`borrower_debarment_id`), > KEY `borrowernumber` (`borrowernumber`), > CONSTRAINT `borrower_debarments_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, >- CONSTRAINT `borrower_debarments_ibfk_2` FOREIGN KEY (`type`) REFERENCES `debarment_types` (`code`) ON DELETE NO ACTION ON UPDATE CASCADE >+ CONSTRAINT `borrower_debarments_ibfk_2` FOREIGN KEY (`type`) REFERENCES `restriction_types` (`code`) ON DELETE NO ACTION ON UPDATE CASCADE > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > /*!40101 SET character_set_client = @saved_cs_client */; > >@@ -2081,12 +2081,13 @@ CREATE TABLE `collections_tracking` ( > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > /*!40101 SET character_set_client = @saved_cs_client */; > >-DROP TABLE IF EXISTS `debarment_types`; >-CREATE TABLE debarment_types ( >- code varchar(50) NOT NULL PRIMARY KEY, >- display_text text NOT NULL, >- is_system tinyint(1) NOT NULL DEFAULT 0, >- is_default tinyint(1) NOT NULL DEFAULT 0 >+DROP TABLE IF EXISTS `restriction_types`; >+CREATE TABLE `restriction_types` ( >+ `code` varchar(50) NOT NULL, >+ `display_text` text NOT NULL, >+ `is_system` tinyint(1) NOT NULL DEFAULT 0, >+ `is_default` tinyint(1) NOT NULL DEFAULT 0, >+ PRIMARY KEY (`code`) > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > -- >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23681
:
93769
|
93770
|
93771
|
93772
|
93773
|
93774
|
93775
|
93776
|
93777
|
93778
|
93779
|
93780
|
93781
|
93782
|
93783
|
93784
|
93785
|
93786
|
94862
|
94863
|
94864
|
94865
|
94866
|
94867
|
94868
|
94869
|
94870
|
94896
|
94897
|
94898
|
94899
|
94900
|
94901
|
94902
|
94903
|
94904
|
95148
|
95255
|
95256
|
95257
|
95258
|
95259
|
95260
|
95261
|
95262
|
95263
|
95264
|
99893
|
99894
|
99895
|
99896
|
99897
|
99898
|
99899
|
99900
|
99901
|
99902
|
130373
|
130374
|
130375
|
130376
|
130377
|
130378
|
130379
|
130380
|
130381
|
130382
|
130383
|
130384
|
132302
|
132303
|
132304
|
132305
|
132306
|
132307
|
132308
|
132309
|
132310
|
132311
|
132312
|
132313
|
132314
|
132315
|
132316
|
132318
|
132319
|
132320
|
134512
|
134513
|
134514
|
134515
|
134516
|
134517
|
134518
|
134519
|
134520
|
134521
|
134522
|
134523
|
134524
|
134525
|
134526
|
134527
|
134528
|
134529
|
134580
|
134581
|
134582
|
134583
|
134584
|
134585
|
134586
|
134587
|
134588
|
134589
|
134590
|
134591
|
134592
|
134593
|
134594
|
134595
|
134596
|
134597
|
134598
|
134599
|
134600
|
134601
|
134602
|
134684
|
134685
|
134686
|
134687
|
134688
|
134689
|
134690
|
134691
|
134692
|
134693
|
134694
|
134696
|
134697
|
134698
|
134699
|
134700
|
134701
|
134702
|
134703
|
134704
|
134705
|
134706
|
134707
|
134708
|
136716
|
136717
|
136718
|
136719
|
136720
|
136721
|
136722
|
136723
|
136724
|
136725
|
136726
|
136727
|
136728
|
136729
|
136730
|
136731
|
136732
|
136733
|
136734
|
136735
|
136736
|
136737
|
136738
|
136739
|
137066
|
137067
|
137068
|
137069
|
137070
|
137071
|
137072
|
137073
|
137074
|
137075
|
137076
|
137077
|
137078
|
137079
|
137080
|
137081
|
137082
|
137083
|
137084
|
137085
|
137086
|
137087
|
137088
|
137089
|
137090
|
137091
|
137092
|
137093
|
137094
|
137102
|
137103
|
137104
|
137105
|
137106
|
137107
|
137108
|
137109
|
137110
|
137111
|
137112
|
137113
|
137114
|
137115
|
137116
|
137117
|
137118
|
137119
|
137120
|
137121
|
137122
|
137123
|
137124
|
137125
|
137126
|
137127
|
137128
|
137129
|
137130
|
139250
|
139251
|
139252
|
139253
|
139254
|
139255
|
139256
|
139257
|
139258
|
139259
|
139260
|
139261
|
139262
|
139263
|
139264
|
139265
|
139266
|
139267
|
139268
|
139269
|
139270
|
139271
|
139272
|
139273
|
139509
|
139512
|
139649
|
139717
|
139768
|
139769
|
139770
|
139771
|
139772
|
139773
|
139774
|
139775
|
139776
|
139777
|
139778
|
139779
|
139780
|
139781
|
139782
|
139783
|
139784
|
139785
|
139786
|
139787
|
139788
|
139789
|
139790
|
139791
| 139792 |
139793
|
139794
|
139795