- Testing details.

Author: general-kroll-4-life

internal/stackql/primitivebuilder/explain.go

@@ -1,6 +1,8 @@
 package primitivebuilder
 
 import (
+	"time"
+
 	"github.com/stackql/any-sdk/public/sqlengine"
 	"github.com/stackql/stackql/internal/stackql/handler"
 	"github.com/stackql/stackql/internal/stackql/internal_data_transfer/internaldto"
@@ -50,11 +52,18 @@ func (nb *ExplainBuilder) Build() error {
 			if nb.instructionErr != nil {
 				return internaldto.NewErroneousExecutorOutput(nb.instructionErr)
 			}
+			oneLinerOutput := time.Now().Format("2006-01-02T15:04:05-07:00 MST")
+			resultMap := map[string]any{
+				"query":     nb.handlerCtx.GetRawQuery(),
+				"timestamp": oneLinerOutput,
+				"valid":     true,
+			}
+			columns := []string{"query", "timestamp", "valid"}
 			return util.PrepareResultSet(
 				internaldto.NewPrepareResultSetPlusRawDTO(
 					nil,
-					nil,
-					nil,
+					map[string]map[string]any{"0": resultMap},
+					columns,
 					nil,
 					nil,
 					internaldto.NewBackendMessages(nb.messages), nil,

pkg/mcp_server/server.go

@@ -223,6 +223,23 @@ func newMCPServer(config *Config, backend Backend, logger *logrus.Logger) (MCPSe
 			return &mcp.CallToolResult{Content: []mcp.Content{&mcp.TextContent{Text: string(bytesOut)}}}, out, nil
 		},
 	)
+	mcp.AddTool(
+		server,
+		&mcp.Tool{
+			Name:        "validate_query_json_v2",
+			Description: "Explain a SQL query and return a JSON object expressing success, or else an error.",
+		},
+		func(ctx context.Context, req *mcp.CallToolRequest, args dto.QueryJSONInput) (*mcp.CallToolResult, any, error) {
+			args.SQL = fmt.Sprintf("EXPLAIN %s", args.SQL)
+			arr, err := backend.RunQueryJSON(ctx, args)
+			if err != nil {
+				return nil, nil, err
+			}
+			out := dto.QueryResultDTO{Rows: arr, RowCount: len(arr), Format: "json"}
+			bytesOut, _ := json.Marshal(out)
+			return &mcp.CallToolResult{Content: []mcp.Content{&mcp.TextContent{Text: string(bytesOut)}}}, out, nil
+		},
+	)
 	mcp.AddTool(
 		server,
 		&mcp.Tool{

test/robot/functional/stackql_mocked_from_cmd_line.robot

@@ -9018,16 +9018,16 @@ Delete Await Returning Generates Error
 Explain Select Repeatably Generates Messages
     [Documentation]    This is fairly crude but useful in particular for MCP functions.
     ${inputStr} =    Catenate
-    ...    explain select * from google.compute.instances where project = 'stackql-demo';
-    ...    explain select * from google.compute.instances where project = 'stackql-demo';
+    ...    explain select * from google.storage.buckets where project = 'stackql-demo';
+    ...    explain select * from google.storage.buckets where project = 'stackql-demo';
     ...    explain select * from aws.ec2.instances where region = 'ap-southeast-2';
     ...    explain select * from aws.ec2.instances where region = 'ap-southeast-2';
     ...    explain select 1 as foo;
     ...    explain select 1 as foo;
     ...    explain select * from google.storage.buckets;
     ...    explain select * from google.storage.buckets;
-    ...    explain select * from google.compute.instances where project = 'stackql-demo';
-    ...    explain select * from google.compute.instances where project = 'stackql-demo';
+    ...    explain select * from google.storage.buckets where project = 'stackql-demo';
+    ...    explain select * from google.storage.buckets where project = 'stackql-demo';
     ${outputErrStr} =    Catenate    SEPARATOR=\n
     ...    Execution plan generated successfully
     ...    OK
@@ -9037,17 +9037,15 @@ Explain Select Repeatably Generates Messages
     ...    OK
     ...    Execution plan generated successfully
     ...    OK
-    ...    Execution plan generated successfully
     ...    OK
-    ...    Execution plan generated successfully
     ...    OK
     ...    cannot find matching operation, possible causes include missing required parameters or an unsupported method for the resource, to find required parameters for supported methods run SHOW METHODS IN google.storage.buckets: no appropriate method = 'select' for resource = 'buckets'
     ...    cannot find matching operation, possible causes include missing required parameters or an unsupported method for the resource, to find required parameters for supported methods run SHOW METHODS IN google.storage.buckets: no appropriate method = 'select' for resource = 'buckets'
     ...    Execution plan generated successfully
     ...    OK
     ...    Execution plan generated successfully
     ...    OK
-    Should Stackql Exec Inline Equal Both Streams
+    Should Stackql Exec Inline Equal Stderr
     ...    ${STACKQL_EXE}
     ...    ${OKTA_SECRET_STR}
     ...    ${GITHUB_SECRET_STR}
@@ -9056,7 +9054,6 @@ Explain Select Repeatably Generates Messages
     ...    ${AUTH_CFG_STR}
     ...    ${SQL_BACKEND_CFG_STR_CANONICAL}
     ...    ${inputStr}
-    ...    ${EMPTY}
     ...    ${outputErrStr}
     ...    stdout=${CURDIR}/tmp/Explain-Select-Repeatably-Generates-Messages.tmp
     ...    stderr=${CURDIR}/tmp/Explain-Select-Repeatably-Generates-Messages-stderr.tmp