zishuo/toolset
1
0
Fork 0
mirror of https://github.com/go-home-admin/toolset.git synced 2025-12-24 13:37:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed: pgsql sslmode & field's default

Browse Source
This commit is contained in:
zodial
2024-12-11 15:52:34 +08:00
parent cdb571675f
commit fda4c60540
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
console/commands/pgorm/pgsql.go
View File

@@ -348,8 +348,19 @@ func genGormTag(column tableColumn, conf Conf) string {
arr = append(arr, "index:"+column.ColumnName)
}
// default
if column.ColumnDefault != "" && !strings.Contains(column.ColumnDefault, "::") {
arr = append(arr, "default:"+column.ColumnDefault)
if column.ColumnDefault != "" {
if column.GoType == "string" {
if strings.Contains(column.ColumnDefault, "::character varying") {
str := strings.ReplaceAll(column.ColumnDefault, "::character varying", "")
if strings.ToUpper(str) != "NULL" {
arr = append(arr, "default:"+str)
}
} else if !strings.Contains(column.ColumnDefault, "::") {
arr = append(arr, "default:"+column.ColumnDefault)
}
} else {
arr = append(arr, "default:"+column.ColumnDefault)
}
}
// created_at & updated_at
if field, ok := conf["created_field"]; ok && field == column.ColumnName {
@@ -545,12 +556,13 @@ func PgTypeToGoType(pgType string, columnName string) string {
func NewDb(conf map[interface{}]interface{}) *DB {
config := services.NewConfig(conf)
connStr := fmt.Sprintf(
"postgres://%s:%s@%s:%d/%s?sslmode=disable",
"postgres://%s:%s@%s:%d/%s?sslmode=%s",
config.GetString("username", "root"),
config.GetString("password", "123456"),
config.GetString("host", "localhost:"),
config.GetInt("port", 5432),
config.GetString("database", "demo"),
config.GetString("sslmode", "disable"),
)
db, err := sql.Open("postgres", connStr)
if err != nil {