From 8bce6fc75770505c40d8e9b8fbe003b602de372e Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Mon, 12 Nov 2007 15:49:09 -0600 Subject: [PATCH] Ported _new_dbh() to handle PostgreSQL connections Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- C4/Context.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index dea785d5b3..7efeb0652a 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -585,14 +585,17 @@ sub _new_dbh 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 $dbh= DBI->connect("DBI:$db_driver:$db_name:$db_host", - $db_user, $db_passwd); - # Koha 3.0 is utf-8, so force utf8 communication between mySQL and koha, whatever the mysql default config. - # this is better than modifying my.cnf (and forcing all communications to be in utf8) - $dbh->do("set NAMES 'utf8'") if ($dbh); - $dbh->{'mysql_enable_utf8'}=1; #enable + my $dbh= DBI->connect("DBI:$db_driver:dbname=$db_name;host=$db_host;port=$db_port", + $db_user, $db_passwd); + if ( $db_name eq 'mysql' ) { + # Koha 3.0 is utf-8, so force utf8 communication between mySQL and koha, whatever the mysql default config. + # this is better than modifying my.cnf (and forcing all communications to be in utf8) + $dbh->do("set NAMES 'utf8'") if ($dbh); + $dbh->{'mysql_enable_utf8'}=1; #enable + } return $dbh; } -- 2.39.2