MySQL support (#1)

* initial commit of sql schema validation

* adds barebones support for most basic use-case

* improves parsing and generation of params

* adds decent tests for mysql

* improves param implementation
- adds tests
- adds support for named params
- adds support for Limit expressions

* adds support for decimal types

* resolves some testing issues

* generalizes imports

* adds null type tests

* improves go struct generation

* adds command line call to mysql generate

* improves support for insert queries and adds tests

* improves support for enum types

* refactors config to function param

* patchs pkg settings arguments

* simplifies and improves param parsing

* param implementation and test patches

* patch placeholder default table

* properly handles "select * " expressions

* initial commit of sql schema validation

* adds barebones support for most basic use-case

* improves parsing and generation of params

* adds decent tests for mysql

* improves param implementation
- adds tests
- adds support for named params
- adds support for Limit expressions

* adds support for decimal types

* resolves some testing issues

* generalizes imports

* adds null type tests

* improves go struct generation

* adds command line call to mysql generate

* improves support for insert queries and adds tests

* improves support for enum types

* refactors config to function param

* patchs pkg settings arguments

* simplifies and improves param parsing

* param implementation and test patches

* patch placeholder default table

* properly handles "select * " expressions

Author: cmoog

go.mod

@@ -8,4 +8,10 @@ require (
 	github.com/jinzhu/inflection v1.0.0
 	github.com/lfittl/pg_query_go v1.0.0
 	github.com/spf13/cobra v0.0.5
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
+	golang.org/x/sys v0.0.0-20191220220014-0732a990476f // indirect
+	google.golang.org/genproto v0.0.0-20191223191004-3caeed10a8bf // indirect
+	google.golang.org/grpc v1.26.0 // indirect
+	vitess.io/vitess v0.0.0-20191113025808-0629f0da20ab
 )

go.sum

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 
 	"github.com/kyleconroy/sqlc/internal/dinosql"
+	"github.com/kyleconroy/sqlc/internal/mysql"
 
 	"github.com/davecgh/go-spew/spew"
 	pg "github.com/lfittl/pg_query_go"
@@ -21,6 +22,7 @@ import (
 func Do(args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) int {
 	rootCmd := &cobra.Command{Use: "sqlc", SilenceUsage: true}
 	rootCmd.AddCommand(checkCmd)
+	rootCmd.AddCommand(unstable__mysql)
 	rootCmd.AddCommand(genCmd)
 	rootCmd.AddCommand(initCmd)
 	rootCmd.AddCommand(parseCmd)
@@ -108,7 +110,7 @@ var genCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		settings, err := dinosql.ParseConfig(bytes.NewReader(blob))
+		settings, err := dinosql.ParseConfigFile(bytes.NewReader(blob))
 		if err != nil {
 			switch err {
 			case dinosql.ErrMissingVersion:
@@ -153,7 +155,7 @@ var genCmd = &cobra.Command{
 				continue
 			}
 
-			q, err := dinosql.ParseQueries(c, settings, pkg)
+			q, err := dinosql.ParseQueries(c, pkg)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "# package %s\n", name)
 				if parserErr, ok := err.(*dinosql.ParserErr); ok {
@@ -167,7 +169,7 @@ var genCmd = &cobra.Command{
 				continue
 			}
 
-			files, err := dinosql.Generate(q, settings, pkg)
+			files, err := dinosql.Generate(q, settings)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "# package %s\n", name)
 				fmt.Fprintf(os.Stderr, "error generating code: %s\n", err)
@@ -214,10 +216,41 @@ var checkCmd = &cobra.Command{
 			if err != nil {
 				return err
 			}
-			if _, err := dinosql.ParseQueries(c, settings, pkg); err != nil {
+			if _, err := dinosql.ParseQueries(c, pkg); err != nil {
 				return err
 			}
 		}
 		return nil
 	},
 }
+
+var unstable__mysql = &cobra.Command{
+	Use:   "unstable__mysql generate",
+	Short: "Generate MySQL Queries into typesafe Go code",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		blob, err := ioutil.ReadFile("sqlc.json")
+		if err != nil {
+			return err
+		}
+
+		var settings dinosql.GenerateSettings
+		if err := json.Unmarshal(blob, &settings); err != nil {
+			return err
+		}
+
+		for _, pkg := range settings.Packages {
+			res, err := mysql.GeneratePkg(pkg.Name, pkg.Queries, settings)
+			if err != nil {
+				return err
+			}
+			for filename, source := range res {
+				os.MkdirAll(filepath.Dir(filename), 0755)
+				if err := ioutil.WriteFile(filename, []byte(source), 0644); err != nil {
+					fmt.Fprintf(os.Stderr, "%s: %s\n", filename, err)
+					os.Exit(1)
+				}
+			}
+		}
+		return nil
+	},
+}

internal/cmd/cmd.go

@@ -12,7 +12,6 @@ import (
 func TestFuncs(t *testing.T) {
 	_, err := ParseQueries(
 		pg.NewCatalog(),
-		GenerateSettings{},
 		PackageSettings{
 			Queries: filepath.Join("testdata", "funcs"),
 		},

internal/dinosql/checks_test.go

@@ -1,20 +1,78 @@
 package dinosql
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/kyleconroy/sqlc/internal/pg"
 )
 
+const errMessageNoVersion = `The configuration file must have a version number.
+Set the version to 1 at the top of sqlc.json:
+
+{
+  "version": "1"
+  ...
+}
+`
+
+const errMessageUnknownVersion = `The configuration file has an invalid version number.
+The only supported version is "1".
+`
+
+const errMessageNoPackages = `No packages are configured`
+
+// InitConfig initializes the global config objcet
+func InitConfig() (*GenerateSettings, error) {
+	fmt.Println("Config init func ran")
+	blob, err := ioutil.ReadFile("sqlc.json")
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "error parsing sqlc.json: file does not exist")
+		os.Exit(1)
+	}
+
+	settings, err := ParseConfigFile(bytes.NewReader(blob))
+	if err != nil {
+		switch err {
+		case ErrMissingVersion:
+			fmt.Fprintf(os.Stderr, errMessageNoVersion)
+		case ErrUnknownVersion:
+			fmt.Fprintf(os.Stderr, errMessageUnknownVersion)
+		case ErrNoPackages:
+			fmt.Fprintf(os.Stderr, errMessageNoPackages)
+		}
+		fmt.Fprintf(os.Stderr, "error parsing sqlc.json: %s\n", err)
+		os.Exit(1)
+	}
+
+	for i, pkg := range settings.Packages {
+		name := pkg.Name
+
+		if pkg.Path == "" {
+			fmt.Fprintf(os.Stderr, "package[%d]: path must be set\n", i)
+			continue
+		}
+
+		if name == "" {
+			name = filepath.Base(pkg.Path)
+		}
+	}
+	return &settings, nil
+}
+
 type GenerateSettings struct {
-	Version   string            `json:"version"`
-	Packages  []PackageSettings `json:"packages"`
-	Overrides []Override        `json:"overrides,omitempty"`
-	Rename    map[string]string `json:"rename,omitempty"`
+	Version    string            `json:"version"`
+	Packages   []PackageSettings `json:"packages"`
+	Overrides  []Override        `json:"overrides,omitempty"`
+	Rename     map[string]string `json:"rename,omitempty"`
+	PackageMap map[string]PackageSettings
 }
 
 type PackageSettings struct {
@@ -97,7 +155,7 @@ var ErrMissingVersion = errors.New("no version number")
 var ErrUnknownVersion = errors.New("invalid version number")
 var ErrNoPackages = errors.New("no packages")
 
-func ParseConfig(rd io.Reader) (GenerateSettings, error) {
+func ParseConfigFile(rd io.Reader) (GenerateSettings, error) {
 	dec := json.NewDecoder(rd)
 	dec.DisallowUnknownFields()
 	var config GenerateSettings
@@ -125,5 +183,21 @@ func ParseConfig(rd io.Reader) (GenerateSettings, error) {
 			}
 		}
 	}
-	return config, nil
+	err := config.PopulatePkgMap()
+
+	return config, err
+}
+
+func (s *GenerateSettings) PopulatePkgMap() error {
+	packageMap := make(map[string]PackageSettings)
+
+	for _, c := range s.Packages {
+		if c.Name == "" {
+			return errors.New("Package name must be specified in sqlc.json")
+		}
+		packageMap[c.Name] = c
+	}
+	s.PackageMap = packageMap
+
+	return nil
 }

internal/dinosql/config.go

@@ -51,7 +51,7 @@ func TestBadConfigs(t *testing.T) {
 	} {
 		tt := test
 		t.Run(tt.name, func(t *testing.T) {
-			_, err := ParseConfig(strings.NewReader(tt.json))
+			_, err := ParseConfigFile(strings.NewReader(tt.json))
 			if err == nil {
 				t.Fatalf("expected err; got nil")
 			}