upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix transaction

Browse source
This commit is contained in:
Noah Hilverling 2019-02-26 11:15:18 +01:00
parent 53486bfdb0
commit ed6224e442
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql.go
View file

@ -163,7 +163,7 @@ func (dbw *DBWrapper) SqlQuery(query string, args ...interface{}) (*sql.Rows, er
}
// Wrapper around Db.BeginTx() for auto-logging
func (dbw *DBWrapper) SqlBegin(concurrencySafety bool, quiet bool) (*sql.Tx, error) {
func (dbw *DBWrapper) SqlBegin(concurrencySafety bool, quiet bool) (DbTransaction, error) {
var isoLvl sql.IsolationLevel
if concurrencySafety {
isoLvl = sql.LevelSerializable
@ -455,7 +455,7 @@ func sqlTryFetchAll(db DbClientOrTransaction, queryDescription string, query str
}
// sqlTransaction executes the given function inside a transaction.
func (dbw DBWrapper) sqlTransactionInternal(concurrencySafety bool, retryOnConnectionFailure bool, quiet bool, f func(*sql.Tx) error) error {
func (dbw DBWrapper) SqlTransaction(concurrencySafety bool, retryOnConnectionFailure bool, quiet bool, f func(DbTransaction) error) error {
for {
if !dbw.IsConnected() {
dbw.WaitForConnection()
@ -511,7 +511,7 @@ func (dbw DBWrapper) sqlTransactionInternal(concurrencySafety bool, retryOnConne
}
// Executes the given function inside a transaction
func (dbw *DBWrapper) sqlTryTransaction(f func(*sql.Tx) error, concurrencySafety bool, quiet bool) error {
func (dbw *DBWrapper) sqlTryTransaction(f func(transaction DbTransaction) error, concurrencySafety bool, quiet bool) error {
tx, errBegin := dbw.SqlBegin(concurrencySafety, quiet)
if errBegin != nil {
return errBegin