Skip to content

add nil check #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattetti merged 1 commit into from
Mar 9, 2015
Merged

add nil check #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package jet

import (
"database/sql"
"errors"
)

// Tx represents a transaction instance.
Expand All @@ -21,6 +22,9 @@ func (tx *Tx) Query(query string, args ...interface{}) Runnable {

// Exec calls Exec on the underlying sql.Tx.
func (tx *Tx) Exec(query string, args ...interface{}) (sql.Result, error) {
if tx == nil || tx.tx == nil {
return nil, errors.New("jet: Exec called on nil transaction")
}
return tx.tx.Exec(query, args...)
}

Expand Down