fix(bigquery): revert to useInt64Timestamp for REST format options (#13789)

kurochan · web-flow · commit bdcc2f8068e9 · 2026-02-05T14:36:54.000-08:00
Revert BigQuery REST format options to `useInt64Timestamp` to avoid the `timestamp_output_format is not supported yet` 400 ERRORs introduced in v1.73.0. Related: #13788
diff --git a/bigquery/iterator.go b/bigquery/iterator.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	defaultTimestampWireFormat string = "INT64"
+	defaultUseInt64Timestamp = true
 )
 
 // Construct a RowIterator.
@@ -294,7 +294,7 @@ func fetchTableResultPage(ctx context.Context, src *rowSource, schema Schema, st
 		}()
 	}
 	call := src.t.c.bqs.Tabledata.List(src.t.ProjectID, src.t.DatasetID, src.t.TableID)
-	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
+	call = call.FormatOptionsUseInt64Timestamp(defaultUseInt64Timestamp)
 	setClientHeader(call.Header())
 	if pageToken != "" {
 		call.PageToken(pageToken)
@@ -332,7 +332,7 @@ func fetchJobResultPage(ctx context.Context, src *rowSource, schema Schema, star
 	// reduce data transferred by leveraging api projections
 	projectedFields := []googleapi.Field{"rows", "pageToken", "totalRows"}
 	call := src.j.c.bqs.Jobs.GetQueryResults(src.j.projectID, src.j.jobID).Location(src.j.location).Context(ctx)
-	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
+	call = call.FormatOptionsUseInt64Timestamp(defaultUseInt64Timestamp)
 	if schema == nil {
 		// only project schema if we weren't supplied one.
 		projectedFields = append(projectedFields, "schema")
diff --git a/bigquery/job.go b/bigquery/job.go
@@ -353,7 +353,7 @@ func (j *Job) read(ctx context.Context, waitForQuery func(context.Context, strin
 func (j *Job) waitForQuery(ctx context.Context, projectID string) (Schema, uint64, error) {
 	// Use GetQueryResults only to wait for completion, not to read results.
 	call := j.c.bqs.Jobs.GetQueryResults(projectID, j.jobID).Location(j.location).Context(ctx).MaxResults(0)
-	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
+	call = call.FormatOptionsUseInt64Timestamp(defaultUseInt64Timestamp)
 	setClientHeader(call.Header())
 	backoff := gax.Backoff{
 		Initial:    50 * time.Millisecond,
diff --git a/bigquery/query.go b/bigquery/query.go
@@ -500,7 +500,7 @@ func (q *Query) probeFastPath() (*bq.QueryRequest, error) {
 		MaxSlots:           int64(q.MaxSlots),
 		Labels:             q.Labels,
 		FormatOptions: &bq.DataFormatOptions{
-			TimestampOutputFormat: defaultTimestampWireFormat,
+			UseInt64Timestamp: defaultUseInt64Timestamp,
 		},
 	}
 	if q.QueryConfig.DisableQueryCache {
diff --git a/bigquery/query_test.go b/bigquery/query_test.go
@@ -470,7 +470,7 @@ func TestProbeFastPath(t *testing.T) {
 				Query:        "foo",
 				UseLegacySql: &pfalse,
 				FormatOptions: &bq.DataFormatOptions{
-					TimestampOutputFormat: defaultTimestampWireFormat,
+					UseInt64Timestamp: defaultUseInt64Timestamp,
 				},
 			},
 		},
@@ -509,7 +509,7 @@ func TestProbeFastPath(t *testing.T) {
 				},
 				UseQueryCache: &pfalse,
 				FormatOptions: &bq.DataFormatOptions{
-					TimestampOutputFormat: defaultTimestampWireFormat,
+					UseInt64Timestamp: defaultUseInt64Timestamp,
 				},
 				Reservation: "reservation/1",
 				MaxSlots:    222,

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ func (q Query) probeFastPath() (bq.QueryRequest, error) {`
`500`	`500`	`MaxSlots: int64(q.MaxSlots),`
`501`	`501`	`Labels: q.Labels,`
`502`	`502`	`FormatOptions: &bq.DataFormatOptions{`
`503`		`- TimestampOutputFormat: defaultTimestampWireFormat,`
	`503`	`+ UseInt64Timestamp: defaultUseInt64Timestamp,`
`504`	`504`	`},`
`505`	`505`	`}`
`506`	`506`	`if q.QueryConfig.DisableQueryCache {`