From 229fb2c261f6062de27f49457c16a62ad3112bf3 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 7 Nov 2023 06:55:24 -0800 Subject: [PATCH] Stars: Remove sqlx storage implementation (#77766) --- pkg/services/star/starimpl/sqlx_store.go | 67 ------------------- pkg/services/star/starimpl/sqlx_store_test.go | 16 ----- pkg/services/star/starimpl/star.go | 12 +--- 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkg/services/star/starimpl/sqlx_store.go delete mode 100644 pkg/services/star/starimpl/sqlx_store_test.go diff --git a/pkg/services/star/starimpl/sqlx_store.go b/pkg/services/star/starimpl/sqlx_store.go deleted file mode 100644 index 305229fe3e0..00000000000 --- a/pkg/services/star/starimpl/sqlx_store.go +++ /dev/null @@ -1,67 +0,0 @@ -package starimpl - -import ( - "context" - "database/sql" - "errors" - - "github.com/grafana/grafana/pkg/infra/db" - "github.com/grafana/grafana/pkg/services/sqlstore/session" - "github.com/grafana/grafana/pkg/services/star" -) - -type sqlxStore struct { - sess *session.SessionDB - db db.DB -} - -func (s *sqlxStore) Get(ctx context.Context, query *star.IsStarredByUserQuery) (bool, error) { - var star_res star.Star - err := s.sess.Get(ctx, &star_res, "SELECT * from star where user_id=? and dashboard_id=?", query.UserID, query.DashboardID) - if err != nil { - if errors.Is(err, sql.ErrNoRows) { - return false, nil - } - return false, err - } - return true, nil -} - -func (s *sqlxStore) Insert(ctx context.Context, cmd *star.StarDashboardCommand) error { - entity := star.Star{ - UserID: cmd.UserID, - DashboardID: cmd.DashboardID, - } - _, err := s.sess.NamedExec(ctx, `INSERT INTO star (user_id, dashboard_id) VALUES (:user_id, :dashboard_id)`, entity) - if s.db.GetDialect().IsUniqueConstraintViolation(err) { - return nil - } - if err != nil { - return err - } - return err -} - -func (s *sqlxStore) Delete(ctx context.Context, cmd *star.UnstarDashboardCommand) error { - _, err := s.sess.Exec(ctx, "DELETE FROM star WHERE user_id=? and dashboard_id=?", cmd.UserID, cmd.DashboardID) - return err -} - -func (s *sqlxStore) DeleteByUser(ctx context.Context, userID int64) error { - _, err := s.sess.Exec(ctx, "DELETE FROM star WHERE user_id = ?", userID) - return err -} - -func (s *sqlxStore) List(ctx context.Context, query *star.GetUserStarsQuery) (*star.GetUserStarsResult, error) { - userStars := make(map[int64]bool) - var stars = make([]star.Star, 0) - err := s.sess.Select(ctx, &stars, "SELECT * FROM star WHERE user_id=?", query.UserID) - if err != nil { - return nil, err - } - for _, star := range stars { - userStars[star.DashboardID] = true - } - - return &star.GetUserStarsResult{UserStars: userStars}, err -} diff --git a/pkg/services/star/starimpl/sqlx_store_test.go b/pkg/services/star/starimpl/sqlx_store_test.go deleted file mode 100644 index edff42ea5f4..00000000000 --- a/pkg/services/star/starimpl/sqlx_store_test.go +++ /dev/null @@ -1,16 +0,0 @@ -package starimpl - -import ( - "testing" - - "github.com/grafana/grafana/pkg/infra/db" -) - -func TestIntegrationSQLxUserStarsDataAccess(t *testing.T) { - if testing.Short() { - t.Skip("skipping integration test") - } - testIntegrationUserStarsDataAccess(t, func(ss db.DB) store { - return &sqlxStore{sess: ss.GetSqlxSession(), db: ss} - }) -} diff --git a/pkg/services/star/starimpl/star.go b/pkg/services/star/starimpl/star.go index adc49002c47..fe1d593af61 100644 --- a/pkg/services/star/starimpl/star.go +++ b/pkg/services/star/starimpl/star.go @@ -4,24 +4,14 @@ import ( "context" "github.com/grafana/grafana/pkg/infra/db" - "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/star" - "github.com/grafana/grafana/pkg/setting" ) type Service struct { store store } -func ProvideService(db db.DB, cfg *setting.Cfg) star.Service { - if cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) { - return &Service{ - store: &sqlxStore{ - sess: db.GetSqlxSession(), - db: db, - }, - } - } +func ProvideService(db db.DB) star.Service { return &Service{ store: &sqlStore{ db: db,