Bugzilla – Attachment 156828 Details for
Bug 30719
ILL should provide the ability to create batch requests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30719: QA follow-up: DB updates
Bug-30719-QA-follow-up-DB-updates.patch (text/plain), 6.61 KB, created by
Pedro Amorim
on 2023-10-11 14:53:32 UTC
(
hide
)
Description:
Bug 30719: QA follow-up: DB updates
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-10-11 14:53:32 UTC
Size:
6.61 KB
patch
obsolete
>From d6890e6e14783e55c87c2acc76d9090fbedb0fea Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Wed, 11 Oct 2023 14:41:48 +0000 >Subject: [PATCH] Bug 30719: QA follow-up: DB updates > >updates to atomicupdate and kohastructure.sql >--- > .../atomicupdate/bug_30719_add_ill_batches.pl | 55 +++++-------------- > installer/data/mysql/kohastructure.sql | 1 + > 2 files changed, 15 insertions(+), 41 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_30719_add_ill_batches.pl b/installer/data/mysql/atomicupdate/bug_30719_add_ill_batches.pl >index 76329b35dd..e49efc369b 100755 >--- a/installer/data/mysql/atomicupdate/bug_30719_add_ill_batches.pl >+++ b/installer/data/mysql/atomicupdate/bug_30719_add_ill_batches.pl >@@ -10,14 +10,14 @@ return { > unless ( TableExists('illbatch_statuses') ) { > $dbh->do( > q{ >- CREATE TABLE`illbatch_statuses` ( >+ CREATE TABLE `illbatch_statuses` ( > `id` int(11) NOT NULL auto_increment COMMENT "Status ID", > `name` varchar(100) NOT NULL COMMENT "Name of status", > `code` varchar(20) NOT NULL COMMENT "Unique, immutable code for status", > `is_system` tinyint(1) COMMENT "Is this status required for system operation", >- PRIMARY KEY (`id`), >+ PRIMARY KEY(`id`), > UNIQUE KEY `u_illbatchstatuses__code` (`code`) >- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci >+ ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci; > } > ); > >@@ -28,18 +28,18 @@ return { > $dbh->do( > q{ > CREATE TABLE `illbatches` ( >- `id` int(11) NOT NULL auto_increment COMMENT "Batch ID", >+ `ill_batch_id` int(11) NOT NULL auto_increment COMMENT "Batch ID", > `name` varchar(100) NOT NULL COMMENT "Unique name of batch", > `backend` varchar(20) NOT NULL COMMENT "Name of batch backend", >- `borrowernumber` int(11) COMMENT "Patron associated with batch", >- `branchcode` varchar(50) COMMENT "Branch associated with batch", >- `statuscode` varchar(20) COMMENT "Status of batch", >- PRIMARY KEY (`id`), >+ `patron_id` int(11) NULL DEFAULT NULL COMMENT "Patron associated with batch", >+ `library_id` varchar(50) NULL DEFAULT NULL COMMENT "Branch associated with batch", >+ `status_code` varchar(20) NULL DEFAULT NULL COMMENT "Status of batch", >+ PRIMARY KEY (`ill_batch_id`), > UNIQUE KEY `u_illbatches__name` (`name`), >- CONSTRAINT `illbatches_bnfk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE, >- CONSTRAINT `illbatches_bcfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE CASCADE, >- CONSTRAINT `illbatches_sfk` FOREIGN KEY (`statuscode`) REFERENCES `illbatch_statuses` (`code`) ON DELETE SET NULL ON UPDATE CASCADE >- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci >+ CONSTRAINT `illbatches_bnfk` FOREIGN KEY (`patron_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE, >+ CONSTRAINT `illbatches_bcfk` FOREIGN KEY (`library_id`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE CASCADE, >+ CONSTRAINT `illbatches_sfk` FOREIGN KEY (`status_code`) REFERENCES `illbatch_statuses` (`code`) ON DELETE SET NULL ON UPDATE CASCADE >+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > } > ); > >@@ -49,7 +49,7 @@ return { > $dbh->do( > q{ > ALTER TABLE `illrequests` >- ADD COLUMN `batch_id` int(11) AFTER backend -- Optional ID of batch that this request belongs to >+ ADD COLUMN `batch_id` int(11) COMMENT 'Optional ID of batch that this request belongs to' AFTER backend > } > ); > >@@ -60,34 +60,7 @@ return { > $dbh->do( > q{ > ALTER TABLE `illrequests` >- ADD CONSTRAINT `illrequests_ibfk` FOREIGN KEY (`batch_id`) REFERENCES `illbatches` (`id`) ON DELETE SET NULL ON UPDATE CASCADE >- } >- ); >- } >- >- unless ( foreign_key_exists( 'illbatches', 'illbatches_bnfk' ) ) { >- $dbh->do( >- q{ >- ALTER TABLE `illbatches` >- ADD CONSTRAINT `illbatches_bnfk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE >- } >- ); >- } >- >- unless ( foreign_key_exists( 'illbatches', 'illbatches_bcfk' ) ) { >- $dbh->do( >- q{ >- ALTER TABLE `illbatches` >- ADD CONSTRAINT `illbatches_bcfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE CASCADE >- } >- ); >- } >- >- unless ( foreign_key_exists( 'illbatches', 'illbatches_sfk' ) ) { >- $dbh->do( >- q{ >- ALTER TABLE `illbatches` >- ADD CONSTRAINT `illbatches_sfk` FOREIGN KEY (`statuscode`) REFERENCES `illbatch_statuses` (`code`) ON DELETE SET NULL ON UPDATE CASCADE >+ ADD CONSTRAINT `illrequests_ibfk` FOREIGN KEY (`batch_id`) REFERENCES `illbatches` (`ill_batch_id`) ON DELETE SET NULL ON UPDATE CASCADE > } > ); > } >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index caaacd3fe6..9e796f884b 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -3366,6 +3366,7 @@ CREATE TABLE `illrequests` ( > KEY `illrequests_bcfk_2` (`branchcode`), > KEY `illrequests_safk` (`status_alias`), > KEY `illrequests_bibfk` (`biblio_id`), >+ KEY `illrequests_ibfk` (`batch_id`), > CONSTRAINT `illrequests_bcfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, > CONSTRAINT `illrequests_bibfk` FOREIGN KEY (`biblio_id`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE, > CONSTRAINT `illrequests_bnfk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, >-- >2.30.2
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 30719
:
144281
|
144285
|
144286
|
144287
|
144288
|
144289
|
144290
|
144291
|
144292
|
144293
|
144294
|
144295
|
144296
|
144297
|
144298
|
144299
|
144300
|
144301
|
144302
|
145760
|
145869
|
145870
|
145876
|
145934
|
146152
|
147658
|
147929
|
147930
|
147931
|
147932
|
147933
|
147934
|
147952
|
147953
|
147954
|
147955
|
147956
|
151152
|
151153
|
151154
|
151155
|
151156
|
151284
|
151285
|
151286
|
151287
|
151288
|
151303
|
151304
|
151305
|
151306
|
151307
|
151308
|
151309
|
151310
|
151311
|
151312
|
151513
|
151514
|
151515
|
151516
|
151517
|
151519
|
151520
|
151521
|
151522
|
151523
|
151571
|
151572
|
151573
|
151574
|
151575
|
151611
|
151612
|
151613
|
151614
|
151615
|
151804
|
151805
|
151806
|
151807
|
151808
|
151809
|
154046
|
154047
|
154048
|
154049
|
154050
|
154051
|
154052
|
155421
|
155422
|
155423
|
155424
|
155425
|
155426
|
155427
|
155428
|
155429
|
155430
|
155431
|
155432
|
155433
|
155434
|
155435
|
156556
|
156748
|
156749
|
156752
|
156783
|
156785
|
156811
|
156812
|
156827
| 156828