From e07a68a6e7ad693386b1a526f585fb45616ee3d1 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 16 May 2016 17:34:57 +0000 Subject: [PATCH] Bug 15086 - DBRev 3.23.00.064 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- Koha/Schema/Result/CreatorLayout.pm | 8 ++++---- .../atomicupdate/Bug_15086_UpdateLayoutNameSize.sql | 1 - installer/data/mysql/updatedatabase.pl | 9 +++++++++ 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql diff --git a/Koha.pm b/Koha.pm index 29e124be5c..3969167dd7 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 = "3.23.00.063"; +$VERSION = "3.23.00.064"; sub version { return $VERSION; diff --git a/Koha/Schema/Result/CreatorLayout.pm b/Koha/Schema/Result/CreatorLayout.pm index bf66e397c8..88fda029a3 100644 --- a/Koha/Schema/Result/CreatorLayout.pm +++ b/Koha/Schema/Result/CreatorLayout.pm @@ -54,7 +54,7 @@ __PACKAGE__->table("creator_layouts"); data_type: 'char' default_value: 'DEFAULT' is_nullable: 0 - size: 20 + size: 25 =head2 guidebox @@ -141,7 +141,7 @@ __PACKAGE__->add_columns( data_type => "char", default_value => "DEFAULT", is_nullable => 0, - size => 20, + size => 25, }, "guidebox", { data_type => "integer", default_value => 0, is_nullable => 1 }, @@ -188,8 +188,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("layout_id"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-22 10:32:28 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kRzOQpJWvu5ZXfurfpmqzg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-05-16 17:38:42 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BDNkfgqz53LCR2Ij7cVCow # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql b/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql deleted file mode 100644 index eeee78557a..0000000000 --- a/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE creator_layouts MODIFY layout_name char(25) NOT NULL DEFAULT 'DEFAULT'; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 761874d4b6..9563a5876b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12584,6 +12584,15 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.23.00.064"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE creator_layouts MODIFY layout_name char(25) NOT NULL DEFAULT 'DEFAULT'; + }); + print "Upgrade to $DBversion done (Bug 15086 - Creators layout and template sql has warnings)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 -- 2.20.1