The experimental parser passes all tests (#515)

* test: Add first passing test for new parser

* Most tests pass

* Fix walk panic

* Fix TestReplay/invalid_params/experimental

* Fix two more tests

* one more failing test

* Fix the last failing test

Author: kyleconroy

.github/workflows/ci.yml

@@ -32,6 +32,7 @@ jobs:
     - name: Test sqlc
       run: go test --tags=examples -v ./...
       env:
+        SQLC_EXPERIMENTAL_PARSER: on
         PG_USER: postgres
         PG_HOST: localhost
         PG_DATABASE: postgres

Makefile

@@ -4,9 +4,6 @@ build:
 test:
 	go test ./...
 
-exp:
-	SQLC_EXPERIMENTAL_PARSER=on go test ./...
-
 sqlc-dev:
 	go build -o ~/bin/sqlc-dev ./cmd/sqlc/
 

internal/compiler/compat.go

@@ -14,7 +14,11 @@ func sameTableName(n *ast.TableName, f core.FQN) bool {
 	if n == nil {
 		return false
 	}
-	return n.Catalog == n.Catalog && n.Schema == f.Schema && n.Name == f.Rel
+	schema := n.Schema
+	if n.Schema == "" {
+		schema = "public"
+	}
+	return n.Catalog == n.Catalog && schema == f.Schema && n.Name == f.Rel
 }
 
 // This is mainly copy-pasted from internal/postgresql/parse.go

internal/compiler/compile.go

@@ -1,6 +1,7 @@
 package compiler
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -18,6 +19,7 @@ import (
 	"github.com/kyleconroy/sqlc/internal/postgresql"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
 	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
 	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
 	"github.com/kyleconroy/sqlc/internal/sqlite"
 )
@@ -111,12 +113,17 @@ func parseQueries(p Parser, c *catalog.Catalog, queries []string) (*Result, erro
 				continue
 			}
 			if err != nil {
-				merr.Add(filename, src, stmt.Raw.Pos(), err)
+				var e *sqlerr.Error
+				loc := stmt.Raw.Pos()
+				if errors.As(err, &e) && e.Location != 0 {
+					loc = e.Location
+				}
+				merr.Add(filename, src, loc, err)
 				continue
 			}
 			if query.Name != "" {
 				if _, exists := set[query.Name]; exists {
-					merr.Add(filename, src, 0, fmt.Errorf("duplicate query name: %s", query.Name))
+					merr.Add(filename, src, stmt.Raw.Pos(), fmt.Errorf("duplicate query name: %s", query.Name))
 					continue
 				}
 				set[query.Name] = struct{}{}

internal/compiler/find_params.go

@@ -69,8 +69,12 @@ func (p paramSearch) Visit(node ast.Node) astutils.Visitor {
 				*p.refs = append(*p.refs, paramRef{parent: n.Cols.Items[i], ref: ref, rv: n.Relation})
 				p.seen[ref.Location] = struct{}{}
 			}
-			for _, vl := range s.ValuesLists {
-				for i, v := range vl {
+			for _, item := range s.ValuesLists.Items {
+				vl, ok := item.(*ast.List)
+				if !ok {
+					continue
+				}
+				for i, v := range vl.Items {
 					ref, ok := v.(*pg.ParamRef)
 					if !ok {
 						continue

internal/compiler/output_columns.go

@@ -161,8 +161,8 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) {
 				name = *res.Name
 			}
 			switch n.SubLinkType {
-			// TODO: case nodes.EXISTS_SUBLINK:
-			// 	cols = append(cols, core.Column{Name: name, DataType: "bool", NotNull: true})
+			case pg.EXISTS_SUBLINK:
+				cols = append(cols, &Column{Name: name, DataType: "bool", NotNull: true})
 			default:
 				cols = append(cols, &Column{Name: name, DataType: "any", NotNull: false})
 			}

internal/compiler/parse.go

@@ -6,8 +6,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/davecgh/go-spew/spew"
-
 	"github.com/kyleconroy/sqlc/internal/metadata"
 	"github.com/kyleconroy/sqlc/internal/source"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
@@ -77,7 +75,6 @@ func parseQuery(p Parser, c *catalog.Catalog, stmt ast.Node, src string, rewrite
 	}
 	params, err := resolveCatalogRefs(c, rvs, refs, namedParams)
 	if err != nil {
-		spew.Dump(raw)
 		return nil, err
 	}
 

internal/compiler/query_catalog.go

@@ -31,10 +31,12 @@ func buildQueryCatalog(c *catalog.Catalog, node ast.Node) (*QueryCatalog, error)
 				if err != nil {
 					return nil, err
 				}
+				rel := &ast.TableName{Name: *cte.Ctename}
+				for i := range cols {
+					cols[i].Table = rel
+				}
 				qc.ctes[*cte.Ctename] = &Table{
-					Rel: &ast.TableName{
-						Name: *cte.Ctename,
-					},
+					Rel:     rel,
 					Columns: cols,
 				}
 			}

internal/endtoend/endtoend_test.go

@@ -47,17 +47,10 @@ func TestExamples(t *testing.T) {
 
 func TestReplay(t *testing.T) {
 	t.Parallel()
-
-	experimental := map[string]bool{
-		"ondeck": true,
-	}
-	env := cmd.ParseEnv()
-
 	files, err := ioutil.ReadDir("testdata")
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	for _, replay := range files {
 		if !replay.IsDir() {
 			continue
@@ -76,15 +69,19 @@ func TestReplay(t *testing.T) {
 			if diff := cmp.Diff(expected, stderr.String()); diff != "" {
 				t.Errorf("stderr differed (-want +got):\n%s", diff)
 			}
-			if env.ExperimentalParser && experimental[tc] {
-				output, err := cmd.Generate(env, path, &stderr)
-				if len(expected) == 0 && err != nil {
-					t.Fatalf("EXPERIMENTAL sqlc generate failed: %s", stderr.String())
-				}
-				cmpDirectory(t, path, output)
-				if diff := cmp.Diff(expected, stderr.String()); diff != "" {
-					t.Errorf("EXPERIMENTAL stderr differed (-want +got):\n%s", diff)
-				}
+		})
+		t.Run(tc+"/experimental", func(t *testing.T) {
+			t.Parallel()
+			path, _ := filepath.Abs(filepath.Join("testdata", tc))
+			var stderr bytes.Buffer
+			expected := expectedStderr(t, path)
+			output, err := cmd.Generate(cmd.Env{ExperimentalParser: true}, path, &stderr)
+			if len(expected) == 0 && err != nil {
+				t.Fatalf("sqlc generate failed: %s", stderr.String())
+			}
+			cmpDirectory(t, path, output)
+			if diff := cmp.Diff(expected, stderr.String()); diff != "" {
+				t.Errorf("stderr differed (-want +got):\n%s", diff)
 			}
 		})
 	}