v0.0.522

README.md

@@ -20,6 +20,7 @@ Potentially needs `export GOPRIVATE="gogs.mikescher.com"`
 | zipext      | Mike       | Utility for zip/gzip/tar etc                                                                                  |
 | reflectext  | Mike       | Utility for golang reflection                                                                                 |
 | fsext       | Mike       | Utility for filesytem access                                                                                  |
+| ctxext      | Mike       | Utility for context.Context                                                                                   |
 |             |            |                                                                                                               |
 | mongoext    | Mike       | Utility/Helper functions for mongodb (kinda abandoned)                                                        |
 | cursortoken | Mike       | MongoDB cursortoken implementation                                                                            |

ctxext/getter.go

@@ -0,0 +1,27 @@
+package ctxext
+
+import "context"
+
+func Value[T any](ctx context.Context, key any) (T, bool) {
+	v := ctx.Value(key)
+	if v == nil {
+		return *new(T), false
+	}
+	if tv, ok := v.(T); !ok {
+		return *new(T), false
+	} else {
+		return tv, true
+	}
+}
+
+func ValueOrDefault[T any](ctx context.Context, key any, def T) T {
+	v := ctx.Value(key)
+	if v == nil {
+		return def
+	}
+	if tv, ok := v.(T); !ok {
+		return def
+	} else {
+		return tv
+	}
+}

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.519"
+const GoextVersion = "0.0.522"
 
-const GoextVersionTimestamp = "2024-10-05T00:58:15+0200"
+const GoextVersionTimestamp = "2024-10-05T01:12:00+0200"

sq/database.go

@@ -61,7 +61,7 @@ func (db *database) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Resul
 
 	t0 := time.Now()
 
