Add Escape option to QueryStringQuery

The QueryStringQuery has an Escape option in 2.x (missing in 1.x). It
is not documented, but available in the Java source.

Also added a test for the TimeZone option (see #247).

Author: olivere

CONTRIBUTORS

@@ -35,6 +35,7 @@ Ryan Schmukler [@rschmukler](https://github.com/rschmukler)
 Sacheendra talluri [@sacheendra](https://github.com/sacheendra)
 Sean DuBois [@Sean-Der](https://github.com/Sean-Der)
 Shalin LK [@shalinlk](https://github.com/shalinlk)
+Stephen Kubovic [@stephenkubovic](https://github.com/stephenkubovic)
 Stuart Warren [@Woz](https://github.com/stuart-warren)
 Sundar [@sundarv85](https://github.com/sundarv85)
 Tetsuya Morimoto [@t2y](https://github.com/t2y)

search_queries_query_string.go

@@ -41,6 +41,7 @@ type QueryStringQuery struct {
 	queryName                 string
 	timeZone                  string
 	maxDeterminizedStates     *int
+	escape                    *bool
 }
 
 // NewQueryStringQuery creates and initializes a new QueryStringQuery.
@@ -244,6 +245,12 @@ func (q *QueryStringQuery) TimeZone(timeZone string) *QueryStringQuery {
 	return q
 }
 
+// Escape performs escaping of the query string.
+func (q *QueryStringQuery) Escape(escape bool) *QueryStringQuery {
+	q.escape = &escape
+	return q
+}
+
 // Source returns JSON for the query.
 func (q *QueryStringQuery) Source() (interface{}, error) {
 	source := make(map[string]interface{})
@@ -344,6 +351,9 @@ func (q *QueryStringQuery) Source() (interface{}, error) {
 	if q.timeZone != "" {
 		query["time_zone"] = q.timeZone
 	}
+	if q.escape != nil {
+		query["escape"] = *q.escape
+	}
 
 	return source, nil
 }

search_queries_query_string_test.go

@@ -26,3 +26,21 @@ func TestQueryStringQuery(t *testing.T) {
 		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
 	}
 }
+
+func TestQueryStringQueryTimeZone(t *testing.T) {
+	q := NewQueryStringQuery(`tweet_date:[2015-01-01 TO 2017-12-31]`)
+	q = q.TimeZone("Europe/Berlin")
+	src, err := q.Source()
+	if err != nil {
+		t.Fatal(err)
+	}
+	data, err := json.Marshal(src)
+	if err != nil {
+		t.Fatalf("marshaling to JSON failed: %v", err)
+	}
+	got := string(data)
+	expected := `{"query_string":{"query":"tweet_date:[2015-01-01 TO 2017-12-31]","time_zone":"Europe/Berlin"}}`
+	if got != expected {
+		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
+	}
+}