fix: model gen issues

cmd/gen_model.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	pgDatabase "git.ipao.vip/rogeecn/atomctl/pkg/postgres"
+	"git.ipao.vip/rogeecn/atomctl/pkg/utils/gomod"
 	"github.com/go-jet/jet/v2/generator/metadata"
 	"github.com/go-jet/jet/v2/generator/postgres"
 	"github.com/go-jet/jet/v2/generator/template"
@@ -29,6 +30,10 @@ func CommandGenModel(root *cobra.Command) {
 }
 
 func commandGenModelE(cmd *cobra.Command, args []string) error {
+	if err := gomod.Parse("go.mod"); err != nil {
+		return errors.Wrap(err, "parse go.mod")
+	}
+
 	_, dbConf, err := pgDatabase.GetDB(cmd.Flag("config").Value.String())
 	if err != nil {
 		return errors.Wrap(err, "get db")
@@ -91,13 +96,18 @@ func commandGenModelE(cmd *cobra.Command, args []string) error {
 									splits := strings.Split(toType, ".")
 									typeName := splits[len(splits)-1]
 
+									pkg := splits[0]
+									if strings.HasPrefix(pkg, "/") {
+										pkg = gomod.GetModuleName() + pkg
+									}
+
 									pkgSplits := strings.Split(splits[0], "/")
 									typePkg := pkgSplits[len(pkgSplits)-1]
 
 									defaultTableModelField = defaultTableModelField.
 										UseType(template.Type{
 											Name:       fmt.Sprintf("%s.%s", typePkg, typeName),
-											ImportPath: splits[0],
+											ImportPath: pkg,
 										})
 
 									log.Infof("Convert table %s field %s type to : %s", table.Name, column.Name, toType)

templates/project/database/database.go.tpl

@@ -1,8 +1,44 @@
 package database
 
 import (
+	"context"
+	"database/sql"
 	"embed"
+	"fmt"
+
+	"github.com/go-jet/jet/v2/qrm"
 )
 
 //go:embed migrations/*
 var MigrationFS embed.FS
+
+type CtxDB struct{}
+
+func FromContext(ctx context.Context, db *sql.DB) qrm.DB {
+	if tx, ok := ctx.Value(CtxDB{}).(*sql.Tx); ok {
+		return tx
+	}
+	return db
+}
+
+func TruncateAllTables(ctx context.Context, db *sql.DB, tableName ...string) error {
+	for _, name := range tableName {
+		sql := fmt.Sprintf("TRUNCATE TABLE %s RESTART IDENTITY", name)
+		if _, err := db.ExecContext(ctx, sql); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func WrapLike(v string) string {
+	return "%" + v + "%"
+}
+
+func WrapLikeLeft(v string) string {
+	return "%" + v
+}
+
+func WrapLikeRight(v string) string {
+	return "%" + v
+}

templates/project/database/fields/common.go.tpl

@@ -0,0 +1,32 @@
+package fields
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+
+	"github.com/samber/lo"
+)
+
+// implement sql.Scanner interface
+type field struct{}
+
+func (x *field) Scan(value interface{}) (err error) {
+	switch v := value.(type) {
+	case string:
+		return json.Unmarshal([]byte(v), &x)
+	case []byte:
+		return json.Unmarshal(v, &x)
+	case *string:
+		return json.Unmarshal([]byte(*v), &x)
+	}
+	return errors.New("Unknown type for ")
+}
+
+func (x field) Value() (driver.Value, error) {
+	return json.Marshal(x)
+}
+
+func (x field) MustValue() driver.Value {
+	return lo.Must(json.Marshal(x))
+}

templates/project/pkg/pg/db.go.tpl

@@ -1,40 +0,0 @@
-package db
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-
-	"github.com/go-jet/jet/v2/qrm"
-)
-
-const CtxDB = "__db__tx:"
-
-func FromContext(ctx context.Context, db *sql.DB) qrm.DB {
-	if tx, ok := ctx.Value(CtxDB).(*sql.Tx); ok {
-		return tx
-	}
-	return db
-}
-
-func TruncateAllTables(ctx context.Context, db *sql.DB, tableName ...string) error {
-	for _, name := range tableName {
-		sql := fmt.Sprintf("TRUNCATE TABLE %s RESTART IDENTITY", name)
-		if _, err := db.ExecContext(ctx, sql); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func WrapLike(v string) string {
-	return "%" + v + "%"
-}
-
-func WrapLikeLeft(v string) string {
-	return "%" + v
-}
-
-func WrapLikeRight(v string) string {
-	return "%" + v
-}