feat(session): expose Adapter and Scan for low-level db ops

Author: morlay

internal/sql/adapter/sql.go

@@ -25,13 +25,3 @@ func SqlDoFromContext(ctx context.Context) SqlDo {
 	}
 	return nil
 }
-
-func InTx(ctx context.Context) bool {
-	sqlDo, ok := ctx.Value(sqlDoContext{}).(SqlDo)
-	if ok {
-		if _, ok := sqlDo.(*sql.Tx); ok {
-			return true
-		}
-	}
-	return false
-}

pkg/session/adapter.go

@@ -0,0 +1,13 @@
+package session
+
+import (
+	"context"
+
+	"github.com/octohelm/storage/internal/sql/adapter"
+)
+
+type Adapter = adapter.Adapter
+
+func Open(ctx context.Context, endpoint string) (Adapter, error) {
+	return adapter.Open(ctx, endpoint)
+}

pkg/session/db/database.go

@@ -35,8 +35,8 @@ type Database struct {
 	name   string
 	tables *sqlbuilder.Tables
 
-	db   adapter.Adapter
-	dbRo adapter.Adapter
+	db   session.Adapter
+	dbRo session.Adapter
 }
 
 func (d *Database) SetDefaults() {
@@ -70,7 +70,7 @@ func (d *Database) Init(ctx context.Context) error {
 		return err
 	}
 
-	db, err := adapter.Open(ctx, endpoint.String())
+	db, err := session.Open(ctx, endpoint.String())
 	if err != nil {
 		return err
 	}

pkg/session/scanner.go

@@ -0,0 +1,11 @@
+package session
+
+import "github.com/octohelm/storage/internal/sql/scanner"
+
+var Scan = scanner.Scan
+
+type ScanIterator = scanner.ScanIterator
+
+func Recv[T any](next func(v *T) error) ScanIterator {
+	return scanner.Recv(next)
+}

pkg/session/session.go

@@ -28,10 +28,10 @@ type Session interface {
 
 	Tx(ctx context.Context, fn func(ctx context.Context) error) error
 
-	Adapter(options ...OptionFunc) adapter.Adapter
+	Adapter(options ...OptionFunc) Adapter
 }
 
-func New(a adapter.Adapter, name string) Session {
+func New(a Adapter, name string) Session {
 	return &session{
 		name:    name,
 		adapter: a,

pkg/session/util.go

@@ -0,0 +1,16 @@
+package session
+
+import (
+	"context"
+	"database/sql"
+
+	"github.com/octohelm/storage/internal/sql/adapter"
+)
+
+func InTx(ctx context.Context) bool {
+	sqlDo := adapter.SqlDoFromContext(ctx)
+	if _, ok := sqlDo.(*sql.Tx); ok {
+		return true
+	}
+	return false
+}

pkg/sqlpipe/ex/source.go

@@ -64,7 +64,7 @@ func (e *Executor[M]) adapterOf(ctx context.Context, s session.Session) adapter.
 	if e.forCommit {
 		return s.Adapter()
 	}
-	if adapter.InTx(ctx) {
+	if session.InTx(ctx) {
 		return s.Adapter()
 	}
 	return s.Adapter(session.ReadOnly())