Revert to int64

mtojek · mtojek · commit e957d16f22b2 · 2023-09-15T11:57:46.000+02:00
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -2424,9 +2424,9 @@ func (q *FakeQuerier) GetTemplateInsightsByInterval(ctx context.Context, arg dat
 		templateIDSet      map[uuid.UUID]struct{}
 	}
 
-	statsByInterval := []statByInterval{{arg.StartTime, arg.StartTime.Add(arg.Interval), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})}}
+	statsByInterval := []statByInterval{{arg.StartTime, arg.StartTime.Add(time.Duration(arg.Interval)), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})}}
 	for statsByInterval[len(statsByInterval)-1].endTime.Before(arg.EndTime) {
-		statsByInterval = append(statsByInterval, statByInterval{statsByInterval[len(statsByInterval)-1].endTime, statsByInterval[len(statsByInterval)-1].endTime.Add(arg.Interval), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})})
+		statsByInterval = append(statsByInterval, statByInterval{statsByInterval[len(statsByInterval)-1].endTime, statsByInterval[len(statsByInterval)-1].endTime.Add(time.Duration(arg.Interval)), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})})
 	}
 	if statsByInterval[len(statsByInterval)-1].endTime.After(arg.EndTime) {
 		statsByInterval[len(statsByInterval)-1].endTime = arg.EndTime
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -27,11 +27,6 @@ overrides:
       - column: "template_with_users.group_acl"
         go_type:
           type: "TemplateACL"
-      - db_type: "pg_catalog.interval"
-        engine: "postgresql"
-        go_type:
-          import: "time"
-          type: "Duration"
     rename:
       template: TemplateTable
       template_with_user: Template
diff --git a/coderd/insights.go b/coderd/insights.go
@@ -207,7 +207,7 @@ func (api *API) insightsTemplates(rw http.ResponseWriter, r *http.Request) {
 				StartTime:   startTime,
 				EndTime:     endTime,
 				TemplateIDs: templateIDs,
-				Interval:    24 * time.Hour,
+				Interval:    int64(24 * time.Hour),
 			})
 			if err != nil {
 				return xerrors.Errorf("get template daily insights: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -2424,9 +2424,9 @@ func (q *FakeQuerier) GetTemplateInsightsByInterval(ctx context.Context, arg dat`
`2424`	`2424`	`templateIDSet map[uuid.UUID]struct{}`
`2425`	`2425`	`}`
`2426`	`2426`
`2427`		`- statsByInterval := []statByInterval{{arg.StartTime, arg.StartTime.Add(arg.Interval), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})}}`
	`2427`	`+ statsByInterval := []statByInterval{{arg.StartTime, arg.StartTime.Add(time.Duration(arg.Interval)), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})}}`
`2428`	`2428`	`for statsByInterval[len(statsByInterval)-1].endTime.Before(arg.EndTime) {`
`2429`		`- statsByInterval = append(statsByInterval, statByInterval{statsByInterval[len(statsByInterval)-1].endTime, statsByInterval[len(statsByInterval)-1].endTime.Add(arg.Interval), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})})`
	`2429`	`+ statsByInterval = append(statsByInterval, statByInterval{statsByInterval[len(statsByInterval)-1].endTime, statsByInterval[len(statsByInterval)-1].endTime.Add(time.Duration(arg.Interval)), make(map[uuid.UUID]struct{}), make(map[uuid.UUID]struct{})})`
`2430`	`2430`	`}`
`2431`	`2431`	`if statsByInterval[len(statsByInterval)-1].endTime.After(arg.EndTime) {`
`2432`	`2432`	`statsByInterval[len(statsByInterval)-1].endTime = arg.EndTime`