From 6f1459e2cea0b3ea2d14a649bda813cd9dee84ab Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 18 Apr 2019 10:51:21 +0000 Subject: [PATCH] Bug 22532: DBRev 18.12.00.059 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- Koha/Schema/Result/ImportRecord.pm | 12 ++---------- .../Bug22532_remove_import_records_z39random.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 4 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug22532_remove_import_records_z39random.perl diff --git a/Koha.pm b/Koha.pm index 1d88043aaf..2c78ad9252 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.058"; +$VERSION = "18.12.00.059"; sub version { return $VERSION; diff --git a/Koha/Schema/Result/ImportRecord.pm b/Koha/Schema/Result/ImportRecord.pm index 66b44cb11f..8499e4bb86 100644 --- a/Koha/Schema/Result/ImportRecord.pm +++ b/Koha/Schema/Result/ImportRecord.pm @@ -108,12 +108,6 @@ __PACKAGE__->table("import_records"); is_nullable: 0 size: 40 -=head2 z3950random - - data_type: 'varchar' - is_nullable: 1 - size: 40 - =cut __PACKAGE__->add_columns( @@ -176,8 +170,6 @@ __PACKAGE__->add_columns( { data_type => "longtext", is_nullable => 1 }, "encoding", { data_type => "varchar", default_value => "", is_nullable => 0, size => 40 }, - "z3950random", - { data_type => "varchar", is_nullable => 1, size => 40 }, ); =head1 PRIMARY KEY @@ -270,8 +262,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yCx/kRJXjPIB5Uuv40TB7g +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-04-18 10:50:48 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bqIAQzhgioWtBWU8zFdtjw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/installer/data/mysql/atomicupdate/Bug22532_remove_import_records_z39random.perl b/installer/data/mysql/atomicupdate/Bug22532_remove_import_records_z39random.perl deleted file mode 100644 index 553fb946f6..0000000000 --- a/installer/data/mysql/atomicupdate/Bug22532_remove_import_records_z39random.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - if( column_exists( 'import_records', 'z3950random' ) ) { - $dbh->do( "ALTER TABLE import_records DROP COLUMN z3950random" ); - } - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22532 - Remove import_records z3950random column)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 88e08c4301..a47735bb06 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18225,6 +18225,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 22318: Move contents of OpacNavRight preference to Koha news system)\n"; } +$DBversion = '18.12.00.059'; +if( CheckVersion( $DBversion ) ) { + if( column_exists( 'import_records', 'z3950random' ) ) { + $dbh->do( "ALTER TABLE import_records DROP COLUMN z3950random" ); + } + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22532 - Remove import_records z3950random column)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5