Merge pull request #24 from yoyo-project/task/sqlite

Early sqlite support

README.md

@@ -1,3 +1,4 @@
+
 # yoyo
 
 [![MIT license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
@@ -9,6 +10,12 @@
 A Migration Generator and Database Access Layer Generator for Go projects. Made with ❤️ to hopefully make your life a
 little bit easier. 
 
+Your Database access layer generated by `yoyo`...
+
+- provides a native, fluent query generator
+- is totally pure Go
+- is totally reflection-free 
+
 ## A Note on Using Databases in Code
 
 Okay, accessing databases in code is annoying. Relational data is annoying. It doesn't matter which language you're using.

cmd/yoyo/generate/migration.go

@@ -9,24 +9,33 @@ import (
 	"time"
 
 	"github.com/dotvezz/lime"
+
 	"github.com/yoyo-project/yoyo/internal/migration"
+	"github.com/yoyo-project/yoyo/internal/schema"
 	"github.com/yoyo-project/yoyo/internal/yoyo"
 )
 
 type FileOpener func(string) (*os.File, error)
+type DatabaseValidator func(database schema.Database) error
 
 func Migrations(
 	now func() time.Time,
 	loadGenerator migration.GeneratorLoader,
 	create FileOpener,
+	validate DatabaseValidator,
 ) lime.Func {
 	return func(args []string, w io.Writer) error {
 		config, err := yoyo.LoadConfig()
 		if err != nil {
 			return fmt.Errorf("unable to load config: %w", err)
 		}
 
-		generate, err := loadGenerator(config)
+		if err := validate(config.Schema); err != nil {
+			return err
+		}
+
+		var generate migration.Generator
+		generate, err = loadGenerator(config)
 		if err != nil {
 			return fmt.Errorf("unable to initialize migration generator: %w", err)
 		}

cmd/yoyo/main.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/yoyo-project/yoyo/internal/validation"
+
 	"github.com/yoyo-project/yoyo/internal/file"
 
 	"github.com/dotvezz/lime"
@@ -25,7 +27,7 @@ func main() {
 			Commands: []lime.Command{
 				{
 					Keyword: "migration",
-					Func:    generate.Migrations(ucs.GetCurrentTime, ucs.LoadMigrationGenerator, file.CreateWithDirs),
+					Func:    generate.Migrations(ucs.GetCurrentTime, ucs.LoadMigrationGenerator, file.CreateWithDirs, validation.ValidateDatabase),
 				},
 				{
 					Keyword: "repos",

internal/datatype/datatypes.go

@@ -20,7 +20,11 @@ const (
 	SmallInt   = idSmallInt | metaNumeric | metaInteger | metaSignable | metaHasGoUnisgned
 	MediumInt  = idMediumInt | metaNumeric | metaInteger | metaSignable | metaHasGoUnisgned
 	BigInt     = idBigInt | metaNumeric | metaInteger | metaSignable | metaHasGoUnisgned
-	Decimal    = idDecimal | metaNumeric | metaSignable | metaRequiresParams
+	Decimal    = idDecimal | metaNumeric | metaSignable
+	Numeric    = idNumeric | metaNumeric | metaSignable
+	Real       = idReal | metaNumeric | metaSignable
+	Float      = idFloat | metaNumeric | metaSignable
+	Double     = idDouble | metaNumeric | metaSignable
 	Varchar    = idVarchar | metaString
 	Text       = idText | metaString
 	TinyText   = idTinyText | metaString
@@ -46,6 +50,12 @@ const (
 	mediumint  = "MEDIUMINT"
 	bigint     = "BIGINT"
 	decimal    = "DECIMAL"
+	dec        = "DEC"
+	numeric    = "NUMERIC"
+	sreal      = "REAL"
+	float      = "FLOAT"
+	double     = "DOUBLE"
+	doubleP    = "DOUBLE PRECISION"
 	varchar    = "VARCHAR"
 	text       = "TEXT"
 	tinytext   = "TINYTEXT"
@@ -69,7 +79,6 @@ const (
 	goFloat64 = "float64"
 	goString  = "string"
 	goBool    = "bool"
-	goRune    = "rune"
 	goBlob    = "[]byte"
 	goTime    = "time.Time"
 )
@@ -99,6 +108,14 @@ func (dt Datatype) String() (s string) {
 		s = bigint
 	case Decimal:
 		s = decimal
+	case Numeric:
+		s = numeric
+	case Real:
+		s = sreal
+	case Float:
+		s = float
+	case Double:
+		s = double
 	case Varchar:
 		s = varchar
 	case Text:
@@ -147,6 +164,14 @@ func (dt Datatype) GoTypeString() (s string) {
 		s = goInt64
 	case Decimal:
 		s = goFloat64
+	case Numeric:
+		s = goFloat64
+	case Real:
+		s = goFloat64
+	case Float:
+		s = goFloat64
+	case Double:
+		s = goFloat64
 	case Varchar:
 		s = goString
 	case Text:
@@ -158,18 +183,18 @@ func (dt Datatype) GoTypeString() (s string) {
 	case LongText:
 		s = goString
 	case Char:
-		s = goRune
+		s = goString
 	case Blob:
 		s = goBlob
 	case Enum:
 		s = goString
 	case Boolean:
 		s = goBool
 	case DateTime, Timestamp, Date:
+		//TODO: Work out sane better go-type for Time?
 		s = goTime
 	case Year:
 		s = goInt16
-	//TODO: Work out sane go-type for Time
 	default:
 		s = "NONE"
 	}
@@ -230,8 +255,16 @@ func FromString(in string) (dt Datatype, err error) {
 		dt = SmallInt
 	case tinyint:
 		dt = TinyInt
-	case decimal:
+	case decimal, dec:
 		dt = Decimal
+	case numeric:
+		dt = Numeric
+	case sreal:
+		dt = Real
+	case float:
+		dt = Float
+	case double, doubleP:
+		dt = Double
 	case varchar:
 		dt = Varchar
 	case text:
@@ -275,8 +308,8 @@ const (
 	metaBinary
 	metaString
 	metaTime
-	metaSignable
-	metaHasGoUnisgned
+	metaSignable      // TODO: Remove because it is synonymous with metaNumeric?
+	metaHasGoUnisgned // TODO: Remove because it is synonymous with metaInteger?
 	metaRequiresParams
 )
 
@@ -290,6 +323,10 @@ const (
 	idMediumInt
 	idBigInt
 	idDecimal
+	idNumeric
+	idReal
+	idFloat
+	idDouble
 	idVarchar
 	idText
 	idTinyText

internal/datatype/datatypes_test.go

@@ -283,7 +283,7 @@ func TestDatatype_IsBinary(t *testing.T) {
 	}
 }
 
-func TestDatatype_RequiresScale(t *testing.T) {
+func TestDatatype_RequiresParams(t *testing.T) {
 	tests := []struct {
 		dt   Datatype
 		want bool
@@ -294,7 +294,7 @@ func TestDatatype_RequiresScale(t *testing.T) {
 		},
 		{
 			dt:   Decimal,
-			want: true,
+			want: false,
 		},
 		{
 			dt:   Text,
@@ -445,7 +445,7 @@ func TestDatatype_GoTypeString(t *testing.T) {
 		},
 		{
 			dt:   Char,
-			want: goRune,
+			want: goString,
 		},
 		{
 			dt:   Blob,

internal/dbms/base/dialect.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"github.com/yoyo-project/yoyo/internal/datatype"
+	"github.com/yoyo-project/yoyo/internal/schema"
 )
 
 // Base is a partial implementation of migration.Dialect. It provides the TypeString method.
@@ -21,3 +22,11 @@ func (d *Base) TypeString(dt datatype.Datatype) (string, error) {
 
 	return s, nil
 }
+
+func (*Base) ValidateTable(t schema.Table) error {
+	return nil
+}
+
+func (*Base) SupportsAutoIncrement() bool {
+	return false
+}

internal/dbms/dialect/strings.go

@@ -5,4 +5,6 @@ const (
 	MySQL = "mysql"
 	// PostgreSQL is for the SQL dialect of the same name
 	PostgreSQL = "postgresql"
+	// SQLite is for the SQL dialect of the same name
+	SQLite = "sqlite"
 )

internal/dbms/mysql/adapter.go

@@ -4,10 +4,19 @@ import (
 	"database/sql"
 
 	"github.com/yoyo-project/yoyo/internal/dbms/base"
+	"github.com/yoyo-project/yoyo/internal/dbms/dialect"
 )
 
 type adapter struct {
 	db *sql.DB
 	base.Base
-	validator
+}
+
+// NewAdapter returns an implementation of migration.Dialect for MySQL
+func NewAdapter() *adapter {
+	return &adapter{
+		Base: base.Base{
+			Dialect: dialect.MySQL,
+		},
+	}
 }

internal/dbms/mysql/adapter_migration.go

@@ -1,26 +1,13 @@
 package mysql
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 
 	"github.com/yoyo-project/yoyo/internal/datatype"
-	"github.com/yoyo-project/yoyo/internal/dbms/base"
-	"github.com/yoyo-project/yoyo/internal/dbms/dialect"
 	"github.com/yoyo-project/yoyo/internal/schema"
 )
 
-// NewAdapter returns an implementation of migration.Dialect for MySQL
-func NewAdapter() *adapter {
-	return &adapter{
-		Base: base.Base{
-			Dialect: dialect.MySQL,
-		},
-		validator: validator{},
-	}
-}
-
 // TypeString returns the string representation of a given datatype.Datatype for MySQL
 // An error will be returned if the datatype.Datatype is invalid or not supported by MySQL
 func (a *adapter) TypeString(dt datatype.Datatype) (s string, err error) {
@@ -30,8 +17,8 @@ func (a *adapter) TypeString(dt datatype.Datatype) (s string, err error) {
 	default:
 		s, err = a.Base.TypeString(dt)
 	}
-	if err == nil && !a.validator.SupportsDatatype(dt) {
-		err = errors.New("unsupported datatype")
+	if err == nil && !a.SupportsDatatype(dt) {
+		err = fmt.Errorf("unsupported datatype")
 	}
 	return s, err
 }
@@ -121,8 +108,8 @@ func (a *adapter) AddReference(tName string, fTable schema.Table, r schema.Refer
 		sw.WriteRune('\n')
 	}
 
-	sw.WriteString(fmt.Sprintf("ALTER TABLE `%s` ADD CONSTRAINT `reference_%s` FOREIGN KEY (`%s`) REFERENCES %s(`%s`)",
-		tName, ftName, strings.Join(lCols, "`, `"), ftName, strings.Join(fCols, "`, `")))
+	sw.WriteString(fmt.Sprintf("ALTER TABLE `%s` ADD CONSTRAINT `reference_%s_%s_%s` FOREIGN KEY (`%s`) REFERENCES %s(`%s`)",
+		tName, tName, ftName, strings.Join(fCols, "_"), strings.Join(lCols, "`, `"), ftName, strings.Join(fCols, "`, `")))
 
 	if r.OnDelete != "" {
 		sw.WriteString(fmt.Sprintf(" ON DELETE %s", r.OnDelete))