Bug 20144: [sql_modes] Fix datatype for aqbasket.authorisedby

It's defined as a VARCHAR(10) in DB, but it is expecting a
borrowernumber instead

Fix for
Data too long for column 'authorisedby'

Must be a FK but first a borrowernumber
Need to update kohastructure for the comment?

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/t/db_dependent/Bookseller.t b/t/db_dependent/Bookseller.t
index 416974c..c602ff4 100644 (file)
--- a/t/db_dependent/Bookseller.t
+++ b/t/db_dependent/Bookseller.t
@@ -46,6 +46,7 @@ $dbh->do(q|DELETE FROM aqbasket|);
 $dbh->do(q|DELETE FROM aqbooksellers|);
 $dbh->do(q|DELETE FROM subscription|);
 
+my $patron = $builder->build_object({ class => 'Koha::Patrons' });
 # Add currency
 my $curcode = $builder->build({ source => 'Currency' })->{currencycode};
 
@@ -137,9 +138,9 @@ is_deeply( \@booksellers, \@tab,
 my @bookseller1 = Koha::Acquisition::Booksellers->search({name => $sample_supplier1->{name} });
 is( $bookseller1[0]->baskets->count, 0, 'Supplier1 has 0 basket' );
 my $basketno1 =
-  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' );
+  C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname1' );
 my $basketno2 =
-  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' );
+  C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname2' );
 @bookseller1 = Koha::Acquisition::Booksellers->search({ name => $sample_supplier1->{name} });
 is( $bookseller1[0]->baskets->count, 2, 'Supplier1 has 2 baskets' );
 
@@ -289,10 +290,10 @@ my $id_supplier4 = $supplier4->id;
 
 #Add 2 baskets
 my $basketno3 =
-  C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3',
+  C4::Acquisition::NewBasket( $id_supplier3, $patron->borrowernumber, 'basketname3',
     'basketnote3' );
 my $basketno4 =
-  C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4',
+  C4::Acquisition::NewBasket( $id_supplier4, $patron->borrowernumber, 'basketname4',
     'basketnote4' );
 
 #Modify the basket to add a close date

diff --git a/t/db_dependent/Koha/Acquisition/Booksellers.t b/t/db_dependent/Koha/Acquisition/Booksellers.t
index 42c29a6..31342e0 100644 (file)
--- a/t/db_dependent/Koha/Acquisition/Booksellers.t
+++ b/t/db_dependent/Koha/Acquisition/Booksellers.t
@@ -44,14 +44,15 @@ subtest '->baskets() tests' => sub {
     $schema->resultset('Aqbasket')->delete();
     Koha::Acquisition::Booksellers->delete();
     $schema->resultset('Subscription')->delete();
+    my $patron = $builder->build_object({ class => 'Koha::Patrons' });
 
     my $vendor = $builder->build_object( { class => 'Koha::Acquisition::Booksellers' } );
 
     is( $vendor->baskets, 0, 'Vendor has no baskets' );
 
     # Add two baskets
-    my $basket_1_id = C4::Acquisition::NewBasket( $vendor->id, 'authorizedby1', 'basketname1' );
-    my $basket_2_id = C4::Acquisition::NewBasket( $vendor->id, 'authorizedby2', 'basketname2' );
+    my $basket_1_id = C4::Acquisition::NewBasket( $vendor->id, $patron->borrowernumber, 'basketname1' );
+    my $basket_2_id = C4::Acquisition::NewBasket( $vendor->id, $patron->borrowernumber, 'basketname2' );
 
     # Re-fetch vendor
     $vendor = Koha::Acquisition::Booksellers->find( $vendor->id );