Add range variants of datetime parameters

Author: pietern

sqlanalytics/api/query.go

@@ -80,6 +80,12 @@ func (o *QueryOptions) UnmarshalJSON(b []byte) error {
 			i = &QueryParameterDateTime{}
 		case queryParameterDateTimeSecTypeName:
 			i = &QueryParameterDateTimeSec{}
+		case queryParameterDateRangeTypeName:
+			i = &QueryParameterDateRange{}
+		case queryParameterDateTimeRangeTypeName:
+			i = &QueryParameterDateTimeRange{}
+		case queryParameterDateTimeSecRangeTypeName:
+			i = &QueryParameterDateTimeSecRange{}
 		default:
 			panic("don't know what to do...")
 		}
@@ -105,13 +111,16 @@ type QueryParameter struct {
 
 // Valid type values.
 const (
-	queryParameterTextTypeName        = "text"
-	queryParameterNumberTypeName      = "number"
-	queryParameterEnumTypeName        = "enum"
-	queryParameterQueryTypeName       = "query"
-	queryParameterDateTypeName        = "date"
-	queryParameterDateTimeTypeName    = "datetime-local"
-	queryParameterDateTimeSecTypeName = "datetime-with-seconds"
+	queryParameterTextTypeName             = "text"
+	queryParameterNumberTypeName           = "number"
+	queryParameterEnumTypeName             = "enum"
+	queryParameterQueryTypeName            = "query"
+	queryParameterDateTypeName             = "date"
+	queryParameterDateTimeTypeName         = "datetime-local"
+	queryParameterDateTimeSecTypeName      = "datetime-with-seconds"
+	queryParameterDateRangeTypeName        = "date-range"
+	queryParameterDateTimeRangeTypeName    = "datetime-range"
+	queryParameterDateTimeSecRangeTypeName = "datetime-range-with-seconds"
 )
 
 // QueryParameterText ...
@@ -222,3 +231,45 @@ func (p QueryParameterDateTimeSec) MarshalJSON() ([]byte, error) {
 	type localQueryParameter QueryParameterDateTimeSec
 	return json.Marshal((localQueryParameter)(p))
 }
+
+// QueryParameterDateRange ...
+type QueryParameterDateRange struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDateRange) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = queryParameterDateRangeTypeName
+	type localQueryParameter QueryParameterDateRange
+	return json.Marshal((localQueryParameter)(p))
+}
+
+// QueryParameterDateTimeRange ...
+type QueryParameterDateTimeRange struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDateTimeRange) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = queryParameterDateTimeRangeTypeName
+	type localQueryParameter QueryParameterDateTimeRange
+	return json.Marshal((localQueryParameter)(p))
+}
+
+// QueryParameterDateTimeSecRange ...
+type QueryParameterDateTimeSecRange struct {
+	QueryParameter
+
+	Value string `json:"value"`
+}
+
+// MarshalJSON sets the type before marshaling.
+func (p QueryParameterDateTimeSecRange) MarshalJSON() ([]byte, error) {
+	p.QueryParameter.Type = queryParameterDateTimeSecRangeTypeName
+	type localQueryParameter QueryParameterDateTimeSecRange
+	return json.Marshal((localQueryParameter)(p))
+}

sqlanalytics/resource_query.go

@@ -35,13 +35,16 @@ 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"`
-	Date        *QueryParameterDate        `json:"date,omitempty"`
-	DateTime    *QueryParameterDateTime    `json:"datetime,omitempty"`
-	DateTimeSec *QueryParameterDateTimeSec `json:"datetimesec,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"`
+	DateRange        *QueryParameterDateRange        `json:"date_range,omitempty"`
+	DateTimeRange    *QueryParameterDateTimeRange    `json:"datetime_range,omitempty"`
+	DateTimeSecRange *QueryParameterDateTimeSecRange `json:"datetimesec_range,omitempty"`
 }
 
 // QueryParameterText ...
@@ -83,6 +86,21 @@ type QueryParameterDateTimeSec struct {
 	Value string `json:"value"`
 }
 
+// QueryParameterDateRange ...
+type QueryParameterDateRange struct {
+	Value string `json:"value"`
+}
+
+// QueryParameterDateTimeRange ...
+type QueryParameterDateTimeRange struct {
+	Value string `json:"value"`
+}
+
+// QueryParameterDateTimeSecRange ...
+type QueryParameterDateTimeSecRange struct {
+	Value string `json:"value"`
+}
+
 // QueryParameterAllowMultiple ...
 type QueryParameterAllowMultiple struct {
 	Prefix    string `json:"prefix"`
@@ -195,6 +213,21 @@ func (r *queryResource) toAPIObject(d *schema.ResourceData) (*api.Query, error)
 					QueryParameter: ap,
 					Value:          p.DateTimeSec.Value,
 				}
+			case p.DateRange != nil:
+				iface = api.QueryParameterDateRange{
+					QueryParameter: ap,
+					Value:          p.DateRange.Value,
+				}
+			case p.DateTimeRange != nil:
+				iface = api.QueryParameterDateTimeRange{
+					QueryParameter: ap,
+					Value:          p.DateTimeRange.Value,
+				}
+			case p.DateTimeSecRange != nil:
+				iface = api.QueryParameterDateTimeSecRange{
+					QueryParameter: ap,
+					Value:          p.DateTimeSecRange.Value,
+				}
 			default:
 				log.Fatalf("Don't know what to do for QueryParameter...")
 			}
@@ -276,6 +309,24 @@ func (r *queryResource) fromAPIObject(aq *api.Query, d *schema.ResourceData) err
 				p.DateTimeSec = &QueryParameterDateTimeSec{
 					Value: apv.Value,
 				}
+			case *api.QueryParameterDateRange:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.DateRange = &QueryParameterDateRange{
+					Value: apv.Value,
+				}
+			case *api.QueryParameterDateTimeRange:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.DateTimeRange = &QueryParameterDateTimeRange{
+					Value: apv.Value,
+				}
+			case *api.QueryParameterDateTimeSecRange:
+				p.Name = apv.Name
+				p.Title = apv.Title
+				p.DateTimeSecRange = &QueryParameterDateTimeSecRange{
+					Value: apv.Value,
+				}
 			default:
 				log.Fatalf("Don't know what to do for type: %#v", reflect.TypeOf(apv).String())
 			}

sqlanalytics/resource_query_test.go

@@ -205,6 +205,21 @@ func TestQueryUpdateWithParams(t *testing.T) {
 						Name: "7",
 					},
 				},
+				api.QueryParameterDateRange{
+					QueryParameter: api.QueryParameter{
+						Name: "8",
+					},
+				},
+				api.QueryParameterDateTimeRange{
+					QueryParameter: api.QueryParameter{
+						Name: "9",
+					},
+				},
+				api.QueryParameterDateTimeSecRange{
+					QueryParameter: api.QueryParameter{
+						Name: "10",
+					},
+				},
 			},
 		},
 	}
@@ -316,6 +331,27 @@ func TestQueryUpdateWithParams(t *testing.T) {
 					value = ""
 				}
 			}
+
+			parameter {
+				name = "8"
+				date_range {
+					value = ""
+				}
+			}
+
+			parameter {
+				name = "9"
+				datetime_range {
+					value = ""
+				}
+			}
+
+			parameter {
+				name = "10"
+				datetimesec_range {
+					value = ""
+				}
+			}
 		`,
 	}.Apply(t)
 
@@ -325,7 +361,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{}), 9)
+	assert.Len(t, d.Get("parameter").([]interface{}), 12)
 }
 
 func TestQueryDelete(t *testing.T) {