Merge branch 'main' of https://github.com/dolthub/go-mysql-server into angela/emptystringset

Author: angelamayxie

enginetest/evaluation.go

@@ -852,7 +852,7 @@ func WidenRow(t *testing.T, sch sql.Schema, row sql.Row) sql.Row {
 	widened := make(sql.Row, len(row))
 	for i, v := range row {
 		if i < len(sch) && types.IsJSON(sch[i].Type) {
-			widened[i] = widenJSONValues(v)
+			widened[i] = widenJSONValues(t.Context(), v)
 			continue
 		}
 
@@ -893,7 +893,7 @@ func widenValue(t *testing.T, v interface{}) (vw interface{}) {
 	return vw
 }
 
-func widenJSONValues(val interface{}) sql.JSONWrapper {
+func widenJSONValues(ctx context.Context, val interface{}) sql.JSONWrapper {
 	if val == nil {
 		return nil
 	}
@@ -907,7 +907,7 @@ func widenJSONValues(val interface{}) sql.JSONWrapper {
 		js = types.MustJSON(str)
 	}
 
-	doc, err := js.ToInterface()
+	doc, err := js.ToInterface(ctx)
 	if err != nil {
 		panic(err)
 	}

enginetest/memory_engine_test.go

@@ -156,7 +156,6 @@ func TestSingleQuery(t *testing.T) {
 		Expected: []sql.Row{{-1}},
 	}
 
-	fmt.Sprintf("%v", test)
 	harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, true, nil)
 	// harness.UseServer()
 	harness.Setup(setup.MydbData, setup.NiltableData)
@@ -186,7 +185,6 @@ func TestSingleQueryPrepared(t *testing.T) {
 		},
 	}
 
-	fmt.Sprintf("%v", test)
 	harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, false, nil)
 	harness.Setup(setup.KeylessSetup...)
 	engine, err := harness.NewEngine(t)

enginetest/server_engine_test.go

@@ -368,7 +368,7 @@ func TestServerPreparedStatements(t *testing.T) {
 					require.True(t, ok)
 				})
 			}
-			for _, stmt := range append(commonTeardown) {
+			for _, stmt := range commonTeardown {
 				_, err := conn.Exec(stmt)
 				require.NoError(t, err)
 			}

go.mod

@@ -42,4 +42,4 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )
 
-go 1.23.3
+go 1.24.0

memory/persisted_session_test.go

@@ -27,7 +27,7 @@ import (
 )
 
 func newPersistedSqlContext() *sql.Context {
-	ctx, _ := context.WithCancel(context.TODO())
+	ctx := context.Background()
 	pro := NewDBProvider()
 	sess := sql.NewBaseSession()
 

processlist.go

@@ -17,7 +17,6 @@ package sqle
 import (
 	"context"
 	"errors"
-	"fmt"
 	"sync"
 	"time"
 
@@ -387,7 +386,7 @@ func getLongQueryTime() float64 {
 	}
 	longQueryTime, ok := longQueryTimeValue.(float64)
 	if !ok {
-		logrus.Errorf(fmt.Sprintf("unexpected type for value of long_query_time system variable: %T", longQueryTimeValue))
+		logrus.Errorf("unexpected type for value of long_query_time system variable: %T", longQueryTimeValue)
 		return 0
 	}
 	return longQueryTime

sql/analyzer/analyzer.go

@@ -369,7 +369,7 @@ func (a *Analyzer) LogDiff(prev, next sql.Node) {
 				panic(err)
 			}
 			if len(diff) > 0 {
-				a.Log(diff)
+				a.Log("%s", diff)
 			} else {
 				a.Log("nodes are different, but no textual diff found (implement better DebugString?)")
 			}

sql/analyzer/indexed_joins.go

@@ -217,7 +217,7 @@ func replanJoin(ctx *sql.Context, n *plan.JoinNode, a *Analyzer, scope *plan.Sco
 	}
 
 	if a.Verbose && a.Debug {
-		a.Log(m.String())
+		a.Log("%s", m.String())
 	}
 	if scope != nil {
 		scope.JoinTrees = append(scope.JoinTrees, m.String())
@@ -489,7 +489,6 @@ func convertSemiToInnerJoin(m *memo.Memo) error {
 			}
 			if srcNode == nil {
 				break
-				return fmt.Errorf("table for column not found: %d", colId)
 			}
 
 			sch := srcNode.Schema()

sql/core.go

@@ -15,6 +15,7 @@
 package sql
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	trace2 "runtime/trace"
@@ -324,7 +325,7 @@ func ConvertToBool(ctx *Context, v interface{}) (bool, error) {
 	}
 }
 
-func ConvertToVector(v interface{}) ([]float64, error) {
+func ConvertToVector(ctx context.Context, v interface{}) ([]float64, error) {
 	switch b := v.(type) {
 	case []float64:
 		return b, nil
@@ -336,7 +337,7 @@ func ConvertToVector(v interface{}) ([]float64, error) {
 		}
 		return convertJsonInterfaceToVector(val)
 	case JSONWrapper:
-		val, err := b.ToInterface()
+		val, err := b.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}

sql/errors.go

@@ -17,7 +17,6 @@ package sql
 import (
 	"fmt"
 	"io"
-	"strings"
 
 	"github.com/dolthub/vitess/go/mysql"
 	"gopkg.in/src-d/go-errors.v1"
@@ -1021,8 +1020,7 @@ func CastSQLError(err error) *mysql.SQLError {
 		code = mysql.ERUnknownError
 	}
 
-	// This uses the given error as a format string, so we have to escape any percentage signs else they'll show up as "%!(MISSING)"
-	return mysql.NewSQLError(code, sqlState, strings.Replace(err.Error(), `%`, `%%`, -1))
+	return mysql.NewSQLError(code, sqlState, "%s", err.Error())
 }
 
 // UnwrapError removes any wrapping errors (e.g. WrappedInsertError) around the specified error and