Attachment 50714 Details for Bug 15562 – [SIGNED-OFF] bug_15562: Revert "Bug 13690: use Koha::Schema only when it's needed"

[patch] [SIGNED-OFF] bug_15562: Revert "Bug 13690: use Koha::Schema only when it's needed"

SIGNED-OFF-bug15562-Revert-Bug-13690-use-KohaSchem.patch (text/plain), 1.14 KB, created by Kyle M Hall (khall) on 2016-04-26 11:22:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2016-04-26 11:22:20 UTC

Size: 1.14 KB

patch

obsolete

>From e5d33a58d57d348d80b48b69bdf4e40d232cbb92 Mon Sep 17 00:00:00 2001
>From: Srdjan <srdjan@catalyst.net.nz>
>Date: Wed, 30 Mar 2016 17:34:45 +1300
>Subject: [PATCH] [SIGNED-OFF] bug_15562: Revert "Bug 13690: use Koha::Schema
> only when it's needed"
>
>This reverts commit c52bc9756a5fa1e4f6bba7ce5c58124f150c5efc.
>
>I don't see any place where we would use KOha::Database without wanting
>Koha::Schema.
>require Koha::Schema interferes with some plack setups - for some reason
>it calls C4::Context->import() even when C4::Context is already used.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> Koha/Database.pm | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/Koha/Database.pm b/Koha/Database.pm
>index a8f4eab..d40eb52 100644
>--- a/Koha/Database.pm
>+++ b/Koha/Database.pm
>@@ -35,6 +35,7 @@ Koha::Database
> use Modern::Perl;
> use Carp;
> use C4::Context;
>+use Koha::Schema;
> use base qw(Class::Accessor);
> 
> use vars qw($database);
>@@ -47,8 +48,6 @@ __PACKAGE__->mk_accessors(qw( ));
> # returns it.
> sub _new_schema {
> 
>-    require Koha::Schema;
>-
>     my $context = C4::Context->new();
> 
>     my $db_driver = $context->{db_driver};
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15562: 47420 | 47421 | 47422 | 47838 | 47944 | 47945 | 47946 | 47947 | 49370 | 49371 | 49372 | 49373 | 49664 | 49665 | 49666 | 49667 | 49709 | 50702 | 50703 | 50713 | 50714 | 50715 | 50716 | 50870 | 51939 | 51940 | 53296 | 53297 | 55577 | 55578 | 60723 | 60724 | 60725 | 60726 | 66374 | 66375 | 66376 | 66377 | 76062