Fix github-issue-220: Incorrect query to Pg

ahead4 · Jul 10, 2019 · 28fcf51 · 28fcf51
1 parent e31b8ca
commit 28fcf51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/database.go b/core/database.go
@@ -101,8 +101,7 @@ func incidentsUpdatesDB() *gorm.DB {
 func (s *Service) HitsBetween(t1, t2 time.Time, group string, column string) *gorm.DB {
 	selector := Dbtimestamp(group, column)
 	if CoreApp.DbConnection == "postgres" {
-		timeQuery := fmt.Sprintf("service = %v AND created_at BETWEEN '%v.000000' AND '%v.000000'", s.Id, t1.UTC().Format(types.POSTGRES_TIME), t2.UTC().Format(types.POSTGRES_TIME))
-		return hitsDB().Select(selector).Where(timeQuery)
+		return hitsDB().Select(selector).Where("service = ? AND created_at BETWEEN ? AND ?", s.Id, t1.UTC().Format(types.TIME), t2.UTC().Format(types.TIME))
 	} else {
 		return hitsDB().Select(selector).Where("service = ? AND created_at BETWEEN ? AND ?", s.Id, t1.UTC().Format(types.TIME_DAY), t2.UTC().Format(types.TIME_DAY))
 	}

diff --git a/types/time.go b/types/time.go
@@ -22,7 +22,6 @@ import (
 const (
 	TIME_NANO     = "2006-01-02T15:04:05Z"
 	TIME          = "2006-01-02 15:04:05"
-	POSTGRES_TIME = "2006-01-02 15:04"
 	CHART_TIME    = "2006-01-02T15:04:05.999999-07:00"
 	TIME_DAY      = "2006-01-02"
 )