From dbae96aebfaa1d461842bd51a2dd734f4852dc75 Mon Sep 17 00:00:00 2001
From: Arturo Vergara <hello@arturovm.me>
Date: Mon, 29 Aug 2016 11:24:52 -0500
Subject: [PATCH] Revert "fix upper/db#237"
This reverts commit 0453b61e45db96b1bdaae20ddda51bb389ec5c73.
---
internal/sqladapter/database.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/internal/sqladapter/database.go b/internal/sqladapter/database.go
index ed26ce18..27cf5b3f 100644
--- a/internal/sqladapter/database.go
+++ b/internal/sqladapter/database.go
@@ -187,11 +187,14 @@ func (d *database) Close() error {
d.cachedStatements.Clear() // Closes prepared statements as well.
tx := d.Transaction()
- if tx != nil && !tx.Committed() {
- tx.Rollback()
+ if tx == nil {
+ // Not within a transaction.
+ return d.sess.Close()
}
- return d.sess.Close()
+ if !tx.Committed() {
+ tx.Rollback()
+ }
}
return nil
}
--
GitLab