Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 25303: Make Koha::Objects->delete loop on the object set

Browse source 
If we call Koha::Libraries->delete but Koha::Library->delete exists
(ie. Koha::Object->delete is overridden), then we Koha::Objects->delete
will be called and the overridden will not be executed.

This patch suggests to test if the method is overridden (using
Class::Inspector->function_exists). If so we loop on the different
objects of the set in a transaction and call the overridden ->delete method.

Existing tests widely cover this change.
t/db_dependent/Koha/Objects.t
    subtest 'Return same values as DBIx::Class' => sub {

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2020-04-28 14:37:43 +02:00 committed by Martin Renvoize
parent e289e40078
commit 25c8f087cb
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Koha/Objects.pm
View file

@ -21,6 +21,7 @@ use Modern::Perl;
use Carp;
use List::MoreUtils qw( none );
use Class::Inspector;
use Koha::Database;
@ -171,6 +172,27 @@ sub search_related {
}
}
=head3 delete
=cut
sub delete {
my ($self) = @_;
if ( Class::Inspector->function_exists( $self->object_class, 'delete' ) ) {
my $objects_deleted;
$self->_resultset->result_source->schema->txn_do( sub {
while ( my $o = $self->next ) {
$o->delete;
$objects_deleted++;
}
});
return $objects_deleted;
}
return $self->_resultset->delete;
}
=head3 single
my $object = Koha::Objects->search({}, { rows => 1 })->single
@ -451,14 +473,14 @@ The autoload method is used call DBIx::Class method on a resultset.
Important: If you plan to use one of the DBIx::Class methods you must provide
relevant tests in t/db_dependent/Koha/Objects.t
Currently count, pager, update and delete are covered.
Currently count, is_paged, pager, update, result_class, single and slice are covered.
=cut
sub AUTOLOAD {
my ( $self, @params ) = @_;
my @known_methods = qw( count is_paged pager update delete result_class single slice );
my @known_methods = qw( count is_paged pager update result_class single slice );
my $method = our $AUTOLOAD;
$method =~ s/.*:://;