v0.0.518 Improve sq db-listener interface (breaking)

sq/transaction.go

@@ -6,6 +6,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"gogs.mikescher.com/BlackForestBytes/goext/exerr"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"time"
 )
 
 type TxStatus string
@@ -46,42 +47,56 @@ func NewTransaction(xtx *sqlx.Tx, txid uint16, db *database) Tx {
 }
 
 func (tx *transaction) Rollback() error {
+
+	t0 := time.Now()
+
+	preMeta := PreTxRollbackMeta{}
 	for _, v := range tx.db.lstr {
-		err := v.PreTxRollback(tx.id)
+		err := v.PreTxRollback(tx.id, preMeta)
 		if err != nil {
 			return exerr.Wrap(err, "failed to call SQL pre-rollback listener").Int("tx.id", int(tx.id)).Build()
 		}
 	}
 
+	t1 := time.Now()
+
 	result := tx.tx.Rollback()
 
 	if result == nil {
 		tx.status = TxStatusRollback
 	}
 
+	postMeta := PostTxRollbackMeta{Init: t0, Start: t1, End: time.Now(), ExecCounter: tx.execCtr, QueryCounter: tx.queryCtr}
 	for _, v := range tx.db.lstr {
-		v.PostTxRollback(tx.id, result)
+		v.PostTxRollback(tx.id, result, postMeta)
 	}
 
 	return result
 }
 
 func (tx *transaction) Commit() error {
+
+	t0 := time.Now()
+
+	preMeta := PreTxCommitMeta{}
 	for _, v := range tx.db.lstr {
-		err := v.PreTxCommit(tx.id)
+		err := v.PreTxCommit(tx.id, preMeta)
 		if err != nil {
 			return exerr.Wrap(err, "failed to call SQL pre-commit listener").Int("tx.id", int(tx.id)).Build()
 		}
 	}
 
+	t1 := time.Now()
+
 	result := tx.tx.Commit()
 
 	if result == nil {
 		tx.status = TxStatusComitted
 	}
 
+	postMeta := PostTxCommitMeta{Init: t0, Start: t1, End: time.Now(), ExecCounter: tx.execCtr, QueryCounter: tx.queryCtr}
 	for _, v := range tx.db.lstr {
-		v.PostTxRollback(tx.id, result)
+		v.PostTxCommit(tx.id, result, postMeta)
 	}
 
 	return result
@@ -89,21 +104,29 @@ func (tx *transaction) Commit() error {
 
 func (tx *transaction) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Result, error) {
 	origsql := sqlstr
+
+	t0 := time.Now()
+
+	preMeta := PreExecMeta{}
 	for _, v := range tx.db.lstr {
-		err := v.PreExec(ctx, langext.Ptr(tx.id), &sqlstr, &prep)
+		err := v.PreExec(ctx, langext.Ptr(tx.id), &sqlstr, &prep, preMeta)
 		if err != nil {
 			return nil, exerr.Wrap(err, "failed to call SQL pre-exec listener").Int("tx.id", int(tx.id)).Str("original_sql", origsql).Str("sql", sqlstr).Any("sql_params", prep).Build()
 		}
 	}
 
+	t1 := time.Now()
+
 	res, err := tx.tx.NamedExecContext(ctx, sqlstr, prep)
+	tx.execCtr++
 
 	if tx.status == TxStatusInitial && err == nil {
 		tx.status = TxStatusActive
 	}
 
+	postMeta := PostExecMeta{Init: t0, Start: t1, End: time.Now()}
 	for _, v := range tx.db.lstr {
-		v.PostExec(langext.Ptr(tx.id), origsql, sqlstr, prep)
+		v.PostExec(langext.Ptr(tx.id), origsql, sqlstr, prep, postMeta)
 	}
 
 	if err != nil {
@@ -114,21 +137,29 @@ func (tx *transaction) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Re
 
 func (tx *transaction) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx.Rows, error) {
 	origsql := sqlstr
+
+	t0 := time.Now()
+
+	preMeta := PreQueryMeta{}
 	for _, v := range tx.db.lstr {
-		err := v.PreQuery(ctx, langext.Ptr(tx.id), &sqlstr, &prep)
+		err := v.PreQuery(ctx, langext.Ptr(tx.id), &sqlstr, &prep, preMeta)
 		if err != nil {
 			return nil, exerr.Wrap(err, "failed to call SQL pre-query listener").Int("tx.id", int(tx.id)).Str("original_sql", origsql).Str("sql", sqlstr).Any("sql_params", prep).Build()
 		}
 	}
 
+	t1 := time.Now()
+
 	rows, err := sqlx.NamedQueryContext(ctx, tx.tx, sqlstr, prep)
+	tx.queryCtr++
 
 	if tx.status == TxStatusInitial && err == nil {
 		tx.status = TxStatusActive
 	}
 
+	postMeta := PostQueryMeta{Init: t0, Start: t1, End: time.Now()}
 	for _, v := range tx.db.lstr {
-		v.PostQuery(langext.Ptr(tx.id), origsql, sqlstr, prep)
+		v.PostQuery(langext.Ptr(tx.id), origsql, sqlstr, prep, postMeta)
 	}
 
 	if err != nil {