From af01b95674f538e7ef3279f6dca9a4675c4d3272 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 5 Aug 2019 11:36:40 +0100 Subject: [PATCH] Bug 23396: DBRev 19.05.02.002 Signed-off-by: Martin Renvoize (cherry picked from commit 3eadb87fd86b2331d4ea58aa86f1810bbf952c89) Signed-off-by: Fridolin Somers --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_23396.perl | 22 ------------------ installer/data/mysql/updatedatabase.pl | 23 +++++++++++++++++++ 3 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23396.perl diff --git a/Koha.pm b/Koha.pm index 66909c7e9e..07066d2c4d 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "19.05.02.001"; +$VERSION = "19.05.02.002"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23396.perl b/installer/data/mysql/atomicupdate/bug_23396.perl deleted file mode 100644 index 5f214c7546..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23396.perl +++ /dev/null @@ -1,22 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - - $dbh->do(q| - INSERT IGNORE INTO keyboard_shortcuts (shortcut_name, shortcut_keys) VALUES - ("insert_copyright","Alt-C"), - ("insert_copyright_sound","Alt-P"), - ("insert_delimiter","Ctrl-D"), - ("subfield_help","Ctrl-H"), - ("link_authorities","Shift-Ctrl-L"), - ("delete_field","Ctrl-X"), - ("delete_subfield","Shift-Ctrl-X"), - ("new_line","Enter"), - ("line_break","Shift-Enter"), - ("next_position","Tab"), - ("prev_position","Shift-Tab"), - ("toggle_keyboard", "Shift-Ctrl-K") - ;|); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 23396 - Fix missing keyboard_shortcuts table)\n"; -} \ No newline at end of file diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 95ff4b14c7..b43b2fcaca 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18743,6 +18743,29 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 22524 - Fix date/time-last-modified search with Elasticsearch)\n"; } +$DBversion = '19.05.02.002'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do(q| + INSERT IGNORE INTO keyboard_shortcuts (shortcut_name, shortcut_keys) VALUES + ("insert_copyright","Alt-C"), + ("insert_copyright_sound","Alt-P"), + ("insert_delimiter","Ctrl-D"), + ("subfield_help","Ctrl-H"), + ("link_authorities","Shift-Ctrl-L"), + ("delete_field","Ctrl-X"), + ("delete_subfield","Shift-Ctrl-X"), + ("new_line","Enter"), + ("line_break","Shift-Enter"), + ("next_position","Tab"), + ("prev_position","Shift-Tab"), + ("toggle_keyboard", "Shift-Ctrl-K") + ;|); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 23396 - Fix missing keyboard_shortcuts table)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1