Add date, datetime, and datetime with seconds parameters

Author: pietern

sqlanalytics/api/query.go

@@ -74,6 +74,12 @@ func (o *QueryOptions) UnmarshalJSON(b []byte) error {
 			i = &QueryParameterEnum{}
 		case "query":
 			i = &QueryParameterQuery{}
+		case "date":
+			i = &QueryParameterDate{}
+		case "datetime-local":
+			i = &QueryParameterDateTime{}
+		case "datetime-with-seconds":
+			i = &QueryParameterDateTimeSec{}
 		default:
 			panic("don't know what to do...")
 		}
@@ -163,3 +169,45 @@ func (p QueryParameterQuery) MarshalJSON() ([]byte, error) {
 	type localQueryParameter QueryParameterQuery
 	return json.Marshal((localQueryParameter)(p))
 }
+
+// QueryParameterDate ...
+type QueryParameterDate struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDate) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = "date"
+	type localQueryParameter QueryParameterDate
+	return json.Marshal((localQueryParameter)(p))
+}
+
+// QueryParameterDateTime ...
+type QueryParameterDateTime struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDateTime) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = "datetime-local"
+	type localQueryParameter QueryParameterDateTime
+	return json.Marshal((localQueryParameter)(p))
+}
+
+// QueryParameterDateTimeSec ...
+type QueryParameterDateTimeSec struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDateTimeSec) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = "datetime-with-seconds"
+	type localQueryParameter QueryParameterDateTimeSec
+	return json.Marshal((localQueryParameter)(p))
+}

sqlanalytics/resource_query.go

@@ -35,10 +35,13 @@ type QueryParameter struct {
 
 	// Type specific structs.
 	// Only one of them may be set.
-	Text   *QueryParameterText   `json:"text,omitempty"`
-	Number *QueryParameterNumber `json:"number,omitempty"`
-	Enum   *QueryParameterEnum   `json:"enum,omitempty"`
-	Query  *QueryParameterQuery  `json:"query,omitempty"`
+	Text        *QueryParameterText        `json:"text,omitempty"`
+	Number      *QueryParameterNumber      `json:"number,omitempty"`
+	Enum        *QueryParameterEnum        `json:"enum,omitempty"`
+	Query       *QueryParameterQuery       `json:"query,omitempty"`
+	Date        *QueryParameterDate        `json:"date,omitempty"`
+	DateTime    *QueryParameterDateTime    `json:"datetime,omitempty"`
+	DateTimeSec *QueryParameterDateTimeSec `json:"datetimesec,omitempty"`
 }
 
 // QueryParameterText ...
@@ -65,6 +68,21 @@ type QueryParameterQuery struct {
 	Multiple *QueryParameterAllowMultiple `json:"multiple,omitempty"`
 }
 
+// QueryParameterDate ...
+type QueryParameterDate struct {
+	Value string `json:"value"`
+}
+
+// QueryParameterDateTime ...
+type QueryParameterDateTime struct {
+	Value string `json:"value"`
+}
+
+// QueryParameterDateTimeSec ...
+type QueryParameterDateTimeSec struct {
+	Value string `json:"value"`
+}
+
 // QueryParameterAllowMultiple ...
 type QueryParameterAllowMultiple struct {
 	Prefix    string `json:"prefix"`
@@ -162,6 +180,21 @@ func (r *queryResource) toAPIObject(d *schema.ResourceData) (*api.Query, error)
 					tmp.Multi = p.Query.Multiple.toAPIObject()
 				}
 				iface = tmp
+			case p.Date != nil:
+				iface = api.QueryParameterDate{
+					QueryParameter: ap,
+					Value:          p.Date.Value,
+				}
+			case p.DateTime != nil:
+				iface = api.QueryParameterDateTime{
+					QueryParameter: ap,
+					Value:          p.DateTime.Value,
+				}
+			case p.DateTimeSec != nil:
+				iface = api.QueryParameterDateTimeSec{
+					QueryParameter: ap,
+					Value:          p.DateTimeSec.Value,
+				}
 			default:
 				log.Fatalf("Don't know what to do for QueryParameter...")
 			}
@@ -225,6 +258,24 @@ func (r *queryResource) fromAPIObject(aq *api.Query, d *schema.ResourceData) err
 					QueryID:  apv.QueryID,
 					Multiple: newQueryParameterAllowMultiple(apv.Multi),
 				}
+			case *api.QueryParameterDate:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.Date = &QueryParameterDate{
+					Value: apv.Value,
+				}
+			case *api.QueryParameterDateTime:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.DateTime = &QueryParameterDateTime{
+					Value: apv.Value,
+				}
+			case *api.QueryParameterDateTimeSec:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.DateTimeSec = &QueryParameterDateTimeSec{
+					Value: apv.Value,
+				}
 			default:
 				log.Fatalf("Don't know what to do for type: %#v", reflect.TypeOf(apv).String())
 			}

sqlanalytics/resource_query_test.go

@@ -190,6 +190,21 @@ func TestQueryUpdateWithParams(t *testing.T) {
 					QueryID: "abc",
 					Multi:   nil,
 				},
+				api.QueryParameterDate{
+					QueryParameter: api.QueryParameter{
+						Name: "5",
+					},
+				},
+				api.QueryParameterDateTime{
+					QueryParameter: api.QueryParameter{
+						Name: "6",
+					},
+				},
+				api.QueryParameterDateTimeSec{
+					QueryParameter: api.QueryParameter{
+						Name: "7",
+					},
+				},
 			},
 		},
 	}
@@ -280,6 +295,27 @@ func TestQueryUpdateWithParams(t *testing.T) {
 					}
 				}
 			}
+
+			parameter {
+				name = "5"
+				date {
+					value = ""
+				}
+			}
+
+			parameter {
+				name = "6"
+				datetime {
+					value = ""
+				}
+			}
+
+			parameter {
+				name = "7"
+				datetimesec {
+					value = ""
+				}
+			}
 		`,
 	}.Apply(t)
 
@@ -289,7 +325,7 @@ func TestQueryUpdateWithParams(t *testing.T) {
 	assert.Equal(t, "xyz", d.Get("data_source_id"))
 	assert.Equal(t, "Updated name", d.Get("name"))
 	assert.Equal(t, "SELECT 1, 2, 3, 4", d.Get("query"))
-	assert.Len(t, d.Get("parameter").([]interface{}), 6)
+	assert.Len(t, d.Get("parameter").([]interface{}), 9)
 }
 
 func TestQueryDelete(t *testing.T) {