Attachment 147211 Details for Bug 32687 – Bug 32687: Get server version in Context::get_versions

[patch] Bug 32687: Get server version in Context::get_versions

Bug-32687-Get-server-version-in-Contextgetversions.patch (text/plain), 3.26 KB, created by Jonathan Druart on 2023-02-23 10:03:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-02-23 10:03:29 UTC

Size: 3.26 KB

patch

obsolete

>From ea526d6758a50dc3144bc68b66392fe75dc92166 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 20 Jan 2023 09:34:57 +0000
>Subject: [PATCH] Bug 32687: Get server version in Context::get_versions
>
>Test plan:
>Run t/db_dependent/Context.t
>Check About/Server information/MySQL version.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> C4/Context.pm            |  9 +++++++--
> t/db_dependent/Context.t | 24 +++++++++++++++++++++++-
> 2 files changed, 30 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Context.pm b/C4/Context.pm
>index 1aec1232f3b..3819529dc22 100644
>--- a/C4/Context.pm
>+++ b/C4/Context.pm
>@@ -820,20 +820,25 @@ Gets various version info, for core Koha packages, Currently called from carp ha
> 
> # A little example sub to show more debugging info for CGI::Carp
> sub get_versions {
>-    my %versions;
>+    my ( %versions, $mysqlVersion );
>     $versions{kohaVersion}  = Koha::version();
>     $versions{kohaDbVersion} = C4::Context->preference('version');
>     $versions{osVersion} = join(" ", POSIX::uname());
>     $versions{perlVersion} = $];
>+
>+    my $dbh = C4::Context->dbh;
>+    $mysqlVersion = $dbh->get_info(18) if $dbh; # SQL_DBMS_VER
>+
>     {
>         no warnings qw(exec); # suppress warnings if unable to find a program in $PATH
>-        $versions{mysqlVersion}  = `mysql -V`;
>+        $mysqlVersion          ||= `mysql -V`; # fallback to sql client version?
>         $versions{apacheVersion} = (`apache2ctl -v`)[0];
>         $versions{apacheVersion} = `httpd -v`             unless  $versions{apacheVersion} ;
>         $versions{apacheVersion} = `httpd2 -v`            unless  $versions{apacheVersion} ;
>         $versions{apacheVersion} = `apache2 -v`           unless  $versions{apacheVersion} ;
>         $versions{apacheVersion} = `/usr/sbin/apache2 -v` unless  $versions{apacheVersion} ;
>     }
>+    $versions{mysqlVersion} = $mysqlVersion;
>     return %versions;
> }
> 
>diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t
>index 88539fe34b9..67587b4798e 100755
>--- a/t/db_dependent/Context.t
>+++ b/t/db_dependent/Context.t
>@@ -16,7 +16,8 @@
> # along with Koha; if not, see <http://www.gnu.org/licenses>.
> 
> use Modern::Perl;
>-use Test::More tests => 4;
>+use Test::More tests => 5;
>+use Test::MockModule;
> 
> use C4::Context;
> use Koha::Database;
>@@ -147,3 +148,24 @@ subtest 'Zconn' => sub {
>     $oConnection = C4::Context->Zconn('biblioserver', 1);
>     is($oConnection->option('async'), 1, "ZOOM connection is asynchronous");
> };
>+
>+subtest 'get_versions' => sub {
>+    plan tests => 2;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $mod = Test::MockModule->new( 'C4::Context' );
>+    my $no_dbh;
>+    $mod->mock( 'dbh', sub { return $no_dbh ? undef : $dbh; } );
>+
>+    my $client = `mysql -V`;
>+    my $server = ( C4::Context->dbh->selectrow_array("SHOW VARIABLES LIKE 'version'") )[1];
>+    my $server_version;
>+    if( $server =~ /(\d+(\.\d+)+)/ ) {
>+        $server_version = $1;
>+        $server_version =~ s/\./\\./g;
>+    }
>+    my $v;
>+    like( $v = { C4::Context::get_versions }->{mysqlVersion}, qr/$server_version/, "Server version $v found" );
>+    $no_dbh = 1;
>+    is( $v = { C4::Context::get_versions }->{mysqlVersion}, $client, "Client version $v found" );
>+};
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 32687: 145504 | 145563 | 147211