From a29161e04bc829e9957f5756ed08112078b0799d Mon Sep 17 00:00:00 2001 From: Chris Lee Date: Fri, 4 Nov 2022 10:21:56 -0700 Subject: [PATCH] codegen: surface batch validation errors --- internal/sql/validate/cmd.go | 5 ++++- internal/sql/validate/param_ref.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/sql/validate/cmd.go b/internal/sql/validate/cmd.go index 0dcc176383..b890ced565 100644 --- a/internal/sql/validate/cmd.go +++ b/internal/sql/validate/cmd.go @@ -45,7 +45,10 @@ func validateCopyfrom(n ast.Node) error { } func validateBatch(n ast.Node) error { - nums, _, _ := ParamRef(n) + nums, _, err := ParamRef(n) + if err != nil { + return err + } if len(nums) == 0 { return errors.New(":batch* commands require parameters") } diff --git a/internal/sql/validate/param_ref.go b/internal/sql/validate/param_ref.go index 170a158527..b94a983863 100644 --- a/internal/sql/validate/param_ref.go +++ b/internal/sql/validate/param_ref.go @@ -27,7 +27,7 @@ func ParamRef(n ast.Node) (map[int]bool, bool, error) { } }), n) if dollar && nodollar { - return nil, false, errors.New("Can not mix $1 format with ? format") + return nil, false, errors.New("can not mix $1 format with ? format") } seen := map[int]bool{}