From 9893b8c53d77079e135e361cd32899c2d3671610 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Tue, 25 Aug 2020 08:59:44 +0200 Subject: [PATCH] Stats: Correct the number of arguments for SQL call (#27182) * Stats: Correct the number of arguments for SQL call * Stats: Run admin stats call as integration test (cherry picked from commit d5687cce1181fdd36ff376eb5af9d102938c9f0b) --- pkg/services/sqlstore/stats.go | 2 +- pkg/services/sqlstore/stats_integration_test.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go index 9042b95be4b..e5fa3f6fb9d 100644 --- a/pkg/services/sqlstore/stats.go +++ b/pkg/services/sqlstore/stats.go @@ -158,7 +158,7 @@ func GetAdminStats(query *models.GetAdminStatsQuery) error { ) AS active_sessions` var stats models.AdminStats - _, err := x.SQL(rawSql, activeEndDate, activeEndDate, activeEndDate, activeEndDate, activeEndDate.Unix()).Get(&stats) + _, err := x.SQL(rawSql, activeEndDate, activeEndDate.Unix()).Get(&stats) if err != nil { return err } diff --git a/pkg/services/sqlstore/stats_integration_test.go b/pkg/services/sqlstore/stats_integration_test.go index 2eaf0a55acd..9c34f9be20e 100644 --- a/pkg/services/sqlstore/stats_integration_test.go +++ b/pkg/services/sqlstore/stats_integration_test.go @@ -13,6 +13,14 @@ import ( "github.com/stretchr/testify/require" ) +func TestIntegration_GetAdminStats(t *testing.T) { + InitTestDB(t) + + query := models.GetAdminStatsQuery{} + err := GetAdminStats(&query) + require.NoError(t, err) +} + func TestIntegration_GetUserStats(t *testing.T) { InitTestDB(t)