re-use transaction when deleting dataset

Recidiviz · Apr 12, 2024 · 5dc4e1d · 5dc4e1d
1 parent bc3e29e
commit 5dc4e1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/metadata/repository.go b/internal/metadata/repository.go
@@ -778,6 +778,10 @@ func (r *Repository) FindTablesInDatasets(ctx context.Context, projectID, datase
 		return nil, err
 	}
 	defer tx.Commit()
+	return r.FindTablesInDatasetsWithConnection(ctx, tx, projectID, datasetID)
+}
+
+func (r *Repository) FindTablesInDatasetsWithConnection(ctx context.Context, tx *sql.Tx, projectID, datasetID string) ([]*Table, error) {
 	tablesByDataset, err := r.findTablesInDatasets(ctx, tx, projectID, []string{datasetID})
 	if err != nil {
 		return nil, err

diff --git a/server/handler.go b/server/handler.go
@@ -649,7 +649,7 @@ func (h *datasetsDeleteHandler) Handle(ctx context.Context, r *datasetsDeleteReq
 		return fmt.Errorf("failed to delete dataset: %w", err)
 	}
 	if r.deleteContents {
-		tables, err := r.dataset.Tables(ctx)
+		tables, err := r.server.metaRepo.FindTablesInDatasetsWithConnection(ctx, tx.Tx(), r.dataset.ProjectID, r.dataset.ID)
 		if err != nil {
 			return fmt.Errorf("failed to find tables in dataset: %w", err)
 		}