Make DBD::Pg mark strings as utf8

[ND.git] / DB.pm

diff --git a/DB.pm b/DB.pm
index 43979d852fcca08fb0f9320646a810f247477e93..102ae7fa686c5f96ec686b0858d212d5b42ee216 100644 (file)
--- a/DB.pm
+++ b/DB.pm
@@ -11,10 +11,14 @@ our @EXPORT = qw/DB/;
 
 sub DB {
        #Use domain sockets by default
-       my $dbh = DBI->connect_cached("dbi:Pg:dbname=ndawn", "ndawn", "", {AutoCommit => 1, RaiseError => 1});
+       my $dbh = DBI->connect_cached("dbi:Pg:dbname=ndawn", "ndawn", "", {AutoCommit => 1, RaiseError => 1, pg_enable_utf8 => 1});
        #Easy to also use /etc/postgresql/pg_services.conf
        #my $dbh =  DBI->connect_cached("dbi:Pg:service=ndawn","", "", {AutoCommit => 1});
-       $dbh->rollback if $dbh->{Executed} || !$dbh->{AutoCommit};
+       {
+               no warnings;
+               local $dbh->{Warn} = 0;
+               $dbh->do('ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT; DEALLOCATE ALL');
+       }
        return $dbh;
 };
 1;