Skip to content

Commit f382747

Browse files
authored
Merge pull request #2993 from dolthub/angela/undeclared_variable_error
Added undeclared variable error message
2 parents 65f2e3b + a641308 commit f382747

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

enginetest/queries/queries.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11323,6 +11323,10 @@ var ErrorQueries = []QueryErrorTest{
1132311323
Query: `SELECT * FROM (values row(1,2), row(1,2,3)) t`,
1132411324
ExpectedErr: sql.ErrColValCountMismatch,
1132511325
},
11326+
{
11327+
Query: "SELECT 1 INTO mytable;",
11328+
ExpectedErr: sql.ErrUndeclaredVariable,
11329+
},
1132611330
}
1132711331

1132811332
var BrokenErrorQueries = []QueryErrorTest{

sql/errors.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ var (
238238
// ErrEventDoesNotExist is returned when an event does not exist.
239239
ErrEventDoesNotExist = errors.NewKind("Event '%s' does not exist")
240240

241+
// ErrUndceclaredVariable is return when a variable is undeclared.
242+
ErrUndeclaredVariable = errors.NewKind("Undeclared variable: %s")
243+
241244
// ErrUnknownEvent is returned when a query references an event that doesn't exist
242245
ErrUnknownEvent = errors.NewKind("Unknown event '%s'")
243246

sql/planbuilder/dml.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ func (b *Builder) buildInto(inScope *scope, into *ast.Into) {
752752
vars[i] = expression.NewUserVar(strings.TrimPrefix(val.String(), "@"))
753753
} else {
754754
if inScope.proc == nil {
755-
err := sql.ErrExternalProcedureMissingContextParam.New(val.String())
755+
err := sql.ErrUndeclaredVariable.New(val.String())
756756
b.handleErr(err)
757757
}
758758
col, ok := inScope.proc.GetVar(val.String())

0 commit comments

Comments
 (0)