test fix

goccy · Apr 14, 2024 · d62cb11 · d62cb11
1 parent fa9d0a3
commit d62cb11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/internal/metadata/project.go b/internal/metadata/project.go
@@ -86,14 +86,14 @@ func (p *Project) AddDataset(ctx context.Context, tx *sql.Tx, dataset *Dataset)
  return nil
 }
 
-func (p *Project) DeleteDataset(ctx context.Context, tx *sql.Tx, id string) error {
+func (p *Project) DeleteDataset(ctx context.Context, tx *sql.Tx, id string, inUseOk bool) error {
  p.mu.Lock()
  defer p.mu.Unlock()
  dataset, exists := p.datasetMap[id]
  if !exists {
  return fmt.Errorf("dataset '%s' is not found in project '%s'", id, p.ID)
  }
- if len(dataset.TableIDs()) > 0 {
+ if !inUseOk && len(dataset.TableIDs()) > 0 {
  return fmt.Errorf("dataset %s: %w", id, ErrDatasetInUse)
  }
  if err := dataset.Delete(ctx, tx); err != nil {

diff --git a/server/handler.go b/server/handler.go
@@ -619,7 +619,7 @@ func (h *datasetsDeleteHandler) Handle(ctx context.Context, r *datasetsDeleteReq
  return fmt.Errorf("failed to start transaction: %w", err)
  }
  defer tx.RollbackIfNotCommitted()
- if err := r.project.DeleteDataset(ctx, tx.Tx(), r.dataset.ID); err != nil {
+ if err := r.project.DeleteDataset(ctx, tx.Tx(), r.dataset.ID, r.deleteContents); err != nil {
  return fmt.Errorf("failed to delete dataset: %w", err)
  }
  if r.deleteContents {

diff --git a/server/server_test.go b/server/server_test.go
@@ -53,7 +53,7 @@ func TestSimpleQuery(t *testing.T) {
  t.Fatal(err)
  }
  project := types.NewProject("test")
- if err := bqServer.Load(server.StructSource()); err != nil {
+ if err := bqServer.Load(server.StructSource(project)); err != nil {
  t.Fatal(err)
  }
  testServer := bqServer.TestServer()