Merge pull request #530 from RuliXu/ensure-db-parsetime

Iceber · web-flow · commit 43597733e7b0 · 2023-06-27T11:47:22.000+08:00
Ensure Mysql ParseTime to be True
diff --git a/pkg/storage/internalstorage/config.go b/pkg/storage/internalstorage/config.go
@@ -14,6 +14,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"gopkg.in/natefinch/lumberjack.v2"
 	"gorm.io/gorm/logger"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -216,9 +217,10 @@ func (cfg *Config) genMySQLConfig() (*mysql.Config, error) {
 	if cfg.MySQL.InterpolateParams != nil {
 		mysqlconfig.InterpolateParams = *cfg.MySQL.InterpolateParams
 	}
-	if cfg.MySQL.ParseTime != nil {
-		mysqlconfig.ParseTime = *cfg.MySQL.ParseTime
+	if cfg.MySQL.ParseTime != nil && !*cfg.MySQL.ParseTime {
+		klog.Warningln("Mysql query param parseTime=false has been ignored, and set to true")
 	}
+	mysqlconfig.ParseTime = true
 	if cfg.MySQL.RejectReadOnly != nil {
 		mysqlconfig.RejectReadOnly = *cfg.MySQL.RejectReadOnly
 	}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`"github.com/jackc/pgx/v4"`
`15`	`15`	`"gopkg.in/natefinch/lumberjack.v2"`
`16`	`16`	`"gorm.io/gorm/logger"`
	`17`	`+ "k8s.io/klog/v2"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`const (`
`@@ -216,9 +217,10 @@ func (cfg Config) genMySQLConfig() (mysql.Config, error) {`
`216`	`217`	`if cfg.MySQL.InterpolateParams != nil {`
`217`	`218`	`mysqlconfig.InterpolateParams = *cfg.MySQL.InterpolateParams`
`218`	`219`	`}`
`219`		`- if cfg.MySQL.ParseTime != nil {`
`220`		`- mysqlconfig.ParseTime = *cfg.MySQL.ParseTime`
	`220`	`+ if cfg.MySQL.ParseTime != nil && !*cfg.MySQL.ParseTime {`
	`221`	`+ klog.Warningln("Mysql query param parseTime=false has been ignored, and set to true")`
`221`	`222`	`}`
	`223`	`+ mysqlconfig.ParseTime = true`
`222`	`224`	`if cfg.MySQL.RejectReadOnly != nil {`
`223`	`225`	`mysqlconfig.RejectReadOnly = *cfg.MySQL.RejectReadOnly`
`224`	`226`	`}`