Bugzilla – Attachment 75985 Details for
Bug 20271
Merge deleted biblio, biblioitems, biblio_metadata, and items tables
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20271: print instead of warn unmovable items
Bug-20271-print-instead-of-warn-unmovable-items.patch (text/plain), 5.71 KB, created by
Martin Renvoize (ashimema)
on 2018-06-12 14:18:08 UTC
(
hide
)
Description:
Bug 20271: print instead of warn unmovable items
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-06-12 14:18:08 UTC
Size:
5.71 KB
patch
obsolete
>From 4f960a3d41b04e286e6cae35ffaa829e70b87ea8 Mon Sep 17 00:00:00 2001 >From: Benjamin Rokseth <benjamin.rokseth@deichman.no> >Date: Sat, 14 Apr 2018 19:39:38 +0200 >Subject: [PATCH] Bug 20271: print instead of warn unmovable items > >Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > ...eleteitems_tables_with_their_alive_cousins.perl | 34 ++++++++++++---------- > 1 file changed, 18 insertions(+), 16 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_20271_-_merge_deletedbiblio_and_deleteitems_tables_with_their_alive_cousins.perl b/installer/data/mysql/atomicupdate/bug_20271_-_merge_deletedbiblio_and_deleteitems_tables_with_their_alive_cousins.perl >index db2385ef4a..47a47cc7a8 100644 >--- a/installer/data/mysql/atomicupdate/bug_20271_-_merge_deletedbiblio_and_deleteitems_tables_with_their_alive_cousins.perl >+++ b/installer/data/mysql/atomicupdate/bug_20271_-_merge_deletedbiblio_and_deleteitems_tables_with_their_alive_cousins.perl >@@ -6,9 +6,8 @@ if( CheckVersion( $DBversion ) ) { > $dbh->do( "ALTER TABLE items ADD COLUMN deleted_at datetime DEFAULT NULL" ) or warn $DBI::errstr; > > # Need to disable foreign keys on deletedbiblio_metadata to avoid cascading deletes from deletedbiblio >- # Bug 17196 introduced a mismatch in foreign keys of deletedbiblio_metadata, so dropping would fail >- $dbh->do( "ALTER TABLE deletedbiblio_metadata DISABLE KEYS" ); >- >+ # Bug 17196 introduced a mismatch in foreign keys of deletedbiblio_metadata, so any key must be dropped >+ DropAllForeignKeys('deletedbiblio_metadata'); > $dbh->do( "INSERT IGNORE INTO biblio SELECT *, timestamp AS deleted_at FROM deletedbiblio" ) or warn $DBI::errstr; > $dbh->do( "INSERT IGNORE INTO biblioitems SELECT *, timestamp AS deleted_at FROM deletedbiblioitems" ) or warn $DBI::errstr; > $dbh->do( "INSERT IGNORE INTO biblio_metadata SELECT *, timestamp AS deleted_at FROM deletedbiblio_metadata" ) or warn $DBI::errstr; >@@ -22,7 +21,8 @@ if( CheckVersion( $DBversion ) ) { > $sth->execute(); > my $row = $sth->fetchrow_hashref; > if ($row->{count}) { >- warn "There were $row->{count} deleteditems that could not be moved, please check '_deleteditems'."; >+ print "Warning to database administrator:\n" >+ . "There were $row->{count} deleteditems that could not be moved, please check '_deleteditems'.\n"; > $dbh->do("RENAME TABLE deleteditems TO _deleteditems"); > } else { > $dbh->do("DROP TABLE deleteditems"); >@@ -36,7 +36,8 @@ if( CheckVersion( $DBversion ) ) { > $sth->execute(); > my $row = $sth->fetchrow_hashref; > if ($row->{count}) { >- warn "There were $row->{count} deletedbiblio_metadata that could not be moved, please check '_deletedbiblio_metadata'."; >+ print "Warning to database administrator:\n" >+ . "There were $row->{count} deletedbiblio_metadata that could not be moved, please check '_deletedbiblio_metadata'.\n"; > $dbh->do("RENAME TABLE deletedbiblio_metadata TO _deletedbiblio_metadata"); > } else { > $dbh->do("DROP TABLE deletedbiblio_metadata"); >@@ -44,34 +45,35 @@ if( CheckVersion( $DBversion ) ) { > } > > { >- my $sth = $dbh->prepare("DELETE FROM deletedbiblio WHERE biblionumber IN (SELECT biblionumber FROM biblio)"); >+ my $sth = $dbh->prepare("DELETE FROM deletedbiblioitems WHERE biblioitemnumber IN (SELECT biblioitemnumber FROM biblioitems)"); > $sth->execute(); >- $sth = $dbh->prepare("SELECT COUNT(*) AS count FROM deletedbiblio WHERE biblionumber NOT IN (SELECT biblionumber FROM deletedbiblioitems)"); >+ $sth = $dbh->prepare("SELECT COUNT(*) AS count FROM deletedbiblioitems"); > $sth->execute(); > my $row = $sth->fetchrow_hashref; > if ($row->{count}) { >- warn "There were $row->{count} deletedbiblio that could not be moved, please check '_deletedbiblio'."; >- $dbh->do("RENAME TABLE deletedbiblio TO _deletedbiblio"); >+ print "Warning to database administrator:\n" >+ . "There were $row->{count} deletedbiblioitems that could not be moved, please check '_deletedbiblioitems'.\n"; >+ $dbh->do("RENAME TABLE deletedbiblioitems TO _deletedbiblioitems"); > } else { >- $dbh->do("DROP TABLE deletedbiblio"); >+ $dbh->do("DROP TABLE deletedbiblioitems"); > } > } > > { >- my $sth = $dbh->prepare("DELETE FROM deletedbiblioitems WHERE biblioitemnumber IN (SELECT biblioitemnumber FROM biblioitems)"); >+ my $sth = $dbh->prepare("DELETE FROM deletedbiblio WHERE biblionumber IN (SELECT biblionumber FROM biblio)"); > $sth->execute(); >- $sth = $dbh->prepare("SELECT COUNT(*) AS count FROM deletedbiblioitems"); >+ $sth = $dbh->prepare("SELECT COUNT(*) AS count FROM deletedbiblio"); > $sth->execute(); > my $row = $sth->fetchrow_hashref; > if ($row->{count}) { >- warn "There were $row->{count} deletedbiblioitems that could not be moved, please check '_deletedbiblioitems'."; >- $dbh->do("RENAME TABLE deletedbiblioitems TO _deletedbiblioitems"); >+ print "Warning to database administrator:\n" >+ . "There were $row->{count} deletedbiblio that could not be moved, please check '_deletedbiblio'.\n"; >+ $dbh->do("RENAME TABLE deletedbiblio TO _deletedbiblio"); > } else { >- $dbh->do("DROP TABLE deletedbiblioitems"); >+ $dbh->do("DROP TABLE deletedbiblio"); > } > } > >- > SetVersion( $DBversion ); > print "Upgrade to $DBversion done (Bug 20271 - Merge deletedbiblio* and deleteitems tables with their alive cousins)\n"; > } >-- >2.14.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 20271
:
72300
|
72799
|
72800
|
73091
|
73092
|
73093
|
73535
|
73536
|
73537
|
73538
|
73539
|
73540
|
73597
|
73759
|
73760
|
73761
|
73762
|
73763
|
73764
|
73765
|
74127
|
74128
|
74129
|
74130
|
74131
|
74132
|
74133
|
74134
|
74135
|
74136
|
74137
|
74138
|
74139
|
74140
|
74141
|
74142
|
74182
|
74183
|
74184
|
74185
|
74186
|
74187
|
74188
|
74189
|
74190
|
74223
|
74407
|
74408
|
74409
|
74410
|
74411
|
74412
|
74413
|
74414
|
74415
|
74416
|
75265
|
75347
|
75894
|
75897
|
75898
|
75899
|
75910
|
75977
|
75978
|
75979
|
75980
|
75981
|
75982
|
75983
|
75984
|
75985
|
75986
|
75987
|
75988
|
75989
|
75990
|
75991
|
75992
|
75993
|
76047
|
76048
|
76255
|
76256
|
76257
|
76258
|
76259
|
76260
|
76261
|
76262
|
76263
|
76264
|
76265
|
76266
|
76267
|
76268
|
76269
|
76270
|
76271
|
76272
|
76273
|
76274
|
76275
|
76276
|
76277
|
76493
|
76494
|
76495
|
76496
|
76497
|
76498
|
76499
|
76500
|
76501
|
76502
|
76503
|
76504
|
76505
|
76506
|
76507
|
76508
|
76509
|
76510
|
76511
|
76512
|
76513
|
76514