Proxied bd sql misclassified WITH [RECURSIVE] ... SELECT as a write and silently returned no rows; CALL result sets were dropped on both paths. Classify statements with the dolthub/vitess parser (internal/storage/sqlclass: Read/Write/Mixed); Mixed commits and renders any rows, so no path silently drops a result set. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
263 lines
5.7 KiB
Go
263 lines
5.7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/csv"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/beads/internal/storage/domain"
|
|
"github.com/steveyegge/beads/internal/storage/sqlclass"
|
|
"github.com/steveyegge/beads/internal/storage/uow"
|
|
)
|
|
|
|
func runSQLProxiedServer(ctx context.Context, query string, csvOutput bool) error {
|
|
if uowProvider == nil {
|
|
return HandleError("proxied-server UOW provider not initialized")
|
|
}
|
|
|
|
if isMultiStatementSQL(query) {
|
|
CheckReadonly("sql")
|
|
if _, err := runSQLProxiedExec(ctx, query); err != nil {
|
|
return err
|
|
}
|
|
return printSQLStatusOK()
|
|
}
|
|
|
|
switch sqlclass.Classify(query) {
|
|
case sqlclass.Read:
|
|
result, err := uow.RunTxRead(ctx, uowProvider, func(ctx context.Context, uw uow.UnitOfWork) (*domain.RawSQLResult, error) {
|
|
return uw.RawSQLUseCase().Query(ctx, query)
|
|
})
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("query error: %v", err)
|
|
}
|
|
return renderRawSQLResult(result, csvOutput)
|
|
|
|
case sqlclass.Write:
|
|
CheckReadonly("sql")
|
|
affected, err := runSQLProxiedExec(ctx, query)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if jsonOutput {
|
|
return outputJSON(map[string]interface{}{
|
|
"rows_affected": affected,
|
|
})
|
|
}
|
|
fmt.Printf("OK, %d rows affected\n", affected)
|
|
return nil
|
|
|
|
default:
|
|
// The statement may write and may return rows. Run it through Query
|
|
// inside a committing transaction so a result set is rendered rather
|
|
// than silently discarded, and any write is committed rather than
|
|
// rolled back with a read transaction.
|
|
CheckReadonly("sql")
|
|
result, err := uow.RunTxResult(ctx, uowProvider, func(ctx context.Context, uw uow.UnitOfWork) (*domain.RawSQLResult, string, error) {
|
|
result, err := uw.RawSQLUseCase().Query(ctx, query)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
return result, "bd sql: " + query, nil
|
|
})
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("query error: %v", err)
|
|
}
|
|
if len(result.Columns) == 0 {
|
|
return printSQLStatusOK()
|
|
}
|
|
return renderRawSQLResult(result, csvOutput)
|
|
}
|
|
}
|
|
|
|
func runSQLProxiedExec(ctx context.Context, query string) (int64, error) {
|
|
affected, err := uow.RunTxResult(ctx, uowProvider, func(ctx context.Context, uw uow.UnitOfWork) (int64, string, error) {
|
|
affected, err := uw.RawSQLUseCase().Exec(ctx, query)
|
|
if err != nil {
|
|
return 0, "", err
|
|
}
|
|
return affected, "bd sql: " + query, nil
|
|
})
|
|
if err != nil {
|
|
return 0, HandleErrorRespectJSON("exec error: %v", err)
|
|
}
|
|
return affected, nil
|
|
}
|
|
|
|
func printSQLStatusOK() error {
|
|
if jsonOutput {
|
|
return outputJSON(map[string]interface{}{
|
|
"status": "ok",
|
|
})
|
|
}
|
|
fmt.Println("OK")
|
|
return nil
|
|
}
|
|
|
|
func isMultiStatementSQL(query string) bool {
|
|
return topLevelStatementCount(query) > 1
|
|
}
|
|
|
|
func topLevelStatementCount(query string) int {
|
|
count := 0
|
|
hasContent := false
|
|
n := len(query)
|
|
for i := 0; i < n; {
|
|
c := query[i]
|
|
switch c {
|
|
case '\'', '"', '`':
|
|
quote := c
|
|
i++
|
|
for i < n {
|
|
if query[i] == '\\' && quote != '`' {
|
|
i += 2
|
|
continue
|
|
}
|
|
if query[i] == quote {
|
|
if i+1 < n && query[i+1] == quote {
|
|
i += 2
|
|
continue
|
|
}
|
|
i++
|
|
break
|
|
}
|
|
i++
|
|
}
|
|
hasContent = true
|
|
case '-':
|
|
if i+1 < n && query[i+1] == '-' && (i+2 >= n || query[i+2] == ' ' || query[i+2] == '\t' || query[i+2] == '\n' || query[i+2] == '\r') {
|
|
for i < n && query[i] != '\n' && query[i] != '\r' {
|
|
i++
|
|
}
|
|
} else {
|
|
hasContent = true
|
|
i++
|
|
}
|
|
case '#':
|
|
for i < n && query[i] != '\n' && query[i] != '\r' {
|
|
i++
|
|
}
|
|
case '/':
|
|
if i+1 < n && query[i+1] == '*' {
|
|
i += 2
|
|
for i+1 < n && !(query[i] == '*' && query[i+1] == '/') {
|
|
i++
|
|
}
|
|
i += 2
|
|
} else {
|
|
hasContent = true
|
|
i++
|
|
}
|
|
case ';':
|
|
if hasContent {
|
|
count++
|
|
hasContent = false
|
|
}
|
|
i++
|
|
case ' ', '\t', '\n', '\r':
|
|
i++
|
|
default:
|
|
hasContent = true
|
|
i++
|
|
}
|
|
}
|
|
if hasContent {
|
|
count++
|
|
}
|
|
return count
|
|
}
|
|
|
|
func renderRawSQLResult(result *domain.RawSQLResult, csvOutput bool) error {
|
|
columns := result.Columns
|
|
|
|
if jsonOutput {
|
|
out := make([]map[string]interface{}, 0, len(result.Rows))
|
|
for _, row := range result.Rows {
|
|
m := make(map[string]interface{}, len(columns))
|
|
for i, col := range columns {
|
|
m[col] = row[i]
|
|
}
|
|
out = append(out, m)
|
|
}
|
|
return outputJSON(out)
|
|
}
|
|
|
|
if csvOutput {
|
|
w := csv.NewWriter(os.Stdout)
|
|
if err := w.Write(columns); err != nil {
|
|
return HandleErrorRespectJSON("writing CSV header: %v", err)
|
|
}
|
|
for _, row := range result.Rows {
|
|
record := make([]string, len(columns))
|
|
for i := range columns {
|
|
record[i] = fmt.Sprintf("%v", row[i])
|
|
}
|
|
if err := w.Write(record); err != nil {
|
|
return HandleErrorRespectJSON("writing CSV row: %v", err)
|
|
}
|
|
}
|
|
w.Flush()
|
|
if err := w.Error(); err != nil {
|
|
return HandleErrorRespectJSON("flushing CSV: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
if len(result.Rows) == 0 {
|
|
fmt.Println("(0 rows)")
|
|
return nil
|
|
}
|
|
|
|
widths := make([]int, len(columns))
|
|
for i, col := range columns {
|
|
widths[i] = len(col)
|
|
}
|
|
for _, row := range result.Rows {
|
|
for i := range columns {
|
|
s := fmt.Sprintf("%v", row[i])
|
|
if len(s) > widths[i] {
|
|
widths[i] = len(s)
|
|
}
|
|
}
|
|
}
|
|
for i := range widths {
|
|
if widths[i] > 60 {
|
|
widths[i] = 60
|
|
}
|
|
}
|
|
|
|
for i, col := range columns {
|
|
if i > 0 {
|
|
fmt.Print(" | ")
|
|
}
|
|
fmt.Printf("%-*s", widths[i], col)
|
|
}
|
|
fmt.Println()
|
|
|
|
for i := range columns {
|
|
if i > 0 {
|
|
fmt.Print("-+-")
|
|
}
|
|
fmt.Print(strings.Repeat("-", widths[i]))
|
|
}
|
|
fmt.Println()
|
|
|
|
for _, row := range result.Rows {
|
|
for i := range columns {
|
|
if i > 0 {
|
|
fmt.Print(" | ")
|
|
}
|
|
s := fmt.Sprintf("%v", row[i])
|
|
if len(s) > 60 {
|
|
s = s[:57] + "..."
|
|
}
|
|
fmt.Printf("%-*s", widths[i], s)
|
|
}
|
|
fmt.Println()
|
|
}
|
|
|
|
fmt.Printf("(%d rows)\n", len(result.Rows))
|
|
return nil
|
|
}
|