Skip to content
Permalink
Browse files

Merge pull request #221 from viartemev/fix-github-220

Fix github-issue-220: Incorrect query to Pg
  • Loading branch information...
hunterlong committed Jul 19, 2019
2 parents 17c633f + 28fcf51 commit 85b4129b084b37e0ada3d41305b752ee8adb7184
Showing with 1 addition and 3 deletions.
  1. +1 −2 core/database.go
  2. +0 −1 types/time.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))
}
@@ -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"
)

0 comments on commit 85b4129

Please sign in to comment.
You can’t perform that action at this time.