---

Praful Makani · sduskis · commit 1187f6fb0fe4 · 2019-02-19T15:41:18.000-05:00
yaml --- r: 13417 b: refs/heads/master c: 3bfe25e h: refs/heads/master i: 13415: e40f792
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 344fdac3aff9dad6052fec9ccde3085bb42e55b6
+refs/heads/master: 3bfe25e44ed85a95c3a943647df23144223cd06e
 refs/heads/gh-pages: b3b44c7d6a577a86c1df125085c5ceff8180a910
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
@@ -25,6 +25,7 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.threeten.bp.Instant;
@@ -256,6 +257,8 @@ private static <T> StandardSQLTypeName classToType(Class<T> type) {
       return StandardSQLTypeName.FLOAT64;
     } else if (BigDecimal.class.isAssignableFrom(type)) {
       return StandardSQLTypeName.NUMERIC;
+    } else if (Date.class.isAssignableFrom(type)) {
+      return StandardSQLTypeName.DATE;
     }
     throw new IllegalArgumentException("Unsupported object type for QueryParameter: " + type);
   }
@@ -310,6 +313,9 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)
           // verify that the String is in the right format
           checkFormat(value, dateFormatter);
           return (String) value;
+        } else if (value instanceof Date) {
+          com.google.cloud.Date date = com.google.cloud.Date.fromJavaUtilDate((Date) value);
+          return date.toString();
         }
         break;
       case TIME:
diff --git a/trunk/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java b/trunk/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
@@ -20,6 +20,8 @@
 
 import com.google.api.services.bigquery.model.QueryParameterType;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 import org.junit.Test;
 
@@ -204,6 +206,17 @@ public void testDate() {
     assertThat(value.getArrayValues()).isNull();
   }
 
+  @Test
+  public void testStandardDate() throws ParseException {
+    com.google.cloud.Date gcDate = com.google.cloud.Date.parseDate("2016-09-18");
+    Date date = com.google.cloud.Date.toJavaUtilDate(gcDate);
+    QueryParameterValue value = QueryParameterValue.of(date, Date.class);
+    assertThat(value.getValue()).isEqualTo("2016-09-18");
+    assertThat(value.getType()).isEqualTo(StandardSQLTypeName.DATE);
+    assertThat(value.getArrayType()).isNull();
+    assertThat(value.getArrayValues()).isNull();
+  }
+
   @Test(expected = IllegalArgumentException.class)
   public void testInvalidDate() {
     // not supposed to have the time
