From ab0f1df0c1ec652f59a3978ec1414129b7251cf3 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 3 Mar 2020 15:01:48 +0000 Subject: [PATCH] Bug 23355: DBRev 19.12.00.033 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_23355.perl | 20 ------------- .../atomicupdate/bug_23355_permissions.perl | 12 -------- installer/data/mysql/updatedatabase.pl | 30 +++++++++++++++++++ 4 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23355.perl delete mode 100644 installer/data/mysql/atomicupdate/bug_23355_permissions.perl diff --git a/Koha.pm b/Koha.pm index ea087229f5..69510145fc 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.12.00.032"; +$VERSION = "19.12.00.033"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23355.perl b/installer/data/mysql/atomicupdate/bug_23355.perl deleted file mode 100644 index 72bca27942..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23355.perl +++ /dev/null @@ -1,20 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do(qq{ - CREATE TABLE IF NOT EXISTS `cash_register_actions` ( - `id` int(11) NOT NULL auto_increment, -- unique identifier for each account register action - `code` varchar(24) NOT NULL, -- action code denoting the type of action recorded (enum), - `register_id` int(11) NOT NULL, -- id of cash_register this action belongs to, - `manager_id` int(11) NOT NULL, -- staff member performing the action - `amount` decimal(28,6) DEFAULT NULL, -- amount recorded in action (signed) - `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - CONSTRAINT `cash_register_actions_manager` FOREIGN KEY (`manager_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `cash_register_actions_register` FOREIGN KEY (`register_id`) REFERENCES `cash_registers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE - ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci; - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 23355 - Add cash_register_actions table)\n"; -} diff --git a/installer/data/mysql/atomicupdate/bug_23355_permissions.perl b/installer/data/mysql/atomicupdate/bug_23355_permissions.perl deleted file mode 100644 index 15251c0bb6..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23355_permissions.perl +++ /dev/null @@ -1,12 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do(qq{ - INSERT IGNORE permissions (module_bit, code, description) - VALUES - (25, 'cashup', 'Perform cash register cashup action') - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 23355 - Add cash register cashup permissions)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index df895366e2..3688bc7aa1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20975,6 +20975,36 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24735 - Remove UseQueryParser system preference)\n"; } +$DBversion = '19.12.00.033'; +if ( CheckVersion($DBversion) ) { + + # Add cash_register_actions table + $dbh->do(qq{ + CREATE TABLE IF NOT EXISTS `cash_register_actions` ( + `id` int(11) NOT NULL auto_increment, -- unique identifier for each account register action + `code` varchar(24) NOT NULL, -- action code denoting the type of action recorded (enum), + `register_id` int(11) NOT NULL, -- id of cash_register this action belongs to, + `manager_id` int(11) NOT NULL, -- staff member performing the action + `amount` decimal(28,6) DEFAULT NULL, -- amount recorded in action (signed) + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + CONSTRAINT `cash_register_actions_manager` FOREIGN KEY (`manager_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `cash_register_actions_register` FOREIGN KEY (`register_id`) REFERENCES `cash_registers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci; + }); + + # Add cashup permission + $dbh->do(qq{ + INSERT IGNORE permissions (module_bit, code, description) + VALUES + (25, 'cashup', 'Perform cash register cashup action') + }); + + SetVersion($DBversion); + print "Upgrade to $DBversion done (Bug 23355 - Add cash_register_actions table)\n"; + print "Upgrade to $DBversion done (Bug 23355 - Add cash register cashup permissions)\n"; +} + # 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.39.2