From f8098e0eed6594f9d792fc17cd9b940ea586e659 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Jun 2020 10:53:51 +0200 Subject: [PATCH] Bug 24156: DBRev 20.06.00.003 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24156.perl | 18 ------------------ installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24156.perl diff --git a/Koha.pm b/Koha.pm index db1c707fb3..d12a020045 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 = "20.06.00.002"; +$VERSION = "20.06.00.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24156.perl b/installer/data/mysql/atomicupdate/bug_24156.perl deleted file mode 100644 index 5bc0433397..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24156.perl +++ /dev/null @@ -1,18 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - unless ( TableExists( 'tables_settings' ) ) { - $dbh->do(q| - CREATE TABLE tables_settings ( - module varchar(255) NOT NULL, - page varchar(255) NOT NULL, - tablename varchar(255) NOT NULL, - default_display_length smallint(6) NOT NULL DEFAULT 20, - default_sort_order varchar(255), - PRIMARY KEY(module (191), page (191), tablename (191) ) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - |); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24156 - Add new table tables_settings)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 79415b023a..8cff5534a1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22210,6 +22210,24 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 25184, "Items with a negative notforloan status should not be captured for holds"); } +$DBversion = '20.06.00.003'; +if( CheckVersion( $DBversion ) ) { + unless ( TableExists( 'tables_settings' ) ) { + $dbh->do(q| + CREATE TABLE tables_settings ( + module varchar(255) NOT NULL, + page varchar(255) NOT NULL, + tablename varchar(255) NOT NULL, + default_display_length smallint(6) NOT NULL DEFAULT 20, + default_sort_order varchar(255), + PRIMARY KEY(module (191), page (191), tablename (191) ) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + |); + } + + NewVersion( $DBversion, 24156, "Add new table tables_settings" ); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.20.1