Merge pull request #3247 from dolthub/elian/9865

dolthub/dolt#9865: Fix EOF on procedure

Author: elianddb

enginetest/queries/script_queries.go

@@ -122,6 +122,37 @@ type ScriptTestAssertion struct {
 // Unlike other engine tests, ScriptTests must be self-contained. No other tables are created outside the definition of
 // the tests.
 var ScriptTests = []ScriptTest{
+	{
+		// https://github.com/dolthub/dolt/issues/9865
+		Name:    "Stored procedure containing a transaction does not return EOF",
+		Dialect: "mysql",
+		SetUpScript: []string{
+			"CREATE TABLE test_table (id INT PRIMARY KEY, name TEXT)",
+			`CREATE PROCEDURE my_proc()
+BEGIN
+    START TRANSACTION;
+    INSERT INTO test_table VALUES (1, 'test');
+    COMMIT;
+END`,
+			`CREATE PROCEDURE empty_procedure()
+BEGIN
+END`,
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "CALL my_proc()",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 0, InsertID: 0, Info: nil}}},
+			},
+			{
+				Query:    "SELECT * FROM test_table",
+				Expected: []sql.Row{{1, "test"}},
+			},
+			{
+				Query:    "CALL empty_procedure()",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 0, InsertID: 0, Info: nil}}},
+			},
+		},
+	},
 	{
 		// https://github.com/dolthub/dolt/issues/9873
 		// TODO: `FOR UPDATE OF` (`FOR UPDATE` in general) is currently a no-op: https://www.dolthub.com/blog/2023-10-23-hold-my-beer/

sql/procedures/interpreter_logic.go

@@ -965,6 +965,11 @@ func Call(ctx *sql.Context, iNode InterpreterNode) (sql.RowIter, *InterpreterSta
 		rowIters = append(rowIters, sql.RowsToRowIter(sql.Row{types.NewOkResult(0)}))
 	} else if retSch != nil {
 		iNode.SetSchema(retSch)
+	} else {
+		// If we have rowIters but no meaningful schema, return OkResult
+		// This ensures CALL statements always return proper result sets for MySQL protocol
+		iNode.SetSchema(types.OkResultSchema)
+		rowIters = []sql.RowIter{sql.RowsToRowIter(sql.Row{types.NewOkResult(0)})}
 	}
 
 	return rowIters[len(rowIters)-1], stack, nil

sql/rowexec/proc_iters.go

@@ -121,14 +121,20 @@ var _ sql.MutableRowIter = (*callIter)(nil)
 
 // Next implements the sql.RowIter interface.
 func (ci *callIter) Next(ctx *sql.Context) (sql.Row, error) {
+	if ci.innerIter == nil {
+		return nil, io.EOF
+	}
 	return ci.innerIter.Next(ctx)
 }
 
 // Close implements the sql.RowIter interface.
 func (ci *callIter) Close(ctx *sql.Context) error {
-	err := ci.innerIter.Close(ctx)
-	if err != nil {
-		return err
+	var err error
+	if ci.innerIter != nil {
+		err = ci.innerIter.Close(ctx)
+		if err != nil {
+			return err
+		}
 	}
 	err = ci.call.Pref.CloseAllCursors(ctx)
 	if err != nil {