[beam] branch master updated: [BEAM-12059] include literal T in DATETIME format

[pabloem]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 613d1c0  [BEAM-12059] include literal T in DATETIME format
     new 58e2ea9  Merge pull request #14351 from [BEAM-12059] include literal T 
in DATETIME format
613d1c0 is described below

commit 613d1c09809614d1c757dd89985c5fdfd2dbc51e
Author: MATTHEW Ouyang (LCL) <matthew.ouy...@loblaw.ca>
AuthorDate: Fri Mar 26 16:15:28 2021 -0400

    [BEAM-12059] include literal T in DATETIME format
    
    - fields of type DATETIME always return the T
    - DATETIME functions always provide the T
---
 .../java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java   | 2 +-
 .../org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtilsTest.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
index e3380ad..0e24653 100644
--- 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
+++ 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
@@ -160,7 +160,7 @@ public class BigQueryUtils {
   }
 
   private static final java.time.format.DateTimeFormatter 
BIGQUERY_DATETIME_FORMATTER =
-      java.time.format.DateTimeFormatter.ofPattern("uuuu-MM-dd 
HH:mm:ss[.SSSSSS]");
+      
java.time.format.DateTimeFormatter.ofPattern("uuuu-MM-dd'T'HH:mm:ss[.SSSSSS]");
 
   private static final DateTimeFormatter BIGQUERY_TIMESTAMP_PRINTER;
 
diff --git 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtilsTest.java
 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtilsTest.java
index d0d4c31..9d76649 100644
--- 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtilsTest.java
+++ 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtilsTest.java
@@ -275,7 +275,7 @@ public class BigQueryUtilsTest {
               "timestamp_variant4",
               String.valueOf(
                   new DateTime(123456L, 
ISOChronology.getInstanceUTC()).getMillis() / 1000.0D))
-          .set("datetime", "2020-11-02 12:34:56.789876")
+          .set("datetime", "2020-11-02T12:34:56.789876")
           .set("date", "2020-11-02")
           .set("time", "12:34:56.789876")
           .set("valid", "false")
@@ -488,7 +488,7 @@ public class BigQueryUtilsTest {
     assertThat(row.size(), equalTo(13));
     assertThat(row, hasEntry("id", "123"));
     assertThat(row, hasEntry("value", "123.456"));
-    assertThat(row, hasEntry("datetime", "2020-11-02 12:34:56.789876"));
+    assertThat(row, hasEntry("datetime", "2020-11-02T12:34:56.789876"));
     assertThat(row, hasEntry("date", "2020-11-02"));
     assertThat(row, hasEntry("time", "12:34:56.789876"));
     assertThat(row, hasEntry("name", "test"));
@@ -533,7 +533,7 @@ public class BigQueryUtilsTest {
     assertThat(row.size(), equalTo(13));
     assertThat(row, hasEntry("id", "123"));
     assertThat(row, hasEntry("value", "123.456"));
-    assertThat(row, hasEntry("datetime", "2020-11-02 12:34:56.789876"));
+    assertThat(row, hasEntry("datetime", "2020-11-02T12:34:56.789876"));
     assertThat(row, hasEntry("date", "2020-11-02"));
     assertThat(row, hasEntry("time", "12:34:56.789876"));
     assertThat(row, hasEntry("name", "test"));
@@ -551,7 +551,7 @@ public class BigQueryUtilsTest {
     assertThat(row.size(), equalTo(13));
     assertThat(row, hasEntry("id", "123"));
     assertThat(row, hasEntry("value", "123.456"));
-    assertThat(row, hasEntry("datetime", "2020-11-02 12:34:56.789876"));
+    assertThat(row, hasEntry("datetime", "2020-11-02T12:34:56.789876"));
     assertThat(row, hasEntry("date", "2020-11-02"));
     assertThat(row, hasEntry("time", "12:34:56.789876"));
     assertThat(row, hasEntry("name", "test"));