Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(store): also remove unnecessary tx from UpdateDatabaseGroup (#19049)
p0nyb863f6640b92
diff --git a/backend/server/server.go b/backend/server/server.goindex c925438a4d..36bf7dd08d 100644--- a/backend/server/server.go+++ b/backend/server/server.go@@ -162,10 +162,6 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {return nil, errors.Wrapf(err, "failed to create message bus")}- if err := s.store.BackfillIssueTSVector(ctx); err != nil {- slog.Warn("failed to backfill issue ts vector", log.BBError(err))- }-s.licenseService, err = enterprise.NewLicenseService(profile.Mode, stores)if err != nil {return nil, errors.Wrap(err, "failed to create license service")diff --git a/backend/store/database.go b/backend/store/database.goindex 333172795f..e26d7d6f37 100644--- a/backend/store/database.go+++ b/backend/store/database.go@@ -101,12 +101,6 @@ func (s *Store) GetDatabase(ctx context.Context, find *FindDatabaseMessage) (*Da// ListDatabases lists all databases.func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([]*DatabaseMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-from := qb.Q().Space("db")where := qb.Q().Space("TRUE")@@ -187,7 +181,7 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([}var databases []*DatabaseMessage- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -232,10 +226,6 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }-for _, database := range databases {s.databaseCache.Add(getDatabaseCacheKey(database.InstanceID, database.DatabaseName), database)}diff --git a/backend/store/database_group.go b/backend/store/database_group.goindex a585fcd6ab..b5695580f2 100644--- a/backend/store/database_group.go+++ b/backend/store/database_group.go@@ -2,7 +2,6 @@ package storeimport ("context"- "database/sql""github.com/pkg/errors""google.golang.org/genproto/googleapis/type/expr"@@ -56,12 +55,6 @@ func (s *Store) DeleteDatabaseGroup(ctx context.Context, projectID, resourceID s// ListDatabaseGroups lists database groups.func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupMessage) ([]*DatabaseGroupMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-q := qb.Q().Space(`SELECTproject,@@ -87,7 +80,7 @@ func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupM}var databaseGroups []*DatabaseGroupMessage- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, errors.Wrapf(err, "failed to scan")}@@ -115,10 +108,6 @@ func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupMreturn nil, errors.Wrapf(err, "failed to scan")}- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit transaction")- }-return databaseGroups, nil}@@ -161,14 +150,9 @@ func (s *Store) UpdateDatabaseGroup(ctx context.Context, projectID, resourceID sreturn nil, errors.Wrapf(err, "failed to build sql")}- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return nil, errors.Wrapf(err, "failed to commit ")- }-var updatedDatabaseGroup DatabaseGroupMessagevar exprBytes []byte- if err := tx.QueryRowContext(+ if err := s.GetDB().QueryRowContext(ctx,query,args...,@@ -180,9 +164,6 @@ func (s *Store) UpdateDatabaseGroup(ctx context.Context, projectID, resourceID s); err != nil {return nil, errors.Wrapf(err, "failed to scan")}- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit transaction")- }var expression expr.Exprif err := common.ProtojsonUnmarshaler.Unmarshal(exprBytes, &expression); err != nil {return nil, errors.Wrapf(err, "failed to unmarshal expression")diff --git a/backend/store/group.go b/backend/store/group.goindex 7ca1646a96..57e38792eb 100644--- a/backend/store/group.go+++ b/backend/store/group.go@@ -72,12 +72,6 @@ func (s *Store) GetGroup(ctx context.Context, find *FindGroupMessage) (*GroupMes// ListGroups list all groups.func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*GroupMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return nil, err- }- defer tx.Rollback()-with := qb.Q()from := qb.Q().Space("user_group")where := qb.Q().Space("TRUE")@@ -136,7 +130,7 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou}var groups []*GroupMessage- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -168,9 +162,6 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grouif err := rows.Err(); err != nil {return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }for _, group := range groups {s.groupCache.Add(group.Email, group)diff --git a/backend/store/issue.go b/backend/store/issue.goindex 3b9ddff662..be00223716 100644--- a/backend/store/issue.go+++ b/backend/store/issue.go@@ -465,77 +465,3 @@ func getTSQuery(text string) string {}return tsQuery.String()}--func (s *Store) BackfillIssueTSVector(ctx context.Context) error {- chunkSize := 50- offset := 0-- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return errors.Wrapf(err, "failed to begin transaction")- }- defer tx.Rollback()-- for {- selectQuery := qb.Q().Space(`- SELECT- issue.id,- issue.name,- issue.description- FROM issue- WHERE issue.ts_vector IS NULL- ORDER BY issue.id- LIMIT ?- OFFSET ?`, chunkSize, offset)-- selectSQL, selectArgs, err := selectQuery.ToSQL()- if err != nil {- return errors.Wrapf(err, "failed to build select sql")- }-- var issues []*IssueMessage- if err := func() error {- rows, err := tx.QueryContext(ctx, selectSQL, selectArgs...)- if err != nil {- return errors.Wrapf(err, "failed to query")- }- defer rows.Close()- for rows.Next() {- var issue IssueMessage- if err := rows.Scan(&issue.UID, &issue.Title, &issue.Description); err != nil {- return errors.Wrapf(err, "failed to scan")- }- issues = append(issues, &issue)- }- if err := rows.Err(); err != nil {- return errors.Wrapf(err, "failed to scan")- }- return nil- }(); err != nil {- return err- }-- if len(issues) == 0 {- break- }- offset += len(issues)-- for _, issue := range issues {- tsVector := getTSVector(fmt.Sprintf("%s %s", issue.Title, issue.Description))- updateQuery := qb.Q().Space("UPDATE issue SET ts_vector = ? WHERE id = ?", tsVector, issue.UID)- updateSQL, updateArgs, err := updateQuery.ToSQL()- if err != nil {- return errors.Wrapf(err, "failed to build update sql")- }- if _, err := tx.ExecContext(ctx, updateSQL, updateArgs...); err != nil {- return errors.Wrapf(err, "failed to update")- }- }- }-- if err := tx.Commit(); err != nil {- return errors.Wrapf(err, "failed to commit")- }-- return nil-}diff --git a/backend/store/policy.go b/backend/store/policy.goindex 903b5f8413..3fed09ff4e 100644--- a/backend/store/policy.go+++ b/backend/store/policy.go@@ -493,12 +493,6 @@ func (s *Store) GetPolicy(ctx context.Context, find *FindPolicyMessage) (*Policy// ListPolicies lists all policies.func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*PolicyMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return nil, err- }- defer tx.Rollback()-q := qb.Q().Space(`SELECTupdated_at,@@ -530,7 +524,7 @@ func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*Preturn nil, errors.Wrapf(err, "failed to build sql")}- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -567,10 +561,6 @@ func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*Preturn nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }-for _, policy := range policyList {s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)}diff --git a/backend/store/worksheet.go b/backend/store/worksheet.goindex ab9ca718f0..630c76fc3d 100644--- a/backend/store/worksheet.go+++ b/backend/store/worksheet.go@@ -129,13 +129,7 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage,return nil, errors.Wrapf(err, "failed to build sql")}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -181,9 +175,6 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage,if err := rows.Err(); err != nil {return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }return sheets, nil}