Add comment style to parser

Author: kyleconroy

internal/cmd/generate.go

@@ -209,7 +209,7 @@ func (d *dinosqlEngine) Result() golang.Generateable {
 }
 
 func parse(e Env, name, dir string, sql config.SQL, combo config.CombinedSettings, parserOpts dinosql.ParserOpts, stderr io.Writer) (golang.Generateable, bool) {
-	if sql.Engine == config.EngineMySQL && !e.ExperimentalParser {
+	if sql.Engine == config.EngineMySQL {
 		// Experimental MySQL support
 		q, err := mysql.GeneratePkg(name, sql.Schema, sql.Queries, combo)
 		if err != nil {

internal/compiler/compile.go

@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/kyleconroy/sqlc/internal/metadata"
 	"github.com/kyleconroy/sqlc/internal/migrations"
 	"github.com/kyleconroy/sqlc/internal/multierr"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
@@ -19,6 +20,7 @@ import (
 
 type Parser interface {
 	Parse(io.Reader) ([]ast.Statement, error)
+	CommentSyntax() metadata.CommentSyntax
 }
 
 // copied over from gen.go

internal/compiler/engine.go

@@ -28,7 +28,7 @@ func NewEngine(conf config.SQL, combo config.CombinedSettings) *Engine {
 	case config.EngineXLemon:
 		e.parser = sqlite.NewParser()
 		e.catalog = catalog.New("main")
-	case config.EngineMySQL:
+	case config.EngineMySQL, config.EngineXDolphin:
 		e.parser = dolphin.NewParser()
 		e.catalog = catalog.New("public") // TODO: What is the default database for MySQL?
 	case config.EnginePostgreSQL:

internal/compiler/parse.go

@@ -52,7 +52,7 @@ func parseQuery(p Parser, c *catalog.Catalog, stmt ast.Node, src string, rewrite
 	if err := validate.FuncCall(c, raw); err != nil {
 		return nil, err
 	}
-	name, cmd, err := metadata.Parse(strings.TrimSpace(rawSQL), metadata.CommentSyntaxDash)
+	name, cmd, err := metadata.Parse(strings.TrimSpace(rawSQL), p.CommentSyntax())
 	if err != nil {
 		return nil, err
 	}

internal/config/config.go

@@ -74,7 +74,8 @@ const (
 	EnginePostgreSQL Engine = "postgresql"
 
 	// Experimental engines
-	EngineXLemon Engine = "_lemon"
+	EngineXLemon   Engine = "_lemon"
+	EngineXDolphin Engine = "_dolphin"
 )
 
 type Config struct {

internal/dolphin/parse.go

@@ -5,9 +5,11 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/pingcap/parser"
 	_ "github.com/pingcap/tidb/types/parser_driver"
 
+	"github.com/kyleconroy/sqlc/internal/metadata"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
 )
 
@@ -26,6 +28,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	}
 	stmtNodes, _, err := p.pingcap.Parse(string(blob), "", "")
 	if err != nil {
+		spew.Dump(err)
 		return nil, err
 	}
 	var stmts []ast.Statement
@@ -49,3 +52,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	}
 	return stmts, nil
 }
+
+func (p *Parser) CommentSyntax() metadata.CommentSyntax {
+	return metadata.CommentSyntaxStar
+}

internal/endtoend/testdata/dolphin_errors/query/from.sql

@@ -0,0 +1,2 @@
+/* name: TooManyFroms :one */
+select id, first_name from users from where id = ?;

internal/endtoend/testdata/dolphin_errors/query/funcs.sql

@@ -0,0 +1,8 @@
+/* name: WrongFunc :one */
+select id, first_name from users where id = SQLC_ARGH(target_id);
+
+/* name: InvalidName :one */
+select id, first_name from users where id = SQLC_ARG(SQLC_ARG(target_id));
+
+/* name: InvalidVaue :one */
+select id, first_name from users where id = SQLC_ARG(?);

internal/endtoend/testdata/dolphin_errors/query/select.sql

@@ -0,0 +1,2 @@
+/* name: ExtraSelect :one */
+select id from users where select id;

internal/endtoend/testdata/dolphin_errors/query/typo.sql

@@ -0,0 +1,4 @@
+/* name: MisspelledSelect :one */
+selectt id, first_name from users;
+
+

internal/endtoend/testdata/dolphin_errors/schema.sql

@@ -0,0 +1,15 @@
+CREATE TABLE users (
+    id integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    first_name varchar(255) NOT NULL,
+    last_name varchar(255),
+    age integer NOT NULL,
+    job_status ENUM('APPLIED', 'PENDING', 'ACCEPTED', 'REJECTED') NOT NULL
+) ENGINE=InnoDB;
+
+CREATE TABLE orders (
+    id integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    price DECIMAL(13, 4) NOT NULL,
+    user_id integer NOT NULL
+) ENGINE=InnoDB;
+
+

internal/endtoend/testdata/dolphin_errors/sqlc.json

@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "name": "querytest",
+      "path": "go",
+      "schema": "schema.sql",
+      "queries": "query",
+      "engine": "_dolphin"
+    }
+  ]
+}

internal/postgresql/parse.go

@@ -7,10 +7,11 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-
 	pg "github.com/lfittl/pg_query_go"
 	nodes "github.com/lfittl/pg_query_go/nodes"
+
+	"github.com/kyleconroy/sqlc/internal/metadata"
+	"github.com/kyleconroy/sqlc/internal/sql/ast"
 )
 
 func stringSlice(list nodes.List) []string {
@@ -202,6 +203,10 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	return stmts, nil
 }
 
+func (p *Parser) CommentSyntax() metadata.CommentSyntax {
+	return metadata.CommentSyntaxDash
+}
+
 func translate(node nodes.Node) (ast.Node, error) {
 	switch n := node.(type) {
 

internal/sqlite/parse.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 
+	"github.com/kyleconroy/sqlc/internal/metadata"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
 	"github.com/kyleconroy/sqlc/internal/sqlite/parser"
 )
@@ -81,3 +82,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	}
 	return stmts, nil
 }
+
+func (p *Parser) CommentSyntax() metadata.CommentSyntax {
+	return metadata.CommentSyntaxDash
+}