From 6de9f900bad6c6b36558cb2a774239460baf1bb7 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 19 Dec 2019 11:19:45 -0800 Subject: [PATCH] internal/dinosql: Return parser errors first --- internal/cmd/cmd.go | 2 +- internal/dinosql/parser.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 8fafb070ec..3c7ffcece3 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -161,7 +161,7 @@ var genCmd = &cobra.Command{ fmt.Fprintf(os.Stderr, "%s:%d:%d: %s\n", fileErr.Filename, fileErr.Line, fileErr.Column, fileErr.Err) } } else { - fmt.Fprintf(os.Stderr, "error parsing schema: %s\n", err) + fmt.Fprintf(os.Stderr, "error parsing queries: %s\n", err) } errored = true continue diff --git a/internal/dinosql/parser.go b/internal/dinosql/parser.go index 23de899a5a..6201ff6cb4 100644 --- a/internal/dinosql/parser.go +++ b/internal/dinosql/parser.go @@ -236,12 +236,12 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings } } } - if len(q) == 0 { - return nil, fmt.Errorf("path %s contains no queries", pkg.Queries) - } if len(merr.Errs) > 0 { return nil, merr } + if len(q) == 0 { + return nil, fmt.Errorf("path %s contains no queries", pkg.Queries) + } return &Result{Catalog: c, Queries: q, Settings: settings}, nil }