Attachment 81899 Details for Bug 19821 – Bug 19821: Use database_test entry if exists

[patch] Bug 19821: Use database_test entry if exists

Bug-19821-Use-databasetest-entry-if-exists.patch (text/plain), 2.12 KB, created by Martin Renvoize (ashimema) on 2018-11-02 14:36:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-11-02 14:36:28 UTC

Size: 2.12 KB

patch

obsolete

>From 62558979aec995f9cded98d27afe14ff054f82cf Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 4 May 2018 14:26:25 -0300
>Subject: [PATCH] Bug 19821: Use database_test entry if exists
>
>If the database_test entry exists in the config file we are going to use
>it. This will be a trick for developers and CI
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Installer.pm      | 2 +-
> Koha/Database.pm     | 2 +-
> installer/install.pl | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Installer.pm b/C4/Installer.pm
>index a1c47149f8..98c772151a 100644
>--- a/C4/Installer.pm
>+++ b/C4/Installer.pm
>@@ -69,7 +69,7 @@ sub new {
>     my $self = {};
> 
>     # get basic information from context
>-    $self->{'dbname'}   = C4::Context->config("database");
>+    $self->{'dbname'}   = C4::Context->config("database_test") || C4::Context->config("database");
>     $self->{'dbms'}     = C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql";
>     $self->{'hostname'} = C4::Context->config("hostname");
>     $self->{'port'}     = C4::Context->config("port");
>diff --git a/Koha/Database.pm b/Koha/Database.pm
>index ea8a10a9bb..1ccaaf7379 100644
>--- a/Koha/Database.pm
>+++ b/Koha/Database.pm
>@@ -53,7 +53,7 @@ sub _new_schema {
> 
>     my $db_driver = $context->{db_driver};
> 
>-    my $db_name   = $context->config("database");
>+    my $db_name   = $context->config("database_test") || $context->config("database");
>     my $db_host   = $context->config("hostname");
>     my $db_port   = $context->config("port") || '';
>     my $db_user   = $context->config("user");
>diff --git a/installer/install.pl b/installer/install.pl
>index 2c4c2eda91..4c0495265c 100755
>--- a/installer/install.pl
>+++ b/installer/install.pl
>@@ -56,7 +56,7 @@ if ( defined($language) ) {
> 
> my $installer = C4::Installer->new();
> my %info;
>-$info{'dbname'} = C4::Context->config("database");
>+$info{'dbname'} = C4::Context->config("database_test") || C4::Context->config("database");
> $info{'dbms'}   = (
>       C4::Context->config("db_scheme")
>     ? C4::Context->config("db_scheme")
>-- 
>2.19.1

Actions: View | Diff | Splinter Review

Attachments on bug 19821: 69825 | 69842 | 69843 | 69844 | 71817 | 75045 | 75091 | 75092 | 81893 | 81894 | 81895 | 81896 | 81897 | 81898 | 81899 | 81900 | 99435 | 99436 | 99437 | 99438 | 99439 | 99440 | 99441 | 103409 | 103410 | 103411 | 103412 | 103413 | 103414 | 103415 | 105876 | 105877 | 105878 | 105879 | 105880 | 105881 | 105882 | 120417 | 120418 | 120419 | 120420 | 120421 | 120422 | 120423