From 52488a0322860e393ebf4ab753f46e86f74a262e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 4 Jan 2019 03:08:14 +0000 Subject: [PATCH] Bug 21753: DBRev 18.12.00.007 Signed-off-by: Nick Clemens https://bugs.koha-community.org/show_bug.cgi?id=11879 --- Koha.pm | 2 +- Koha/Schema/Result/Issuingrule.pm | 12 ++---------- installer/data/mysql/atomicupdate/bug_21753.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 4 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21753.perl diff --git a/Koha.pm b/Koha.pm index 7380682..f0c4c77 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 = "18.12.00.006"; +$VERSION = "18.12.00.007"; sub version { return $VERSION; diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm index db7dea1..187e463 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -97,12 +97,6 @@ __PACKAGE__->table("issuingrules"); data_type: 'integer' is_nullable: 1 -=head2 chargename - - data_type: 'varchar' - is_nullable: 1 - size: 100 - =head2 maxissueqty data_type: 'integer' @@ -261,8 +255,6 @@ __PACKAGE__->add_columns( { data_type => "tinyint", default_value => 0, is_nullable => 0 }, "accountsent", { data_type => "integer", is_nullable => 1 }, - "chargename", - { data_type => "varchar", is_nullable => 1, size => 100 }, "maxissueqty", { data_type => "integer", is_nullable => 1 }, "maxonsiteissueqty", @@ -336,8 +328,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-11-08 17:41:17 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vOr4mEAacS5WKLQifgT8EA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2019-01-04 03:06:35 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:slPyHZs0YvOKev3cAxdDJQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/installer/data/mysql/atomicupdate/bug_21753.perl b/installer/data/mysql/atomicupdate/bug_21753.perl deleted file mode 100644 index f5e5d44..0000000 --- a/installer/data/mysql/atomicupdate/bug_21753.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - if( column_exists( 'issuingrules', 'chargename' ) ) { - $dbh->do( "ALTER TABLE issuingrules DROP chargename" ); - } - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21753: Drop chargename from issuingrules )\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5b0399b..b4d246a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17235,6 +17235,15 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 21915 - Add a way to automatically reconcile balance for patrons)\n"; } +$DBversion = '18.12.00.007'; +if( CheckVersion( $DBversion ) ) { + if( column_exists( 'issuingrules', 'chargename' ) ) { + $dbh->do( "ALTER TABLE issuingrules DROP chargename" ); + } + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21753: Drop chargename from issuingrules )\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.7.4