feat: schema定义表名注解的支持

Author: guihouchang

schema/gen/gen.go

@@ -35,6 +35,7 @@ var tpl, err = template.New("").Funcs(template.FuncMap{
 	"RendProperty": RendProperty,
 	"Imports":      Imports,
 	"RendComment":  RendComment,
+	"getTableName": getTableName,
 }).ParseFS(templateFile, "template/*.tmpl")
 
 func ToUnderscore(camelCase string) string {
@@ -279,14 +280,29 @@ func genStruct(sc *load.Schema) error {
 	return os.WriteFile(target, b.Bytes(), os.ModePerm)
 }
 
+func getTableName(sc *load.Schema) string {
+
+	tableName := strings.ToLower(sc.Name)
+
+	if tmp, ok := sc.Annotations["EntSQL"]; ok {
+		if an, ok := tmp.(map[string]interface{}); ok {
+			if table, ok := an["table"]; ok {
+				return table.(string)
+			}
+		}
+	}
+
+	return ToUnderscore(tableName)
+}
+
 func genConst(sc *load.Schema) error {
 	name := strings.ToLower(sc.Name)
 	err = os.MkdirAll(name, os.ModePerm)
 	if err != nil {
 		return err
 	}
-	var b bytes.Buffer
 
+	var b bytes.Buffer
 	target := fmt.Sprintf("%s/%s.go", name, name)
 	err := tpl.ExecuteTemplate(&b, "const.tmpl", sc)
 	if err != nil {

schema/gen/template/const.tmpl

@@ -2,11 +2,11 @@
 package {{ToLower .Name}}
 
 const (
-    Label = "{{ToUnderscore .Name}}"
+    Label = "{{getTableName .}}"
     {{range .Fields}}
     Field{{ToCamelCase .Name}} = "{{.Name}}"
     {{end}}
-    Table = "{{ToUnderscore .Name}}"
+    Table = "{{getTableName .}}"
 )
 
 

schema/gen/template/migrate.tmpl

@@ -14,7 +14,7 @@ import (
 var (
     {{range .}}
     {{ToCamelCase .Name}}Mapping = &field.Mapping{
-        Name: "{{ToUnderscore .Name}}",
+        Name: "{{getTableName .}}",
         Properties: map[string]interface{}{
            {{range .Fields}}
             "{{ToUnderscore .Name}}": map[string]interface{}{

test/gen_test.go

@@ -1,18 +1,13 @@
 package test
 
 import (
-	"bytes"
 	"entgo.io/ent/entc/load"
 	entfield "entgo.io/ent/schema/field"
 	"fmt"
 	"github.com/guihouchang/go-elasticsearch/schema/field"
 	"github.com/guihouchang/go-elasticsearch/schema/gen"
-	"go/parser"
-	"go/token"
 	"html/template"
-	"os"
-	"os/exec"
-	"path/filepath"
+	"math"
 	"strings"
 	"testing"
 	"unicode"
@@ -108,109 +103,12 @@ func Type(t entfield.Type) string {
 	return "string"
 }
 
-func genClient() error {
-	pkgName, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	moduleName, err := executeGoList()
-	if err != nil {
-		return err
-	}
-
-	pkgName = filepath.Base(pkgName)
-
-	var b bytes.Buffer
-	target := fmt.Sprintf("%s.go", "client")
-	err = tpl.ExecuteTemplate(&b, "client.tmpl", struct {
-		PkgName    string
-		ModuleName string
-	}{
-		PkgName:    pkgName,
-		ModuleName: moduleName,
-	})
-	if err != nil {
-		return err
-	}
-
-	err = os.WriteFile(target, b.Bytes(), os.ModePerm)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func executeGoList() (string, error) {
-	cmd := exec.Command("go", "list")
-	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-
-	output, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-
-	moduleName := strings.TrimSpace(string(output))
-	return moduleName, nil
-}
-
-func genMigrate(scs []*load.Schema) error {
-	// 创建migrate目录
-	err = os.MkdirAll("migrate", os.ModePerm)
-	if err != nil {
-		return err
-	}
-
-	var b bytes.Buffer
-	target := fmt.Sprintf("migrate/%s.go", "schema")
-	err = tpl.ExecuteTemplate(&b, "migrate.tmpl", scs)
-	if err != nil {
-		return err
-	}
+func TestFloat(t *testing.T) {
+	total := 10000
+	pageSize := 26
 
-	return os.WriteFile(target, b.Bytes(), os.ModePerm)
-}
-
-func genStruct(sc *load.Schema) error {
-	pkgName, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	pkgName = filepath.Base(pkgName)
-
-	var b bytes.Buffer
-	target := fmt.Sprintf("%s.go", strings.ToLower(sc.Name))
-	err = tpl.ExecuteTemplate(&b, "struct.tmpl", struct {
-		PkgName string
-		Schema  *load.Schema
-	}{
-		PkgName: pkgName,
-		Schema:  sc,
-	})
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(target, b.Bytes(), os.ModePerm)
-}
-
-func genConst(sc *load.Schema) error {
-	name := strings.ToLower(sc.Name)
-	err = os.MkdirAll(name, os.ModePerm)
-	if err != nil {
-		return err
-	}
-	var b bytes.Buffer
-
-	target := fmt.Sprintf("%s/%s.go", name, name)
-	err := tpl.ExecuteTemplate(&b, "const.tmpl", sc)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(target, b.Bytes(), os.ModePerm)
+	totalPage := math.Ceil(float64(total) / float64(pageSize))
+	fmt.Println(totalPage)
 }
 
 func Test_Load(t *testing.T) {
@@ -219,16 +117,3 @@ func Test_Load(t *testing.T) {
 	gen.Gen(path)
 
 }
-
-func getPackagePath(filePath string) (string, error) {
-	fset := token.NewFileSet()
-
-	astFile, err := parser.ParseFile(fset, filePath, nil, parser.PackageClauseOnly)
-	if err != nil {
-		return "", err
-	}
-
-	pkgPath := astFile.Name.Name
-
-	return pkgPath, nil
-}

test/migrate/schema.go

@@ -2,6 +2,7 @@ package schema
 
 import (
 	"entgo.io/ent"
+	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema"
 	"github.com/guihouchang/go-elasticsearch/schema/annotation"
 	esfield "github.com/guihouchang/go-elasticsearch/schema/field"
@@ -37,5 +38,6 @@ func (UserData) Annotations() []schema.Annotation {
 			"number_of_shards":   1,
 			"number_of_replicas": 2,
 		}},
+		entsql.Annotation{Table: "test_user_data"},
 	}
 }