Skip to content

Commit 08c9c0b

Browse files
committed
feat(db): preparing date for sqlite
1 parent 6bcb1ef commit 08c9c0b

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

db/sql/SqlDb.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ func (d *SqlDbConnection) prepareQueryWithDialect(query string, dialect gorp.Dia
131131
return query
132132
}
133133

134+
func (d *SqlDbConnection) PrepareDateQueryParam(paramName string) string {
135+
if d.dialect == util.DbDriverSQLite {
136+
return "substr(" + paramName + ", 1, 25)"
137+
}
138+
139+
return paramName
140+
}
141+
134142
func (d *SqlDbConnection) PrepareQuery(query string) string {
135143
return d.prepareQueryWithDialect(query, d.sql.Dialect)
136144
}
@@ -139,7 +147,7 @@ func formatArgs(args []any) (formattedArgs []any) {
139147
for _, arg := range args {
140148
switch typedArg := arg.(type) {
141149
case time.Time:
142-
formattedArgs = append(formattedArgs, typedArg.Format("2006-01-02 15:04:05.0000000"))
150+
formattedArgs = append(formattedArgs, typedArg.Format("2006-01-02 15:04:05.000000"))
143151
default:
144152
formattedArgs = append(formattedArgs, arg)
145153
}
@@ -893,7 +901,7 @@ func (d *SqlDb) GetTaskStats(projectID int, templateID *int, unit db.TaskStatUni
893901
Count int `db:"count"`
894902
}
895903

896-
q := squirrel.Select("DATE(SUBSTR(created, 1, 25)) AS date, status, COUNT(*) AS count").
904+
q := squirrel.Select("DATE("+d.connection.PrepareDateQueryParam("created")+") AS date, status, COUNT(*) AS count").
897905
From("task").
898906
Where("project_id=?", projectID).
899907
GroupBy("date, status").
@@ -920,7 +928,11 @@ func (d *SqlDb) GetTaskStats(projectID int, templateID *int, unit db.TaskStatUni
920928
return
921929
}
922930

923-
_, err = d.selectAll(&res, query, args...)
931+
_, err = d.connection.SelectAll(&res, query, args...)
932+
933+
if err != nil {
934+
return
935+
}
924936

925937
var date string
926938
var stat *db.TaskStat

0 commit comments

Comments
 (0)