diff --git a/pkg/models/health.go b/pkg/models/health.go deleted file mode 100644 index ee206ed2d6f..00000000000 --- a/pkg/models/health.go +++ /dev/null @@ -1,3 +0,0 @@ -package models - -type GetDBHealthQuery struct{} diff --git a/pkg/services/sqlstore/health.go b/pkg/services/sqlstore/health.go deleted file mode 100644 index 9e1e98728cc..00000000000 --- a/pkg/services/sqlstore/health.go +++ /dev/null @@ -1,16 +0,0 @@ -package sqlstore - -import ( - "context" - - "github.com/grafana/grafana/pkg/models" -) - -// GetDBHealthQuery executes a query to check -// the availability of the database. -func (ss *SQLStore) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error { - return ss.WithDbSession(ctx, func(session *DBSession) error { - _, err := session.Exec("SELECT 1") - return err - }) -} diff --git a/pkg/services/sqlstore/health_test.go b/pkg/services/sqlstore/health_test.go deleted file mode 100644 index 2865a4302b8..00000000000 --- a/pkg/services/sqlstore/health_test.go +++ /dev/null @@ -1,21 +0,0 @@ -package sqlstore - -import ( - "context" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/grafana/grafana/pkg/models" -) - -func TestIntegrationGetDBHealthQuery(t *testing.T) { - if testing.Short() { - t.Skip("skipping integration test") - } - store := InitTestDB(t) - - query := models.GetDBHealthQuery{} - err := store.GetDBHealthQuery(context.Background(), &query) - require.NoError(t, err) -} diff --git a/pkg/services/sqlstore/mockstore/mockstore.go b/pkg/services/sqlstore/mockstore/mockstore.go index bb30328315b..1b52a9ebe60 100644 --- a/pkg/services/sqlstore/mockstore/mockstore.go +++ b/pkg/services/sqlstore/mockstore/mockstore.go @@ -116,10 +116,6 @@ func (m *SQLStoreMock) Quote(value string) string { return "" } -func (m *SQLStoreMock) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error { - return m.ExpectedError -} - func (m *SQLStoreMock) GetSqlxSession() *session.SessionDB { return nil }