chore: remove fileMode and use os.ModePerm

si3nloong · Sep 17, 2024 · 090944b · 090944b
1 parent c6aca7c
commit 090944b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/codegen/code_generator.go b/codegen/code_generator.go
@@ -304,9 +304,11 @@ func (g *Generator) genModels(pkg *packages.Package, dstDir string, typeInferred
 	// }
 	// err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, fileAST)
 
-	os.MkdirAll(dstDir, fileMode)
+	if err := os.MkdirAll(dstDir, os.ModePerm); err != nil {
+		return err
+	}
 	fileDest := filepath.Join(dstDir, g.config.Exec.Filename)
-	f, err := os.OpenFile(fileDest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode)
+	f, err := os.OpenFile(fileDest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
 	if err != nil {
 		return err
 	}
@@ -615,7 +617,7 @@ func (g *Generator) genMigrations(schemas []*tableInfo) error {
 
 func (g *Generator) genMigration(unix int64, t *tableInfo) error {
 	fileDest := fmt.Sprintf("%s/%d_%s.sql", g.config.Migration.Dir, unix, t.TableName())
-	f, err := os.OpenFile(fileDest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode)
+	f, err := os.OpenFile(fileDest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
 	if err != nil {
 		return err
 	}

diff --git a/codegen/codegen.go b/codegen/codegen.go
@@ -47,8 +47,6 @@ var (
 	tableNameType = typeOfTable.PkgPath() + "." + typeOfTable.Name()
 )
 
-const fileMode = 0o755
-
 const (
 	TagOptionAutoIncrement = "auto_increment"
 	TagOptionBinary        = "binary"

diff --git a/codegen/dialect/mysql/column_type.go b/codegen/dialect/mysql/column_type.go
@@ -87,7 +87,7 @@ func (s *mysqlDriver) ColumnDataTypes() map[string]*dialect.ColumnType {
 			Scanner:  "github.com/si3nloong/sqlgen/sequel/types.Float({{addrOfGoPath}})",
 		},
 		"time.Time": {
-			DataType: s.columnDataType("TIMESTAMP", sql.RawBytes(`NOW()`)),
+			DataType: s.columnDataType("TIMESTAMP", sql.RawBytes("CURRENT_TIMESTAMP")),
 			Valuer:   "time.Time({{goPath}})",
 			Scanner:  "(*time.Time)({{addrOfGoPath}})",
 		},

diff --git a/codegen/init.go b/codegen/init.go
@@ -15,7 +15,7 @@ import (
 )
 
 func Init(cfg *Config) error {
-	f, err := os.OpenFile(DefaultConfigFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode)
+	f, err := os.OpenFile(DefaultConfigFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
 	if err != nil {
 		return err
 	}
@@ -94,7 +94,9 @@ func renderTemplate(
 	g.WriteString(blr.String())
 	strpool.ReleaseString(blr)
 
-	os.MkdirAll(dstDir, fileMode)
+	if err := os.MkdirAll(dstDir, os.ModePerm); err != nil {
+		return err
+	}
 	fileDest := filepath.Join(dstDir, dstFilename)
 	// formatted, err := format.Source([]byte(w.String()))
 	// if err != nil {
@@ -107,7 +109,7 @@ func renderTemplate(
 	g.Reset()
 
 	slog.Info("Creating " + fileDest)
-	if err := os.WriteFile(fileDest, formatted, fileMode); err != nil {
+	if err := os.WriteFile(fileDest, formatted, os.ModePerm); err != nil {
 		return err
 	}
 	return nil