rewriting stored procedures

engine.go

@@ -150,7 +150,7 @@ type Engine struct {
 	Parser            sql.Parser
 }
 
-var _ analyzer.StatementRunner = (*Engine)(nil)
+var _ sql.StatementRunner = (*Engine)(nil)
 
 type ColumnWithRawDefault struct {
 	SqlColumn *sql.Column

enginetest/memory_engine_test.go

@@ -205,26 +205,36 @@ func TestSingleScript(t *testing.T) {
 	t.Skip()
 	var scripts = []queries.ScriptTest{
 		{
-			Name: "test script",
-			SetUpScript: []string{
-				"create table t (i int);",
-			},
+			Name:        "AS OF propagates to nested CALLs",
+			SetUpScript: []string{},
 			Assertions: []queries.ScriptTestAssertion{
 				{
-					Query:    "select 1 into @a",
-					Expected: []sql.Row{},
+					Query: "create procedure create_proc() create table t (i int primary key, j int);",
+					Expected: []sql.Row{
+						{types.NewOkResult(0)},
+					},
+				},
+				{
+					Query: "call create_proc()",
+					Expected: []sql.Row{
+						{types.NewOkResult(0)},
+					},
 				},
 			},
 		},
 	}
 
 	for _, test := range scripts {
 		harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, true, nil)
+		harness.UseServer()
 		engine, err := harness.NewEngine(t)
 		if err != nil {
 			panic(err)
 		}
 
+		//engine.EngineAnalyzer().Debug = true
+		//engine.EngineAnalyzer().Verbose = true
+
 		enginetest.TestScriptWithEngine(t, engine, harness, test)
 	}
 }

enginetest/queries/procedure_queries.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/plan"
 	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
@@ -75,17 +76,13 @@ var ProcedureLogicTests = []ScriptTest{
 			{
 				Query: "CALL testabc(2, 3)",
 				Expected: []sql.Row{
-					{
-						6.0,
-					},
+					{6.0},
 				},
 			},
 			{
 				Query: "CALL testabc(9, 9.5)",
 				Expected: []sql.Row{
-					{
-						85.5,
-					},
+					{85.5},
 				},
 			},
 		},
@@ -906,9 +903,11 @@ END;`,
 		SetUpScript: []string{
 			"CREATE TABLE inventory (item_id int primary key, shelf_id int, item varchar(10))",
 			"INSERT INTO inventory VALUES (1, 1, 'a'), (2, 1, 'b'), (3, 2, 'c'), (4, 1, 'd'), (5, 4, 'e')",
-			`CREATE PROCEDURE count_and_print(IN p_shelf_id INT, OUT p_count INT) BEGIN
-SELECT item FROM inventory WHERE shelf_id = p_shelf_id ORDER BY item ASC;
-SELECT COUNT(*) INTO p_count FROM inventory WHERE shelf_id = p_shelf_id;
+			`
+CREATE PROCEDURE count_and_print(IN p_shelf_id INT, OUT p_count INT)
+BEGIN
+	SELECT item FROM inventory WHERE shelf_id = p_shelf_id ORDER BY item ASC;
+	SELECT COUNT(*) INTO p_count FROM inventory WHERE shelf_id = p_shelf_id;
 END`,
 		},
 		Assertions: []ScriptTestAssertion{
@@ -989,8 +988,12 @@ END;`,
 				Expected: []sql.Row{{}},
 			},
 			{
-				Query:    "CALL p1(@x);",
-				Expected: []sql.Row{{}},
+				// TODO: Set statements don't return anything for whatever reason
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "CALL p1(@x);",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
 			},
 			{
 				Query: "SELECT @x;",
@@ -1020,8 +1023,6 @@ BEGIN
 	ELSEIF x = 4 THEN
 		SIGNAL specialty2;
 	ELSE
-		SIGNAL SQLSTATE '01000'
-			SET MESSAGE_TEXT = 'A warning occurred', MYSQL_ERRNO = 1000;
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'An error occurred', MYSQL_ERRNO = 1001;
 	END IF;
@@ -1051,6 +1052,10 @@ END;`,
 				Query:          "CALL p1(4)",
 				ExpectedErrStr: "Unhandled user-defined not found condition (errno 1643) (sqlstate 02000)",
 			},
+			{
+				Query:          "CALL p1(5)",
+				ExpectedErrStr: "An error occurred (errno 1001) (sqlstate 45000)",
+			},
 		},
 	},
 	{
@@ -1266,17 +1271,18 @@ END;`,
 			`CREATE PROCEDURE duplicate_key()
 BEGIN
 	DECLARE a, b INT DEFAULT 1;
-    BEGIN
+	BEGIN
 		DECLARE EXIT HANDLER FOR SQLEXCEPTION SET a = 7;
 		INSERT INTO t1 values (0);
-    END;
-    SELECT a;
+	END;
+	SELECT a;
 END;`,
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:    "CALL eof();",
-				Expected: []sql.Row{},
+				// TODO: MySQL returns: ERROR: 1329: No data - zero rows fetched, selected, or processed
+				Query:          "CALL eof();",
+				ExpectedErrStr: "exhausted fetch iterator",
 			},
 			{
 				Query:    "CALL duplicate_key();",
@@ -1392,8 +1398,12 @@ END;`,
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:    "CALL outer_declare();",
-				Expected: []sql.Row{},
+				// TODO: Set statements don't return anything for whatever reason
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "CALL outer_declare();",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
 			},
 			{
 				Query: "CALL inner_declare();",
@@ -2214,9 +2224,7 @@ var ProcedureCallTests = []ScriptTest{
 			{
 				Query: "SELECT @outparam",
 				Expected: []sql.Row{
-					{
-						nil,
-					},
+					{nil},
 				},
 			},
 		},
@@ -2270,9 +2278,7 @@ var ProcedureCallTests = []ScriptTest{
 			{
 				Query: "SELECT @outparam",
 				Expected: []sql.Row{
-					{
-						int64(777),
-					},
+					{int64(777)},
 				},
 			},
 		},
@@ -2831,19 +2837,118 @@ var ProcedureCreateInSubroutineTests = []ScriptTest{
 			},
 		},
 	},
