- Existing test suite passing.

Author: general-kroll-4-life

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/spf13/viper v1.10.1
 	github.com/stackql/any-sdk v0.1.2-alpha37
 	github.com/stackql/go-suffix-map v0.0.1-alpha01
-	github.com/stackql/psql-wire v0.1.1-alpha07
+	github.com/stackql/psql-wire v0.1.1-beta20
 	github.com/stackql/stackql-parser v0.0.14-alpha05
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0

go.sum

@@ -486,8 +486,8 @@ github.com/stackql/any-sdk v0.1.2-alpha37 h1:bvU576YCwqtjztMD4wSpgj//StNH8qGoBRB
 github.com/stackql/any-sdk v0.1.2-alpha37/go.mod h1:4jYKpPoX2GWEK+qBnlGLvr8SUfndiYwHMIkg1dn9tFM=
 github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
 github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
-github.com/stackql/psql-wire v0.1.1-alpha07 h1:LQWVUlx4Bougk6dztDNG5tmXxpIVeeTSsInTj801xCs=
-github.com/stackql/psql-wire v0.1.1-alpha07/go.mod h1:a44Wd8kDC3irFLpGutarKDBqhJ/aqXlj1aMzO5bVJYg=
+github.com/stackql/psql-wire v0.1.1-beta20 h1:ppLGNaaZGt0LncXJ4ElSHyJz6cQCAYFNwYQjIgSFJho=
+github.com/stackql/psql-wire v0.1.1-beta20/go.mod h1:a44Wd8kDC3irFLpGutarKDBqhJ/aqXlj1aMzO5bVJYg=
 github.com/stackql/readline v0.0.2-alpha05 h1:ID4QzGdplFBsrSnTuz8pvKzWw96JbrJg8fsLry2UriU=
 github.com/stackql/readline v0.0.2-alpha05/go.mod h1:OFAYOdXk/X4+5GYiDXFfaGrk+bCN6Qv0SYY5HNzD2E0=
 github.com/stackql/stackql-go-sqlite3 v1.0.3-stackql h1:j0yt6T5thZuz5+HIr81PXz2AClAtCko0vzr5tm8C1g8=

internal/stackql/cmd/srv.go

@@ -45,7 +45,7 @@ var srvCmd = &cobra.Command{
 		iqlerror.PrintErrorAndExitOneIfError(err)
 		handlerCtx, err := entryutil.BuildHandlerContext(runtimeCtx, nil, queryCache, inputBundle, false)
 		iqlerror.PrintErrorAndExitOneIfError(err)
-		sbe := driver.NewStackQLDriverFactory(handlerCtx)
+		sbe := driver.NewStackQLDriverFactory(handlerCtx, true)
 		server, err := psqlwire.MakeWireServer(sbe, runtimeCtx)
 		iqlerror.PrintErrorAndExitOneIfError(err)
 		server.Serve() //nolint:errcheck // TODO: investigate

internal/stackql/driver/driver.go

@@ -1,6 +1,7 @@
 package driver
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 
@@ -28,7 +29,8 @@ type StackQLDriverFactory interface {
 }
 
 type basicStackQLDriverFactory struct {
-	handlerCtx handler.HandlerContext
+	isCaptureDebug bool
+	handlerCtx     handler.HandlerContext
 }
 
 func (sdf *basicStackQLDriverFactory) NewSQLBackend() (sqlbackend.ISQLBackend, error) {
@@ -59,16 +61,23 @@ func (sdf *basicStackQLDriverFactory) newSQLDriver() (StackQLDriver, error) {
 	sdf.handlerCtx.SetTSM(tsmInstance)
 	clonedCtx := sdf.handlerCtx.Clone()
 	clonedCtx.SetTxnCounterMgr(txCtr)
+	buf := bytes.NewBuffer([]byte{})
+	if sdf.isCaptureDebug {
+		logging.GetLogger().Debugln("debug mode enabled")
+		clonedCtx.SetOutErrFile(buf)
+	}
 	rv := &basicStackQLDriver{
+		debugBuf:        buf,
 		handlerCtx:      clonedCtx,
 		txnOrchestrator: txnOrchestrator,
 	}
 	return rv, nil
 }
 
-func NewStackQLDriverFactory(handlerCtx handler.HandlerContext) sqlbackend.SQLBackendFactory {
+func NewStackQLDriverFactory(handlerCtx handler.HandlerContext, isCaptureDebug bool) sqlbackend.SQLBackendFactory {
 	return &basicStackQLDriverFactory{
-		handlerCtx: handlerCtx,
+		isCaptureDebug: isCaptureDebug,
+		handlerCtx:     handlerCtx,
 	}
 }
 
@@ -121,10 +130,18 @@ func (dr *basicStackQLDriver) ProcessQuery(query string) {
 }
 
 type basicStackQLDriver struct {
+	debugBuf        *bytes.Buffer
 	handlerCtx      handler.HandlerContext
 	txnOrchestrator tsm_physio.Orchestrator
 }
 
+func (dr *basicStackQLDriver) GetDebugStr() string {
+	if dr.debugBuf != nil {
+		return dr.debugBuf.String()
+	}
+	return ""
+}
+
 func (dr *basicStackQLDriver) CloneSQLBackend() sqlbackend.ISQLBackend {
 	return &basicStackQLDriver{
 		handlerCtx: dr.handlerCtx.Clone(),

internal/stackql/handler/handler.go

@@ -79,6 +79,8 @@ type HandlerContext interface { //nolint:revive // don't mind stuttering this on
 	SetQuery(string)
 	SetRawQuery(string)
 	//
+	SetOutErrFile(io.Writer)
+	//
 	GetTxnCoordinatorCtx() txn_context.ITransactionCoordinatorContext
 
 	GetTypingConfig() typing.Config
@@ -197,10 +199,17 @@ func (hc *standardHandlerContext) GetAuthContexts() dto.AuthContexts {
 	return hc.authContexts
 }
 
-func (hc *standardHandlerContext) GetRegistry() anysdk.RegistryAPI    { return hc.registry }
-func (hc *standardHandlerContext) GetErrorPresentation() string       { return hc.errorPresentation }
-func (hc *standardHandlerContext) GetOutfile() io.Writer              { return hc.outfile }
-func (hc *standardHandlerContext) GetOutErrFile() io.Writer           { return hc.outErrFile }
+func (hc *standardHandlerContext) GetRegistry() anysdk.RegistryAPI { return hc.registry }
+func (hc *standardHandlerContext) GetErrorPresentation() string    { return hc.errorPresentation }
+func (hc *standardHandlerContext) GetOutfile() io.Writer           { return hc.outfile }
+func (hc *standardHandlerContext) GetOutErrFile() io.Writer {
+	return hc.outErrFile
+}
+func (hc *standardHandlerContext) SetOutErrFile(w io.Writer) {
+	defer hc.sessionCtxMutex.Unlock()
+	hc.sessionCtxMutex.Lock()
+	hc.outErrFile = w
+}
 func (hc *standardHandlerContext) GetLRUCache() *lrucache.LRUCache    { return hc.lRUCache }
 func (hc *standardHandlerContext) GetSQLEngine() sqlengine.SQLEngine  { return hc.sqlEngine }
 func (hc *standardHandlerContext) GetSQLSystem() sql_system.SQLSystem { return hc.sqlSystem }