Bug 9811: Remove useless orderby management

[koha_fer] / Koha / Database.pm

diff --git a/Koha/Database.pm b/Koha/Database.pm
index b259ca0..92e83ec 100644 (file)
--- a/Koha/Database.pm
+++ b/Koha/Database.pm
@@ -45,21 +45,12 @@ __PACKAGE__->mk_accessors(qw( ));
 # database connection from the data given in the current context, and
 # returns it.
 sub _new_schema {
+
     my $context = C4::Context->new();
-    my $db_driver = C4::Context::db_scheme2dbi($context->config("db_scheme"));
-
-    my $db_name   = $context->config("database");
-    my $db_host   = $context->config("hostname");
-    my $db_port   = $context->config("port") || '';
-    my $db_user   = $context->config("user");
-    my $db_passwd = $context->config("pass");
-
-    my $db_opts = ($db_driver eq 'mysql') ? { mysql_enable_utf8 => 1 } :
-                  ($db_driver eq 'Pg')    ? { pg_enable_utf8    => 1 } :
-                                            { };
-    my $schema    = Koha::Schema->connect(
-        "DBI:$db_driver:dbname=$db_name;host=$db_host;port=$db_port",
-        $db_user, $db_passwd, $db_opts );
+
+    # we are letting C4::Context->dbh not set the RaiseError handle attribute
+    # for now for compatbility purposes
+    my $schema = Koha::Schema->connect( sub { C4::Context->dbh }, { unsafe => 1 } );
     return $schema;
 }