Merge pull request #16 from Recidiviz/dan/invalid-query

Return `invalidQuery` to avoid Python SDK's default 10-minute retry for `internalError` responses
Recidiviz · May 22, 2024 · c27caf6 · c27caf6
2 parents c15346f + e151625
commit c27caf6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/server/handler.go b/server/handler.go
@@ -1065,7 +1065,7 @@ func (h *jobsInsertHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		job:     &job,
 	})
 	if err != nil {
-		errorResponse(ctx, w, errJobInternalError(err.Error()))
+		errorResponse(ctx, w, errInvalidQuery(err.Error()))
 		return
 	}
 	encodeResponse(ctx, w, res)
@@ -1758,7 +1758,7 @@ func (h *jobsQueryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		useInt64Timestamp: isFormatOptionsUseInt64Timestamp(r),
 	})
 	if err != nil {
-		errorResponse(ctx, w, errJobInternalError(err.Error()))
+		errorResponse(ctx, w, errInvalidQuery(err.Error()))
 		return
 	}
 	encodeResponse(ctx, w, res)

diff --git a/server/server_test.go b/server/server_test.go
@@ -116,6 +116,18 @@ func TestSimpleQuery(t *testing.T) {
 			t.Fatal("Failed to query null ARRAY")
 		}
 	})
+
+	// Regression test for goccy/bigquery-emulator#316
+	t.Run("invalid query", func(t *testing.T) {
+		query := client.Query("SELECT!;")
+		_, err := query.Read(ctx)
+		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) {