Attachment 113396 Details for Bug 23916 – Bug 23916: (follow-up) Adapt all the things to the new column and accessor names

[patch] Bug 23916: (follow-up) Adapt all the things to the new column and accessor names

Bug-23916-follow-up-Adapt-all-the-things-to-the-ne.patch (text/plain), 3.47 KB, created by Jonathan Druart on 2020-11-10 13:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-11-10 13:46:18 UTC

Size: 3.47 KB

patch

obsolete

>From d9c0fb8ef2f0df0f8a189cf8891a4810f128d710 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 10 Nov 2020 14:45:57 +0100
>Subject: [PATCH] Bug 23916: (follow-up) Adapt all the things to the new column
> and accessor names
>
>---
> C4/Members.pm                                               | 4 ++--
> .../mysql/atomicupdate/bug_23916_add_issues_issuer.perl     | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Members.pm b/C4/Members.pm
>index cef9a2c633..a6760b8174 100644
>--- a/C4/Members.pm
>+++ b/C4/Members.pm
>@@ -276,7 +276,7 @@ sub GetAllIssues {
> 'SELECT issues.*, items.*, biblio.*, biblioitems.*, issues.timestamp as issuestimestamp, issues.renewals AS renewals,items.renewals AS totalrenewals,items.timestamp AS itemstimestamp,borrowers.firstname,borrowers.surname
>   FROM issues
>   LEFT JOIN items on items.itemnumber=issues.itemnumber
>-  LEFT JOIN borrowers on borrowers.borrowernumber=issues.issuer
>+  LEFT JOIN borrowers on borrowers.borrowernumber=issues.issuer_id
>   LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
>   LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
>   WHERE issues.borrowernumber=?
>@@ -284,7 +284,7 @@ sub GetAllIssues {
>   SELECT old_issues.*, items.*, biblio.*, biblioitems.*, old_issues.timestamp as issuestimestamp, old_issues.renewals AS renewals,items.renewals AS totalrenewals,items.timestamp AS itemstimestamp,borrowers.firstname,borrowers.surname
>   FROM old_issues
>   LEFT JOIN items on items.itemnumber=old_issues.itemnumber
>-  LEFT JOIN borrowers on borrowers.borrowernumber=old_issues.issuer
>+  LEFT JOIN borrowers on borrowers.borrowernumber=old_issues.issuer_id
>   LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
>   LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
>   WHERE old_issues.borrowernumber=? AND old_issues.itemnumber IS NOT NULL
>diff --git a/installer/data/mysql/atomicupdate/bug_23916_add_issues_issuer.perl b/installer/data/mysql/atomicupdate/bug_23916_add_issues_issuer.perl
>index d3d2095f53..0da7576b4a 100644
>--- a/installer/data/mysql/atomicupdate/bug_23916_add_issues_issuer.perl
>+++ b/installer/data/mysql/atomicupdate/bug_23916_add_issues_issuer.perl
>@@ -1,17 +1,17 @@
> $DBversion = 'XXX'; # will be replaced by the RM
> if( CheckVersion( $DBversion ) ) {
>-    if( !column_exists( 'issues', 'issuer' ) ) {
>+    if( !column_exists( 'issues', 'issuer_id' ) ) {
>         $dbh->do( q| ALTER TABLE issues ADD issuer_id INT(11) DEFAULT NULL AFTER borrowernumber | );
>     }
>     if (!foreign_key_exists( 'issues', 'issues_ibfk_borrowers_borrowernumber' )) {
>         $dbh->do( q| ALTER TABLE issues ADD CONSTRAINT `issues_ibfk_borrowers_borrowernumber` FOREIGN KEY (`issuer_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE | );
>     }
>-    if( !column_exists( 'old_issues', 'issuer' ) ) {
>+    if( !column_exists( 'old_issues', 'issuer_id' ) ) {
>         $dbh->do( q| ALTER TABLE old_issues ADD issuer_id INT(11) DEFAULT NULL AFTER borrowernumber | );
>     }
>     if (!foreign_key_exists( 'old_issues', 'old_issues_ibfk_borrowers_borrowernumber' )) {
>         $dbh->do( q| ALTER TABLE old_issues ADD CONSTRAINT `old_issues_ibfk_borrowers_borrowernumber` FOREIGN KEY (`issuer_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE | );
>     }
> 
>-    NewVersion( $DBversion, 23916, "Add issues.issuer";
>+    NewVersion( $DBversion, 23916, "Add issues.issuer_id";
> }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23916: 94914 | 94915 | 94916 | 94917 | 94918 | 95503 | 95504 | 95505 | 95506 | 95507 | 95508 | 95509 | 97719 | 97720 | 97721 | 97722 | 97723 | 97724 | 98586 | 98587 | 98588 | 98589 | 98590 | 98591 | 98594 | 99886 | 99887 | 99888 | 99889 | 99890 | 99891 | 110649 | 110650 | 110651 | 110652 | 110653 | 110654 | 110655 | 111485 | 111486 | 111487 | 111488 | 111489 | 111490 | 111491 | 111492 | 111966 | 111967 | 111968 | 111969 | 111970 | 111971 | 111972 | 111973 | 111974 | 112248 | 112249 | 112250 | 112251 | 112252 | 112253 | 112254 | 112255 | 112256 | 112257 | 112363 | 112364 | 112365 | 112366 | 112367 | 112368 | 112369 | 112370 | 112371 | 112372 | 112373 | 113035 | 113036 | 113037 | 113038 | 113039 | 113040 | 113041 | 113042 | 113043 | 113044 | 113045 | 113316 | 113317 | 113318 | 113319 | 113320 | 113321 | 113322 | 113323 | 113324 | 113325 | 113326 | 113327 | 113367 | 113368 | 113369 | 113370 | 113371 | 113372 | 113373 | 113374 | 113375 | 113376 | 113377 | 113378 | 113379 | 113380 | 113381 | 113382 | 113396