gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21417: DBRev 17.11.11.002 

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cf8890465d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 18d04888b2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2018-10-09 11:30:23 +00:00 committed by Fridolin Somers
parent 74a1687fc5
commit 7cfcfae3c4
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha.pm
View File

@ -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 = "17.11.11.001";
$VERSION = "17.11.11.002";
sub version {
return $VERSION;

15
Koha/Schema/Result/EdifactEan.pm
View File

@ -39,7 +39,7 @@ __PACKAGE__->table("edifact_ean");
data_type: 'varchar'
is_foreign_key: 1
is_nullable: 0
is_nullable: 1
size: 10
=head2 ean
@ -63,7 +63,7 @@ __PACKAGE__->add_columns(
"description",
{ data_type => "varchar", is_nullable => 1, size => 128 },
"branchcode",
{ data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 },
{ data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 },
"ean",
{ data_type => "varchar", is_nullable => 0, size => 15 },
"id_code_qualifier",
@ -96,12 +96,17 @@ __PACKAGE__->belongs_to(
"branchcode",
"Koha::Schema::Result::Branch",
{ branchcode => "branchcode" },
{ is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
{
is_deferrable => 1,
join_type => "LEFT",
on_delete => "RESTRICT",
on_update => "RESTRICT",
},
);
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-11 12:04:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wziFbge4g2Ek1lc8Anto+Q
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-09 11:29:27
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9CSEvOmfmy52+QAYAgrybA
# You can replace this text with custom code or comments, and it will be preserved on regeneration

7
installer/data/mysql/atomicupdate/bug_21417.perl
View File

@ -1,7 +0,0 @@
$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
$dbh->do( "ALTER TABLE edifact_ean MODIFY branchcode VARCHAR(10) NULL DEFAULT NULL" );
SetVersion( $DBversion );
print "Upgrade to $DBversion done (Bug XXXXX - description)\n";
}

7
installer/data/mysql/updatedatabase.pl
View File

@ -15229,6 +15229,13 @@ if( CheckVersion( $DBversion ) ) {
print "Upgrade to $DBversion done (Bug 21617: Make statistics.ccode longer)\n";
}
$DBversion = '17.11.11.002';
if( CheckVersion( $DBversion ) ) {
$dbh->do( "ALTER TABLE edifact_ean MODIFY branchcode VARCHAR(10) NULL DEFAULT NULL" );
SetVersion( $DBversion );
print "Upgrade to $DBversion done (Bug 21417 - EDI ordering fails when basket and EAN libraries do not match)\n";
}
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
# SEE bug 13068
# if there is anything in the atomicupdate, read and execute it.