Skip to content

Commit

Permalink
Merge pull request #17 from Recidiviz/dan/invalid-view-query
Browse files Browse the repository at this point in the history
Return `invalidQuery` for invalid view queries
  • Loading branch information
ohaibbq committed May 22, 2024
2 parents c27caf6 + 095dc64 commit 609dd3b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -2692,12 +2692,12 @@ func (h *tablesInsertHandler) Handle(ctx context.Context, r *tablesInsertRequest
}
if r.table.Schema != nil {
if err := r.server.contentRepo.CreateTable(ctx, tx, r.table); err != nil {
return nil, errInternalError(err.Error())
return nil, errInvalidQuery(err.Error())
}
}
if r.table.View != nil {
if err := r.server.contentRepo.CreateView(ctx, tx, r.table); err != nil {
return nil, errInternalError(err.Error())
return nil, errInvalidQuery(err.Error())
}
}
if err := tx.Commit(); err != nil {
Expand Down
17 changes: 17 additions & 0 deletions server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,23 @@ func TestSimpleQuery(t *testing.T) {
t.Fatal("expected invalid query")
}
})

// Regression test for goccy/bigquery-emulator#316
t.Run("invalid query", func(t *testing.T) {
ctx := context.Background()
client.Dataset("test_ds").Create(ctx, &bigquery.DatasetMetadata{Name: "test_ds"})
err = client.Dataset("test_ds").Table("test_table").Create(ctx,
&bigquery.TableMetadata{
Description: "test!",
ViewQuery: "SELECT 1 AS A_FIELD, TEST~!",
})
if err == nil {
t.Fatal("Expected error, but got nil")
}
if !strings.HasSuffix(err.Error(), "invalidQuery") {
t.Fatal("expected invalid query")
}
})
}

func TestDataset(t *testing.T) {
Expand Down

0 comments on commit 609dd3b

Please sign in to comment.