Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(store): remove unnecessary single-operation transactions (#19071)

p0ny1e719462d817
diff --git a/backend/store/database.go b/backend/store/database.go
index 8d062415b1..86bf4c99c4 100644
--- a/backend/store/database.go
+++ b/backend/store/database.go
@@ -418,17 +418,7 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseM
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
diff --git a/backend/store/db_schema.go b/backend/store/db_schema.go
index 25f9706104..1fbd5cabd1 100644
--- a/backend/store/db_schema.go
+++ b/backend/store/db_schema.go
@@ -122,14 +122,8 @@ func (s *Store) UpsertDBSchema(
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
var metadata, schema, config []byte
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&metadata,
&schema,
&config,
@@ -137,10 +131,6 @@ func (s *Store) UpsertDBSchema(
return err
}
- if err := tx.Commit(); err != nil {
- return err
- }
-
s.dbSchemaCache.Remove(getDBSchemaCacheKey(instanceID, databaseName))
return nil
@@ -167,16 +157,7 @@ func (s *Store) UpdateDBSchema(ctx context.Context, instanceID, databaseName str
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
diff --git a/backend/store/export_archive.go b/backend/store/export_archive.go
index be2b2a655f..7d91ef45af 100644
--- a/backend/store/export_archive.go
+++ b/backend/store/export_archive.go
@@ -124,15 +124,7 @@ func (s *Store) CreateExportArchive(ctx context.Context, create *ExportArchiveMe
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&create.UID); err != nil {
- return nil, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&create.UID); err != nil {
return nil, err
}
@@ -147,17 +139,11 @@ func (s *Store) DeleteExportArchive(ctx context.Context, uid int) error {
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
- return tx.Commit()
+ return nil
}
// DeleteExpiredExportArchives deletes export archives older than the specified retention period.
diff --git a/backend/store/idp.go b/backend/store/idp.go
index 2e1718b251..d96e12c320 100644
--- a/backend/store/idp.go
+++ b/backend/store/idp.go
@@ -51,12 +51,6 @@ type UpdateIdentityProviderMessage struct {
// CreateIdentityProvider creates an identity provider.
func (s *Store) CreateIdentityProvider(ctx context.Context, create *IdentityProviderMessage) (*IdentityProviderMessage, error) {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
identityProvider := &IdentityProviderMessage{
ResourceID: create.ResourceID,
Title: create.Title,
@@ -80,16 +74,12 @@ func (s *Store) CreateIdentityProvider(ctx context.Context, create *IdentityProv
VALUES (?, ?, ?, ?, ?)
`, create.ResourceID, create.Title, create.Domain, create.Type.String(), configBytes)
- sql, args, err := q.ToSQL()
+ query, args, err := q.ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
- if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return nil, err
}
@@ -253,22 +243,16 @@ func (*Store) updateIdentityProviderImpl(ctx context.Context, txn *sql.Tx, patch
}
func (s *Store) DeleteIdentityProvider(ctx context.Context, resourceID string) error {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
q := qb.Q().Space("DELETE FROM idp WHERE resource_id = ?", resourceID)
- sql, args, err := q.ToSQL()
+ query, args, err := q.ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
}
- if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
- return tx.Commit()
+ return nil
}
func convertIdentityProviderType(identityProviderType string) storepb.IdentityProviderType {
diff --git a/backend/store/policy.go b/backend/store/policy.go
index 3fed09ff4e..898cc0b704 100644
--- a/backend/store/policy.go
+++ b/backend/store/policy.go
@@ -609,19 +609,13 @@ func (s *Store) UpdatePolicy(ctx context.Context, patch *UpdatePolicyMessage) (*
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
policy := &PolicyMessage{
Resource: patch.Resource,
ResourceType: patch.ResourceType,
Type: patch.Type,
}
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&policy.Payload,
&policy.InheritFromParent,
&policy.Enforce,
@@ -633,10 +627,6 @@ func (s *Store) UpdatePolicy(ctx context.Context, patch *UpdatePolicyMessage) (*
return nil, err
}
- if err := tx.Commit(); err != nil {
- return nil, err
- }
-
s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)
return policy, nil
@@ -655,17 +645,7 @@ func (s *Store) DeletePolicy(ctx context.Context, policy *PolicyMessage) error {
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
diff --git a/backend/store/release.go b/backend/store/release.go
index e31a26c6e8..f4ee6da3c3 100644
--- a/backend/store/release.go
+++ b/backend/store/release.go
@@ -253,20 +253,10 @@ func (s *Store) UpdateRelease(ctx context.Context, update *UpdateReleaseMessage)
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return nil, errors.Wrapf(err, "failed to query row")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit tx")
- }
-
return s.GetRelease(ctx, &FindReleaseMessage{
ProjectID: &update.ProjectID,
ReleaseID: &update.ReleaseID,
@@ -283,13 +273,7 @@ func (s *Store) ListReleaseCategories(ctx context.Context, projectID string) ([]
ORDER BY category ASC
`
- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})
- if err != nil {
- return nil, errors.Wrapf(err, "failed to begin tx")
- }
- defer tx.Rollback()
-
- rows, err := tx.QueryContext(ctx, query, projectID)
+ rows, err := s.GetDB().QueryContext(ctx, query, projectID)
if err != nil {
return nil, errors.Wrapf(err, "failed to query rows")
}
@@ -308,9 +292,5 @@ func (s *Store) ListReleaseCategories(ctx context.Context, projectID string) ([]
return nil, errors.Wrapf(err, "rows err")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit tx")
- }
-
return categories, nil
}
diff --git a/backend/store/review_config.go b/backend/store/review_config.go
index 951980ba1b..de42fcc2b1 100644
--- a/backend/store/review_config.go
+++ b/backend/store/review_config.go
@@ -138,21 +138,12 @@ func (s *Store) CreateReviewConfig(ctx context.Context, create *ReviewConfigMess
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
if err == sql.ErrNoRows {
return nil, common.FormatDBErrorEmptyRowWithQuery(query)
}
return nil, err
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
- }
create.Enforce = true
@@ -168,17 +159,11 @@ func (s *Store) DeleteReviewConfig(ctx context.Context, id string) error {
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
- defer tx.Rollback()
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return err
- }
-
- return tx.Commit()
+ return nil
}
// UpdateReviewConfig updates the sql review.
@@ -217,16 +202,10 @@ func (s *Store) UpdateReviewConfig(ctx context.Context, patch *PatchReviewConfig
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
var sqlReview ReviewConfigMessage
var payload []byte
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&sqlReview.ID,
&sqlReview.Enforce,
&sqlReview.Name,
@@ -245,9 +224,5 @@ func (s *Store) UpdateReviewConfig(ctx context.Context, patch *PatchReviewConfig
sqlReview.Payload = reviewConfigPyload
- if err := tx.Commit(); err != nil {
- return nil, err
- }
-
return &sqlReview, nil
}
diff --git a/backend/store/revision.go b/backend/store/revision.go
index bebb1c67ab..effb5070c0 100644
--- a/backend/store/revision.go
+++ b/backend/store/revision.go
@@ -181,14 +181,8 @@ func (s *Store) CreateRevision(ctx context.Context, revision *RevisionMessage) (
return nil, errors.Wrapf(err, "failed to marshal revision payload")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to begin tx")
- }
- defer tx.Rollback()
-
var id int64
- if err := tx.QueryRowContext(ctx, query,
+ if err := s.GetDB().QueryRowContext(ctx, query,
revision.InstanceID,
revision.DatabaseName,
revision.Version,
@@ -197,10 +191,6 @@ func (s *Store) CreateRevision(ctx context.Context, revision *RevisionMessage) (
return nil, errors.Wrapf(err, "failed to query and scan")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit tx")
- }
-
revision.UID = id
return revision, nil
@@ -212,19 +202,9 @@ func (s *Store) DeleteRevision(ctx context.Context, uid int64, instanceID, datab
SET deleter = $1, deleted_at = now()
WHERE id = $2 AND instance = $3 AND db_name = $4`
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return errors.Wrapf(err, "failed to begin tx")
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, deleter, uid, instanceID, databaseName); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, deleter, uid, instanceID, databaseName); err != nil {
return errors.Wrapf(err, "failed to exec")
}
- if err := tx.Commit(); err != nil {
- return errors.Wrapf(err, "failed to commit tx")
- }
-
return nil
}
diff --git a/backend/store/setting.go b/backend/store/setting.go
index 19072562a9..71c376a76f 100644
--- a/backend/store/setting.go
+++ b/backend/store/setting.go
@@ -312,16 +312,10 @@ func (s *Store) UpsertSetting(ctx context.Context, update *SettingMessage) (*Set
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrap(err, "failed to begin transaction")
- }
- defer tx.Rollback()
-
var setting SettingMessage
var nameString string
var valueString string
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&nameString,
&valueString,
); err != nil {
@@ -345,9 +339,6 @@ func (s *Store) UpsertSetting(ctx context.Context, update *SettingMessage) (*Set
}
setting.Value = msg
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrap(err, "failed to commit transaction")
- }
s.settingCache.Add(setting.Name, &setting)
return &setting, nil
}
@@ -360,20 +351,10 @@ func (s *Store) DeleteSetting(ctx context.Context, name storepb.SettingName) err
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return errors.Wrap(err, "failed to begin transaction")
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
- if err := tx.Commit(); err != nil {
- return errors.Wrap(err, "failed to commit transaction")
- }
-
s.settingCache.Remove(name)
return nil
}