From: Michael Andreen <harv@ruin.nu>
Date: Fri, 15 May 2009 16:22:25 +0000 (+0200)
Subject: Updated db, to only rollback
X-Git-Url: https://ruin.nu/git/?p=ND.git;a=commitdiff_plain;h=6987c1cc86ec91f7d3bf7d46b8745e89d31a5772

Updated db, to only rollback
---

diff --git a/DB.pm b/DB.pm
index 102ae7f..0f87ee1 100644
--- a/DB.pm
+++ b/DB.pm
@@ -11,15 +11,15 @@ 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, pg_enable_utf8 => 1});
+	my $dbh = DBI->connect_cached("dbi:Pg:dbname=ndawn", "ndawn", "", {AutoCommit => 0, RaiseError => 1, PrintError => 0, pg_enable_utf8 => 1});
+
 	#Easy to also use /etc/postgresql/pg_services.conf
-	#my $dbh =  DBI->connect_cached("dbi:Pg:service=ndawn","", "", {AutoCommit => 1});
-	{
-		no warnings;
-		local $dbh->{Warn} = 0;
-		$dbh->do('ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT; DEALLOCATE ALL');
-	}
+	#my $dbh =  DBI->connect_cached("dbi:Pg:service=ndawn","", "", {AutoCommit => 0, RaiseError => 1, pg_enable_utf8 => 1});
+	$dbh->rollback;
+	#Need to set autocommit after, to be able to rollback old incomplete transactions.
+	$dbh->{AutoCommit}  = 1;
 	return $dbh;
-};
+}
+
 1;