fix FORMAT in request body

collector.go

@@ -268,7 +268,11 @@ func (c *Collector) ParseQuery(queryString string, body string) (params string,
 // Parse - parsing text for query and data
 func (c *Collector) Parse(text string) (prefix string, content string) {
 	i := strings.Index(text, "FORMAT")
-	if i >= 0 {
+	k := strings.Index(text, "VALUES")
+	if k == -1 {
+		k = strings.Index(text, "values")
+	}
+	if i >= 0 && i < k {
 		w := false
 		off := -1
 		for c := i + 7; c < len(text); c++ {
@@ -285,13 +289,9 @@ func (c *Collector) Parse(text string) (prefix string, content string) {
 			content = text[off:]
 		}
 	} else {
-		i = strings.Index(text, "VALUES")
-		if i == -1 {
-			i = strings.Index(text, "values")
-		}
-		if i >= 0 {
-			prefix = strings.TrimSpace(text[:i+6])
-			content = strings.TrimSpace(text[i+6:])
+		if k >= 0 {
+			prefix = strings.TrimSpace(text[:k+6])
+			content = strings.TrimSpace(text[k+6:])
 		} else {
 			off := regexFormat.FindStringSubmatchIndex(text)
 			if len(off) > 3 {

collector_test.go

@@ -23,6 +23,9 @@ var escTitle = url.QueryEscape(qTitle)
 var escSelect = url.QueryEscape(qSelect)
 var escParamsAndSelect = qParams + "&query=" + escSelect
 
+var qFormatInQuotesQuery = "INSERT INTO test (date, args) VALUES"
+var qFormatInQuotesValues = "('2019-06-13', 'query=select%20args%20from%20test%20group%20by%20date%20FORMAT%20JSON')"
+
 func BenchmarkCollector_Push(t *testing.B) {
 	c := NewCollector(&fakeSender{}, 1000, 1000)
 	for i := 0; i < 30000; i++ {
@@ -120,6 +123,16 @@ func TestCollector_ParseQuery(t *testing.T) {
 	params, content, insert = c.ParseQuery(badEscQuery, qValuesTitleUpper+" "+qValuesContent)
 
 	assert.False(t, insert)
+
+	params, content, insert = c.ParseQuery("", qFormatInQuotesQuery+" "+qFormatInQuotesValues)
+	assert.Equal(t, "query="+url.QueryEscape(qFormatInQuotesQuery), params)
+	assert.Equal(t, qFormatInQuotesValues, content)
+	assert.Equal(t, true, insert)
+
+	params, content, insert = c.ParseQuery("query="+url.QueryEscape(qFormatInQuotesQuery+" "+qFormatInQuotesValues), "")
+	assert.Equal(t, "query="+url.QueryEscape(qFormatInQuotesQuery), params)
+	assert.Equal(t, qFormatInQuotesValues, content)
+	assert.Equal(t, true, insert)
 }
 
 func TestCollector_separateQuery(t *testing.T) {