From 4d58dd44fc408d824325a79b9aa0f964295fb3a4 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 19 Dec 2023 15:29:35 +0000 Subject: [PATCH] Bug 35536: Remove last two references to resultset PluginData Content-Type: text/plain; charset=utf-8 Test plan: Run t/db_dependent/Koha/Plugins/Plugins.t --- Koha/Plugins.pm | 5 ++--- t/db_dependent/Koha/Plugins/Plugins.t | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm index 4a39844642..761bf2a142 100644 --- a/Koha/Plugins.pm +++ b/Koha/Plugins.pm @@ -118,9 +118,8 @@ sub get_enabled_plugins { unless ($enabled_plugins) { my $verbose = $params->{verbose} // $class->_verbose; $enabled_plugins = []; - my $rs = Koha::Database->schema->resultset('PluginData'); - $rs = $rs->search({ plugin_key => '__ENABLED__', plugin_value => 1 }); - my @plugin_classes = $rs->get_column('plugin_class')->all(); + my $rs = Koha::Plugins::Datas->search({ plugin_key => '__ENABLED__', plugin_value => 1 }); + my @plugin_classes = $rs->get_column('plugin_class'); foreach my $plugin_class (@plugin_classes) { next unless can_load( modules => { $plugin_class => undef }, verbose => $verbose, nocache => 1 ); diff --git a/t/db_dependent/Koha/Plugins/Plugins.t b/t/db_dependent/Koha/Plugins/Plugins.t index 53ef4f9a31..1dcd8578b1 100755 --- a/t/db_dependent/Koha/Plugins/Plugins.t +++ b/t/db_dependent/Koha/Plugins/Plugins.t @@ -194,9 +194,7 @@ subtest 'Version upgrade tests' => sub { my $plugin = Koha::Plugin::Test->new( { enable_plugins => 1, cgi => CGI->new } ); # make sure there's no version on the DB - $schema->resultset('PluginData') - ->search( { plugin_class => $plugin->{class}, plugin_key => '__INSTALLED_VERSION__' } ) - ->delete; + Koha::Plugins::Datas->search( { plugin_class => $plugin->{class}, plugin_key => '__INSTALLED_VERSION__' } )->delete; $plugin = Koha::Plugin::Test->new( { enable_plugins => 1, cgi => CGI->new } ); my $version = $plugin->retrieve_data('__INSTALLED_VERSION__'); -- 2.30.2