From a641308fea6221bf02d4fe2de4bff9f6852d04fe Mon Sep 17 00:00:00 2001
From: Angela Xie <angela@dolthub.com>
Date: Tue, 27 May 2025 15:45:37 -0700
Subject: [PATCH] added undeclared variable error message

---
 enginetest/queries/queries.go | 4 ++++
 sql/errors.go                 | 3 +++
 sql/planbuilder/dml.go        | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/enginetest/queries/queries.go b/enginetest/queries/queries.go
index d754fdef67..9e350bbeee 100644
--- a/enginetest/queries/queries.go
+++ b/enginetest/queries/queries.go
@@ -11323,6 +11323,10 @@ var ErrorQueries = []QueryErrorTest{
 		Query:       `SELECT * FROM (values row(1,2), row(1,2,3)) t`,
 		ExpectedErr: sql.ErrColValCountMismatch,
 	},
+	{
+		Query:       "SELECT 1 INTO mytable;",
+		ExpectedErr: sql.ErrUndeclaredVariable,
+	},
 }
 
 var BrokenErrorQueries = []QueryErrorTest{
diff --git a/sql/errors.go b/sql/errors.go
index c9ba3702b1..ffe33278c5 100644
--- a/sql/errors.go
+++ b/sql/errors.go
@@ -238,6 +238,9 @@ var (
 	// ErrEventDoesNotExist is returned when an event does not exist.
 	ErrEventDoesNotExist = errors.NewKind("Event '%s' does not exist")
 
+	// ErrUndceclaredVariable is return when a variable is undeclared.
+	ErrUndeclaredVariable = errors.NewKind("Undeclared variable: %s")
+
 	// ErrUnknownEvent is returned when a query references an event that doesn't exist
 	ErrUnknownEvent = errors.NewKind("Unknown event '%s'")
 
diff --git a/sql/planbuilder/dml.go b/sql/planbuilder/dml.go
index ab15d271de..60b4ef9090 100644
--- a/sql/planbuilder/dml.go
+++ b/sql/planbuilder/dml.go
@@ -752,7 +752,7 @@ func (b *Builder) buildInto(inScope *scope, into *ast.Into) {
 			vars[i] = expression.NewUserVar(strings.TrimPrefix(val.String(), "@"))
 		} else {
 			if inScope.proc == nil {
-				err := sql.ErrExternalProcedureMissingContextParam.New(val.String())
+				err := sql.ErrUndeclaredVariable.New(val.String())
 				b.handleErr(err)
 			}
 			col, ok := inScope.proc.GetVar(val.String())