compiler: Wire up the experimental parsers

The new experimental engines are disabled by default.

Author: kyleconroy

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         go-version: '1.13'
 
     - name: Test sqlc
-      run: go test --tags=examples -v ./...
+      run: go test --tags=examples,exp -v ./...
       env:
         PG_USER: postgres
         PG_HOST: localhost

internal/cmd/generate.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/kyleconroy/sqlc/internal/compiler"
 	"github.com/kyleconroy/sqlc/internal/config"
 	"github.com/kyleconroy/sqlc/internal/dinosql"
 	"github.com/kyleconroy/sqlc/internal/dinosql/kotlin"
@@ -207,6 +208,16 @@ func parse(name, dir string, sql config.SQL, combo config.CombinedSettings, pars
 			return nil, true
 		}
 		return &kotlin.Result{Result: q}, false
+
+	case config.EngineXLemon, config.EngineXDolphin, config.EngineXElephant:
+		r, err := compiler.Run(sql, combo)
+		if err != nil {
+			fmt.Fprintf(stderr, "# package %s\n", name)
+			fmt.Fprintf(stderr, "error: %s\n", err)
+			return nil, true
+		}
+		return r, false
+
 	default:
 		panic("invalid engine")
 	}

internal/compiler/compile.go

@@ -0,0 +1,77 @@
+// +build exp
+
+package compiler
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strings"
+
+	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/dinosql"
+	"github.com/kyleconroy/sqlc/internal/dolphin"
+	"github.com/kyleconroy/sqlc/internal/pg"
+	"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/sqlite"
+)
+
+type Parser interface {
+	Parse(io.Reader) ([]ast.Statement, error)
+}
+
+func Run(conf config.SQL, combo config.CombinedSettings) (*Result, error) {
+	var p Parser
+
+	switch conf.Engine {
+	case config.EngineXLemon:
+		p = sqlite.NewParser()
+	case config.EngineXDolphin:
+		p = dolphin.NewParser()
+	case config.EngineXElephant:
+		p = postgresql.NewParser()
+	default:
+		return nil, fmt.Errorf("unknown engine: %s", conf.Engine)
+	}
+
+	rd, err := os.Open(conf.Schema)
+	if err != nil {
+		return nil, err
+	}
+
+	stmts, err := p.Parse(rd)
+	if err != nil {
+		return nil, err
+	}
+
+	c, err := catalog.Build(stmts)
+	if err != nil {
+		return nil, err
+	}
+
+	var structs []dinosql.GoStruct
+	for _, schema := range c.Schemas {
+		for _, table := range schema.Tables {
+			s := dinosql.GoStruct{
+				Table: pg.FQN{Schema: table.Rel.Schema, Rel: table.Rel.Name},
+				Name:  strings.Title(table.Rel.Name),
+			}
+			for _, col := range table.Columns {
+				s.Fields = append(s.Fields, dinosql.GoField{
+					Name: strings.Title(col.Name),
+					Type: "string",
+					Tags: map[string]string{"json:": col.Name},
+				})
+			}
+			structs = append(structs, s)
+		}
+	}
+	if len(structs) > 0 {
+		sort.Slice(structs, func(i, j int) bool { return structs[i].Name < structs[j].Name })
+	}
+
+	return &Result{structs: structs}, nil
+}

internal/compiler/noop.go

@@ -0,0 +1,13 @@
+// +build !exp
+
+package compiler
+
+import (
+	"fmt"
+
+	"github.com/kyleconroy/sqlc/internal/config"
+)
+
+func Run(conf config.SQL, combo config.CombinedSettings) (*Result, error) {
+	return nil, fmt.Errorf("unimplemented")
+}

internal/compiler/result.go

@@ -0,0 +1,23 @@
+package compiler
+
+import (
+	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/dinosql"
+)
+
+type Result struct {
+	structs []dinosql.GoStruct
+	queries []dinosql.GoQuery
+}
+
+func (r *Result) Structs(settings config.CombinedSettings) []dinosql.GoStruct {
+	return r.structs
+}
+
+func (r *Result) GoQueries(settings config.CombinedSettings) []dinosql.GoQuery {
+	return r.queries
+}
+
+func (r *Result) Enums(settings config.CombinedSettings) []dinosql.GoEnum {
+	return nil
+}

internal/config/config.go

@@ -38,6 +38,11 @@ type Engine string
 const (
 	EngineMySQL      Engine = "mysql"
 	EnginePostgreSQL Engine = "postgresql"
+
+	// Experimental engines
+	EngineXLemon    Engine = "_lemon"
+	EngineXDolphin  Engine = "_dolphin"
+	EngineXElephant Engine = "_elephant"
 )
 
 type Config struct {
@@ -47,7 +52,7 @@ type Config struct {
 }
 
 type Gen struct {
-	Go *GenGo `json:"go,omitempty" yaml:"go"`
+	Go     *GenGo     `json:"go,omitempty" yaml:"go"`
 	Kotlin *GenKotlin `json:"kotlin,omitempty" yaml:"kotlin"`
 }
 
@@ -68,7 +73,7 @@ type SQL struct {
 }
 
 type SQLGen struct {
-	Go *SQLGo `json:"go,omitempty" yaml:"go"`
+	Go     *SQLGo     `json:"go,omitempty" yaml:"go"`
 	Kotlin *SQLKotlin `json:"kotlin,omitempty" yaml:"kotlin"`
 }
 

internal/endtoend/regenerate.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 set -x
-for dir in testdata/*; do (cd "$dir" && sqlc generate); done
+for dir in testdata/*; do (cd "$dir" && sqlc-dev generate); done

internal/endtoend/testdata/experimental_dolphin/go/db.go

@@ -0,0 +1,8 @@
+CREATE TABLE foo (
+        bar text NOT NULL 
+);
+
+SELECT bar FROM foo;
+
+-- DROP TABLE foo;
+-- DROP TABLE IF EXISTS bar;