feat: add sql command

cmd/ormat/command/helper_gen_file.go

@@ -22,15 +22,16 @@ func (self *genFileOpt) build(mixin ens.Schemaer) *ens.Schema {
 }
 
 func (self *genFileOpt) GenModel(mixin ens.Schemaer) error {
-	codegenOption := []codegen.Option{
-		codegen.WithByName("ormat"),
-		codegen.WithVersion(version),
-		codegen.WithPackageName(utils.GetPkgName(self.OutputDir)),
-		codegen.WithDisableDocComment(self.View.DisableDocComment),
-	}
 	sc := self.build(mixin)
 	if self.Merge {
-		data, err := codegen.New(sc.Entities, codegenOption...).GenModel().FormatSource()
+		g := codegen.CodeGen{
+			Entities:          sc.Entities,
+			ByName:            "ormat",
+			Version:           version,
+			PackageName:       utils.GetPkgName(self.OutputDir),
+			DisableDocComment: self.View.DisableDocComment,
+		}
+		data, err := g.Gen().FormatSource()
 		if err != nil {
 			return err
 		}
@@ -42,7 +43,14 @@ func (self *genFileOpt) GenModel(mixin ens.Schemaer) error {
 		slog.Info("👉 " + filename)
 	} else {
 		for _, entity := range sc.Entities {
-			data, err := codegen.New([]*ens.EntityDescriptor{entity}, codegenOption...).GenModel().FormatSource()
+			g := codegen.CodeGen{
+				Entities:          []*ens.EntityDescriptor{entity},
+				ByName:            "ormat",
+				Version:           version,
+				PackageName:       utils.GetPkgName(self.OutputDir),
+				DisableDocComment: self.View.DisableDocComment,
+			}
+			data, err := g.Gen().FormatSource()
 			if err != nil {
 				return fmt.Errorf("%v: %v", entity.Name, err)
 			}

cmd/ormat/command/sql.go

@@ -6,28 +6,27 @@ import (
 
 	"ariga.io/atlas/sql/schema"
 	"github.com/spf13/cobra"
-	"github.com/things-go/ens"
-	"github.com/things-go/ens/codegen"
 	"github.com/things-go/ens/driver"
-	"github.com/things-go/ens/utils"
+	"github.com/things-go/ens/sqlx"
 )
 
 type sqlOpt struct {
-	OutputDir         string
-	Merge             bool
-	Filename          string
 	URL               string
 	Tables            []string
 	Exclude           []string
 	DisableDocComment bool
+
+	OutputDir string
+	Merge     bool
+	Filename  string
 }
 
 type sqlCmd struct {
 	cmd *cobra.Command
 	sqlOpt
 }
 
-// atlas schema inspect -u "mysql://localhost" --format "{{ sql . }}"
+// must be same as atlas schema inspect -u "mysql://localhost" --format "{{ sql . }}"
 func newSqlCmd() *sqlCmd {
 	root := &sqlCmd{}
 	cmd := &cobra.Command{
@@ -39,7 +38,7 @@ func newSqlCmd() *sqlCmd {
 			if err != nil {
 				return err
 			}
-			mixin, err := d.InspectSchema(context.Background(), &driver.InspectOption{
+			schemaes, err := d.InspectSql(context.Background(), &driver.InspectOption{
 				URL:  root.URL,
 				Data: "",
 				InspectOptions: schema.InspectOptions{
@@ -51,28 +50,30 @@ func newSqlCmd() *sqlCmd {
 			if err != nil {
 				return err
 			}
-			sc := mixin.Build(nil)
-			codegenOption := []codegen.Option{
-				codegen.WithByName("ormat"),
-				codegen.WithVersion(version),
-				codegen.WithPackageName(utils.GetPkgName(root.OutputDir)),
-				codegen.WithDisableDocComment(root.DisableDocComment),
-			}
+
 			if root.Merge {
-				data := codegen.New(sc.Entities, codegenOption...).
-					GenDDL().
-					Bytes()
+				codegen := &sqlx.CodeGen{
+					Entities:          schemaes.Entities,
+					ByName:            "ormat",
+					Version:           version,
+					DisableDocComment: root.DisableDocComment,
+				}
+				data := codegen.Gen().Bytes()
 				filename := joinFilename(root.OutputDir, root.Filename, ".sql")
 				err = WriteFile(filename, data)
 				if err != nil {
 					return err
 				}
 				slog.Info("👉 " + filename)
 			} else {
-				for _, entity := range sc.Entities {
-					data := codegen.New([]*ens.EntityDescriptor{entity}, codegenOption...).
-						GenDDL().
-						Bytes()
+				for _, entity := range schemaes.Entities {
+					codegen := &sqlx.CodeGen{
+						Entities:          schemaes.Entities,
+						ByName:            "ormat",
+						Version:           version,
+						DisableDocComment: root.DisableDocComment,
+					}
+					data := codegen.Gen().Bytes()
 					filename := joinFilename(root.OutputDir, entity.Name, ".sql")
 					err = WriteFile(filename, data)
 					if err != nil {
@@ -87,8 +88,8 @@ func newSqlCmd() *sqlCmd {
 	cmd.Flags().StringVar(&root.URL, "url", "", "mysql://root:[email protected]:3306/test)")
 	cmd.PersistentFlags().StringSliceVarP(&root.Tables, "table", "t", nil, "only out custom table")
 	cmd.PersistentFlags().StringSliceVar(&root.Exclude, "exclude", nil, "exclude table pattern")
-	cmd.Flags().StringVarP(&root.OutputDir, "out", "o", "./model/migration", "out directory")
-	cmd.Flags().StringVar(&root.Filename, "filename", "migration", "filename when merge enabled")
+	cmd.Flags().StringVarP(&root.OutputDir, "out", "o", "./migration", "out directory")
+	cmd.Flags().StringVar(&root.Filename, "filename", "create_table", "filename when merge enabled")
 	cmd.Flags().BoolVar(&root.Merge, "merge", false, "merge in a file")
 	cmd.Flags().BoolVarP(&root.DisableDocComment, "disableDocComment", "d", false, "禁用文档注释")
 

codegen/codegen.go

@@ -10,51 +10,11 @@ import (
 
 type CodeGen struct {
 	buf               bytes.Buffer
-	entities          []*ens.EntityDescriptor
-	byName            string
-	version           string
-	packageName       string
-	disableDocComment bool
-}
-
-type Option func(*CodeGen)
-
-// WithByName the code generator by which executables name.
-func WithByName(s string) Option {
-	return func(g *CodeGen) {
-		g.byName = s
-	}
-}
-
-func WithVersion(version string) Option {
-	return func(g *CodeGen) {
-		g.version = version
-	}
-}
-
-func WithPackageName(s string) Option {
-	return func(g *CodeGen) {
-		g.packageName = s
-	}
-}
-
-func WithDisableDocComment(b bool) Option {
-	return func(g *CodeGen) {
-		g.disableDocComment = b
-	}
-}
-
-func New(md []*ens.EntityDescriptor, opts ...Option) *CodeGen {
-	g := &CodeGen{
-		entities:    md,
-		byName:      "codegen",
-		version:     "unknown",
-		packageName: "codegen",
-	}
-	for _, opt := range opts {
-		opt(g)
-	}
-	return g
+	Entities          []*ens.EntityDescriptor
+	ByName            string
+	Version           string
+	PackageName       string
+	DisableDocComment bool
 }
 
 // Bytes returns the CodeBuf's buffer.

codegen/model.go

@@ -1,25 +1,24 @@
 package codegen
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/things-go/ens"
 	"github.com/things-go/ens/utils"
 )
 
-func (g *CodeGen) GenModel() *CodeGen {
-	if !g.disableDocComment {
-		g.Printf("// Code generated by %s. DO NOT EDIT.\n", g.byName)
-		g.Printf("// version: %s\n", g.version)
+func (g *CodeGen) Gen() *CodeGen {
+	if !g.DisableDocComment {
+		g.Printf("// Code generated by %s. DO NOT EDIT.\n", g.ByName)
+		g.Printf("// version: %s\n", g.Version)
 		g.Println()
 	}
-	g.Printf("package %s\n", g.packageName)
+	g.Printf("package %s\n", g.PackageName)
 	g.Println()
 
 	//* import
 	imports := make(map[string]struct{})
-	for _, st := range g.entities {
+	for _, st := range g.Entities {
 		for _, field := range st.Fields {
 			if field.Type.PkgPath != "" {
 				imports[field.Type.PkgPath] = struct{}{}
@@ -35,11 +34,11 @@ func (g *CodeGen) GenModel() *CodeGen {
 	}
 
 	//* struct
-	for _, et := range g.entities {
+	for _, et := range g.Entities {
 		structName := utils.CamelCase(et.Name)
 		tableName := et.Name
 
-		g.Printf("// %s %s\n", structName, trimStructComment(et.Comment, "\n", "\n// "))
+		g.Printf("// %s %s\n", structName, strings.ReplaceAll(strings.TrimSpace(et.Comment), "\n", "\n// "))
 		g.Printf("type %s struct {\n", structName)
 		for _, field := range et.Fields {
 			g.Println(genModelStructField(field))
@@ -77,23 +76,3 @@ func genModelStructField(field *ens.FieldDescriptor) string {
 	}
 	return b.String()
 }
-
-func genModelStructVarField(tableName string, field *ens.FieldDescriptor, skip bool) string {
-	b := strings.Builder{}
-	b.Grow(64)
-	if skip {
-		b.WriteString("// ")
-	}
-	b.WriteString(`"`)
-	if field.Type.IsTime() {
-		if field.Nullable {
-			b.WriteString(fmt.Sprintf("IFNULL(UNIX_TIMESTAMP(`%[1]s`.`%[2]s`), 0) AS `%[2]s`", tableName, field.Name))
-		} else {
-			b.WriteString(fmt.Sprintf("UNIX_TIMESTAMP(`%[1]s`.`%[2]s`) AS `%[2]s`", tableName, field.Name))
-		}
-	} else {
-		b.WriteString(fmt.Sprintf("`%s`.`%s`", tableName, field.Name))
-	}
-	b.WriteString(`",`)
-	return b.String()
-}

driver/driver.go

@@ -10,6 +10,7 @@ import (
 	"github.com/things-go/ens"
 	"github.com/things-go/ens/proto"
 	"github.com/things-go/ens/rapier"
+	"github.com/things-go/ens/sqlx"
 )
 
 const (
@@ -24,6 +25,7 @@ type Driver interface {
 	InspectSchema(context.Context, *InspectOption) (*ens.MixinSchema, error)
 	InspectProto(context.Context, *InspectOption) (*proto.Schema, error)
 	InspectRapier(ctx context.Context, arg *InspectOption) (*rapier.Schema, error)
+	InspectSql(ctx context.Context, arg *InspectOption) (*sqlx.Schema, error)
 }
 
 func RegisterDriver(name string, d Driver) {