Merge pull request #13 from knocknote/feature/add-nil-check-for-rw-qu…

…eries Add nil check for getting read/write queries
blastrain · Apr 28, 2019 · f2c6b32 · f2c6b32
2 parents 9a03cb4 + 239f575
commit f2c6b32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/database/sql/sql_test.go b/database/sql/sql_test.go
@@ -607,6 +607,12 @@ func TestTransaction(t *testing.T) {
 	defer db.Close()
 	tx, err := db.Begin()
 	checkErr(t, err)
+	if readQueries := tx.ReadQueries(); len(readQueries) > 0 {
+		t.Fatal("invalid read queries")
+	}
+	if writeQueries := tx.WriteQueries(); len(writeQueries) > 0 {
+		t.Fatal("invalid write queries")
+	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	t.Run("prepare context", func(t *testing.T) {

diff --git a/database/sql/tx.go b/database/sql/tx.go
@@ -75,11 +75,17 @@ func (proxy *Tx) AfterCommitCallback(success func() error, failure func(bool, []
 
 // WriteQueries informations of executed INSERT/UPDATE/DELETE query
 func (proxy *Tx) WriteQueries() []*connection.QueryLog {
+	if proxy.tx == nil {
+		return []*connection.QueryLog{}
+	}
 	return proxy.tx.WriteQueries
 }
 
 // ReadQueries informations of executed SELECT query
 func (proxy *Tx) ReadQueries() []*connection.QueryLog {
+	if proxy.tx == nil {
+		return []*connection.QueryLog{}
+	}
 	return proxy.tx.ReadQueries
 }