-	preMeta := PreExecMeta{}
+	preMeta := PreExecMeta{Context: ctx, TransactionConstructorContext: nil}
 	for _, v := range db.lstr {
 		err := v.PreExec(ctx, nil, &sqlstr, &prep, preMeta)
 		if err != nil {
@@ -73,9 +73,9 @@ func (db *database) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Resul
 
 	res, err := db.db.NamedExecContext(ctx, sqlstr, prep)
 
-	postMeta := PostExecMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostExecMeta{Context: ctx, TransactionConstructorContext: nil, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range db.lstr {
-		v.PostExec(nil, origsql, sqlstr, prep, postMeta)
+		v.PostExec(nil, origsql, sqlstr, prep, err, postMeta)
 	}
 
 	if err != nil {
@@ -90,7 +90,7 @@ func (db *database) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx.Ro
 
 	t0 := time.Now()
 
-	preMeta := PreQueryMeta{}
+	preMeta := PreQueryMeta{Context: ctx, TransactionConstructorContext: nil}
 	for _, v := range db.lstr {
 		err := v.PreQuery(ctx, nil, &sqlstr, &prep, preMeta)
 		if err != nil {
@@ -102,9 +102,9 @@ func (db *database) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx.Ro
 
 	rows, err := sqlx.NamedQueryContext(ctx, db.db, sqlstr, prep)
 
-	postMeta := PostQueryMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostQueryMeta{Context: ctx, TransactionConstructorContext: nil, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range db.lstr {
-		v.PostQuery(nil, origsql, sqlstr, prep, postMeta)
+		v.PostQuery(nil, origsql, sqlstr, prep, err, postMeta)
 	}
 
 	if err != nil {
@@ -118,7 +118,7 @@ func (db *database) Ping(ctx context.Context) error {
 
 	t0 := time.Now()
 
-	preMeta := PrePingMeta{}
+	preMeta := PrePingMeta{Context: ctx}
 	for _, v := range db.lstr {
 		err := v.PrePing(ctx, preMeta)
 		if err != nil {
@@ -130,7 +130,7 @@ func (db *database) Ping(ctx context.Context) error {
 
 	err := db.db.PingContext(ctx)
 
-	postMeta := PostPingMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostPingMeta{Context: ctx, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range db.lstr {
 		v.PostPing(err, postMeta)
 	}
@@ -151,7 +151,7 @@ func (db *database) BeginTransaction(ctx context.Context, iso sql.IsolationLevel
 	db.txctr += 1 // with overflow !
 	db.lock.Unlock()
 
-	preMeta := PreTxBeginMeta{}
+	preMeta := PreTxBeginMeta{Context: ctx}
 	for _, v := range db.lstr {
 		err := v.PreTxBegin(ctx, txid, preMeta)
 		if err != nil {
@@ -163,7 +163,7 @@ func (db *database) BeginTransaction(ctx context.Context, iso sql.IsolationLevel
 
 	xtx, err := db.db.BeginTxx(ctx, &sql.TxOptions{Isolation: iso})
 
-	postMeta := PostTxBeginMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostTxBeginMeta{Context: ctx, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range db.lstr {
 		v.PostTxBegin(txid, err, postMeta)
 	}

sq/listener.go

@@ -6,9 +6,11 @@ import (
 )
 
 type PrePingMeta struct {
+	Context context.Context
 }
 
 type PreTxBeginMeta struct {
+	Context            context.Context
 	ConstructorContext context.Context
 }
 
@@ -21,22 +23,27 @@ type PreTxRollbackMeta struct {
 }
 
 type PreQueryMeta struct {
+	Context                       context.Context
+	TransactionConstructorContext context.Context
 }
 
 type PreExecMeta struct {
+	Context                       context.Context
+	TransactionConstructorContext context.Context
 }
 
 type PostPingMeta struct {
-	Init  time.Time
-	Start time.Time
-	End   time.Time
+	Context context.Context
+	Init    time.Time
+	Start   time.Time
+	End     time.Time
 }
 
 type PostTxBeginMeta struct {
-	ConstructorContext context.Context
-	Init               time.Time
-	Start              time.Time
-	End                time.Time
+	Context context.Context
+	Init    time.Time
+	Start   time.Time
+	End     time.Time
 }
 
 type PostTxCommitMeta struct {
@@ -58,15 +65,19 @@ type PostTxRollbackMeta struct {
 }
 
 type PostQueryMeta struct {
-	Init  time.Time
-	Start time.Time
-	End   time.Time
+	Context                       context.Context
+	TransactionConstructorContext context.Context
+	Init                          time.Time
+	Start                         time.Time
+	End                           time.Time
 }
 
 type PostExecMeta struct {
-	Init  time.Time
-	Start time.Time
-	End   time.Time
+	Context                       context.Context
+	TransactionConstructorContext context.Context
+	Init                          time.Time
+	Start                         time.Time
+	End                           time.Time
 }
 
 type Listener interface {
@@ -81,8 +92,8 @@ type Listener interface {
 	PostTxBegin(txid uint16, result error, meta PostTxBeginMeta)
 	PostTxCommit(txid uint16, result error, meta PostTxCommitMeta)
 	PostTxRollback(txid uint16, result error, meta PostTxRollbackMeta)
-	PostQuery(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostQueryMeta)
-	PostExec(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostExecMeta)
+	PostQuery(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostQueryMeta)
+	PostExec(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostExecMeta)
 }
 
 type genListener struct {
@@ -96,8 +107,8 @@ type genListener struct {
 	postTxBegin    func(txid uint16, result error, meta PostTxBeginMeta)
 	postTxCommit   func(txid uint16, result error, meta PostTxCommitMeta)
 	postTxRollback func(txid uint16, result error, meta PostTxRollbackMeta)
-	postQuery      func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostQueryMeta)
-	postExec       func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostExecMeta)
+	postQuery      func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostQueryMeta)
+	postExec       func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostExecMeta)
 }
 
 func (g genListener) PrePing(ctx context.Context, meta PrePingMeta) error {
@@ -172,15 +183,15 @@ func (g genListener) PostTxRollback(txid uint16, result error, meta PostTxRollba
 	}
 }
 
-func (g genListener) PostQuery(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostQueryMeta) {
+func (g genListener) PostQuery(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostQueryMeta) {
 	if g.postQuery != nil {
-		g.postQuery(txID, sqlOriginal, sqlReal, params, meta)
+		g.postQuery(txID, sqlOriginal, sqlReal, params, result, meta)
 	}
 }
 
-func (g genListener) PostExec(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostExecMeta) {
+func (g genListener) PostExec(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostExecMeta) {
 	if g.postExec != nil {
-		g.postExec(txID, sqlOriginal, sqlReal, params, meta)
+		g.postExec(txID, sqlOriginal, sqlReal, params, result, meta)
 	}
 }
 
@@ -235,21 +246,21 @@ func NewPostTxRollbackListener(f func(txid uint16, result error, meta PostTxRoll
 	return genListener{postTxRollback: f}
 }
 
-func NewPostQueryListener(f func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostQueryMeta)) Listener {
+func NewPostQueryListener(f func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostQueryMeta)) Listener {
 	return genListener{postQuery: f}
 }
 
-func NewPostExecListener(f func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostExecMeta)) Listener {
+func NewPostExecListener(f func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostExecMeta)) Listener {
 	return genListener{postExec: f}
 }
 
-func NewPostListener(f func(cmdtype string, txID *uint16, sqlOriginal string, sqlReal string, params PP)) Listener {
+func NewPostListener(f func(cmdtype string, txID *uint16, sqlOriginal string, sqlReal string, result error, params PP)) Listener {
 	return genListener{
-		postExec: func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostExecMeta) {
-			f("EXEC", txID, sqlOriginal, sqlReal, params)
+		postExec: func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostExecMeta) {
+			f("EXEC", txID, sqlOriginal, sqlReal, result, params)
 		},
-		postQuery: func(txID *uint16, sqlOriginal string, sqlReal string, params PP, meta PostQueryMeta) {
-			f("QUERY", txID, sqlOriginal, sqlReal, params)
+		postQuery: func(txID *uint16, sqlOriginal string, sqlReal string, params PP, result error, meta PostQueryMeta) {
+			f("QUERY", txID, sqlOriginal, sqlReal, result, params)
 		},
 	}
 }

sq/transaction.go

@@ -109,7 +109,7 @@ func (tx *transaction) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Re
 
 	t0 := time.Now()
 
-	preMeta := PreExecMeta{}
+	preMeta := PreExecMeta{Context: ctx, TransactionConstructorContext: tx.constructorContext}
 	for _, v := range tx.db.lstr {
 		err := v.PreExec(ctx, langext.Ptr(tx.id), &sqlstr, &prep, preMeta)
 		if err != nil {
@@ -126,9 +126,9 @@ func (tx *transaction) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Re
 		tx.status = TxStatusActive
 	}
 
-	postMeta := PostExecMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostExecMeta{Context: ctx, TransactionConstructorContext: tx.constructorContext, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range tx.db.lstr {
-		v.PostExec(langext.Ptr(tx.id), origsql, sqlstr, prep, postMeta)
+		v.PostExec(langext.Ptr(tx.id), origsql, sqlstr, prep, err, postMeta)
 	}
 
 	if err != nil {
@@ -142,7 +142,7 @@ func (tx *transaction) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx
 
 	t0 := time.Now()
 
-	preMeta := PreQueryMeta{}
+	preMeta := PreQueryMeta{Context: ctx, TransactionConstructorContext: tx.constructorContext}
 	for _, v := range tx.db.lstr {
 		err := v.PreQuery(ctx, langext.Ptr(tx.id), &sqlstr, &prep, preMeta)
 		if err != nil {
@@ -159,9 +159,9 @@ func (tx *transaction) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx
 		tx.status = TxStatusActive
 	}
 
-	postMeta := PostQueryMeta{Init: t0, Start: t1, End: time.Now()}
+	postMeta := PostQueryMeta{Context: ctx, TransactionConstructorContext: tx.constructorContext, Init: t0, Start: t1, End: time.Now()}
 	for _, v := range tx.db.lstr {
-		v.PostQuery(langext.Ptr(tx.id), origsql, sqlstr, prep, postMeta)
+		v.PostQuery(langext.Ptr(tx.id), origsql, sqlstr, prep, err, postMeta)
 	}
 
 	if err != nil {