fix enginetest

enginetest/enginetests.go

@@ -5636,6 +5636,16 @@ func TestTypesOverWire(t *testing.T, harness ClientHarness, sessionBuilder serve
 					require.NoError(t, err)
 					expectedRowSet := script.Results[queryIdx]
 					expectedRowIdx := 0
+					var projections []sql.Expression
+					if trackedIter, ok := engineIter.(*plan.TrackedRowIter); ok {
+						if commitNode, ok := trackedIter.Node.(*plan.TransactionCommittingNode); ok {
+							if proj, ok := commitNode.Child().(*plan.Project); ok {
+								if proj.Deferred {
+									projections = proj.Projections
+								}
+							}
+						}
+					}
 					var engineRow sql.Row
 					for engineRow, err = engineIter.Next(ctx); err == nil; engineRow, err = engineIter.Next(ctx) {
 						if !assert.True(t, r.Next()) {
@@ -5653,11 +5663,11 @@ func TestTypesOverWire(t *testing.T, harness ClientHarness, sessionBuilder serve
 							break
 						}
 						expectedEngineRow := make([]*string, len(engineRow))
-						for i := range engineRow {
-							sqlVal, err := sch[i].Type.SQL(ctx, nil, engineRow[i])
-							if !assert.NoError(t, err) {
-								break
-							}
+						row, err := server.RowToSQL(ctx, sch, engineRow, projections)
+						if !assert.NoError(t, err) {
+							break
+						}
+						for i, sqlVal := range row {
 							if !sqlVal.IsNull() {
 								str := sqlVal.ToString()
 								expectedEngineRow[i] = &str

enginetest/server_engine.go

@@ -78,6 +78,7 @@ func NewServerQueryEngine(t *testing.T, engine *sqle.Engine, builder server.Sess
 		_ = s.Start()
 	}()
 
+	engine.Analyzer.ServerMode = true
 	return &ServerQueryEngine{
 		t:      t,
 		engine: engine,

server/handler.go

@@ -528,7 +528,7 @@ func resultForMax1RowIter(ctx *sql.Context, schema sql.Schema, iter sql.RowIter,
 		return nil, err
 	}
 
-	outputRow, err := rowToSQL(ctx, schema, row, nil)
+	outputRow, err := RowToSQL(ctx, schema, row, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -650,7 +650,7 @@ func (h *Handler) resultForDefaultIter(
 					continue
 				}
 
-				outputRow, err := rowToSQL(ctx, schema, row, projections)
+				outputRow, err := RowToSQL(ctx, schema, row, projections)
 				if err != nil {
 					return err
 				}
@@ -912,7 +912,7 @@ func updateMaxUsedConnectionsStatusVariable() {
 	}()
 }
 
-func rowToSQL(ctx *sql.Context, s sql.Schema, row sql.Row, projections []sql.Expression) ([]sqltypes.Value, error) {
+func RowToSQL(ctx *sql.Context, s sql.Schema, row sql.Row, projections []sql.Expression) ([]sqltypes.Value, error) {
 	o := make([]sqltypes.Value, max(len(row), len(projections))) // TODO: maybe should be length of schema?
 	// need to make sure the schema is not null as some plan schema is defined as null (e.g. IfElseBlock)
 	if len(s) == 0 {