+
 	{
-		Name: "procedure must not contain CREATE TABLE",
+		Name: "table ddl statements in stored procedures",
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:          "create procedure p() create table t (pk int);",
-				ExpectedErrStr: "CREATE statements in CREATE PROCEDURE not yet supported",
+				Query: "create procedure create_proc() create table t (i int primary key, j int);",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call create_proc()",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				Query: "show create table t;",
+				Expected: []sql.Row{
+					{"t", "CREATE TABLE `t` (\n" +
+						"  `i` int NOT NULL,\n" +
+						"  `j` int,\n" +
+						"  PRIMARY KEY (`i`)\n" +
+						") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
+				},
+			},
+			{
+				Query:          "call create_proc()",
+				ExpectedErrStr: "table with name t already exists",
 			},
+
 			{
-				Query:          "create procedure p() begin create table t (pk int); end;",
-				ExpectedErrStr: "CREATE statements in CREATE PROCEDURE not yet supported",
+				Query: "create procedure insert_proc() insert into t values (1, 1), (2, 2), (3, 3);",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call insert_proc()",
+				Expected: []sql.Row{
+					{types.NewOkResult(3)},
+				},
+			},
+			{
+				Query: "select * from t",
+				Expected: []sql.Row{
+					{1, 1},
+					{2, 2},
+					{3, 3},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call insert_proc()",
+				ExpectedErrStr:                "duplicate primary key given: [1]",
+			},
+
+			{
+				Query: "create procedure update_proc() update t set j = 999 where i > 1;",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call update_proc()",
+				Expected: []sql.Row{
+					{types.OkResult{RowsAffected: 2, Info: plan.UpdateInfo{Matched: 2, Updated: 2}}},
+				},
+			},
+			{
+				Query: "select * from t",
+				Expected: []sql.Row{
+					{1, 1},
+					{2, 999},
+					{3, 999},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call update_proc()",
+				Expected: []sql.Row{
+					{types.OkResult{RowsAffected: 0, Info: plan.UpdateInfo{Matched: 2}}},
+				},
+			},
+
+			{
+				Query: "create procedure drop_proc() drop table t;",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				SkipResultCheckOnServerEngine: true,
+				Query:                         "call drop_proc()",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
+			},
+			{
+				Query:    "show tables like 't'",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:          "call drop_proc()",
+				ExpectedErrStr: "table not found: t",
 			},
 		},
 	},
+
 	{
 		Name: "procedure must not contain CREATE TRIGGER",
 		SetUpScript: []string{
@@ -2875,16 +2980,20 @@ var ProcedureCreateInSubroutineTests = []ScriptTest{
 		},
 	},
 	{
-		Name:        "procedure must not contain CREATE VIEW",
+		Name:        "procedure can CREATE VIEW",
 		SetUpScript: []string{},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:          "create procedure p() create view v as select 1;",
-				ExpectedErrStr: "CREATE statements in CREATE PROCEDURE not yet supported",
+				Query: "create procedure p1() create view v as select 1;",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
 			},
 			{
-				Query:          "create procedure p() begin create view v as select 1; end;",
-				ExpectedErrStr: "CREATE statements in CREATE PROCEDURE not yet supported",
+				Query: "create procedure p() begin create view v as select 1; end;",
+				Expected: []sql.Row{
+					{types.NewOkResult(0)},
+				},
 			},
 		},
 	},

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379
+	github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1
 	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2

go.sum

@@ -58,14 +58,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20250410233614-8d8c7a5b3d6b h1:2wE+qJwJ5SRIzz+dJQT8XbkpK+g8/pFt34AU/iJ5K+Y=
-github.com/dolthub/vitess v0.0.0-20250410233614-8d8c7a5b3d6b/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dolthub/vitess v0.0.0-20250414165810-f0031a6472b7 h1:4Y043kZgAH1WhOER0nk+02KPKxJX8Ir6yK7cGzY04c4=
-github.com/dolthub/vitess v0.0.0-20250414165810-f0031a6472b7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dolthub/vitess v0.0.0-20250417230335-b8d80bc39341 h1:qebIGlJEgi/mSXVZ39P77cklPuuIl8gApyTVMnKm79s=
-github.com/dolthub/vitess v0.0.0-20250417230335-b8d80bc39341/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379 h1:3nPFx23Ol0djIPf9rDw/y38yEn1BXqTXOUkYrWfxrEI=
-github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 h1:ZXssuc0ZNqKUD7xQCd0/xLT+nKrmAetNYb5v7xgU0U0=
+github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=

sql/analyzer/analyzer.go

@@ -294,7 +294,7 @@ type Analyzer struct {
 	// ExecBuilder converts a sql.Node tree into an executable iterator.
 	ExecBuilder sql.NodeExecBuilder
 	// Runner represents the engine, which is represented as a separate interface to work around circular dependencies
-	Runner StatementRunner
+	Runner sql.StatementRunner
 	// Parser is the parser used to parse SQL statements.
 	Parser sql.Parser
 	// SchemaFormatter is used to format the schema of a node to a string.