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