From 8bc8368c578bbfef22d66fa8ea845db78e3036d8 Mon Sep 17 00:00:00 2001
From: Maxton Huff <maxton.huff@molecula.com>
Date: Fri, 26 Feb 2021 12:58:59 -0600
Subject: [PATCH] change test arguments to be appropriate

---
 pql/ast.go         | 15 ++++++++++++---
 pql/pqlpeg_test.go | 14 ++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pql/ast.go b/pql/ast.go
index a4b80f4ae..9c844fa5c 100644
--- a/pql/ast.go
+++ b/pql/ast.go
@@ -63,7 +63,11 @@ func (q *Query) lastCallStackElem() *callStackElem {
 }
 
 func (q *Query) addPosNum(key, value string) {
-	q.addField(key)
+	if key == "field" {
+		q.addField("_field")
+	} else {
+		q.addField(key)
+	}
 	q.addNumVal(value)
 }
 
@@ -431,8 +435,13 @@ var callInfoByFunc = map[string]callInfo{
 		},
 	},
 
-	// things that take _field
-	"TopN": allowUnderField,
+	"TopN": {
+		allowUnknown: true,
+		prototypes: map[string]interface{}{
+			"_field": "",
+			"field":  "",
+		},
+	},
 	// special cases:
 	"Clear": {
 		allowUnknown: true,
diff --git a/pql/pqlpeg_test.go b/pql/pqlpeg_test.go
index bbac8337e..da49b8c39 100644
--- a/pql/pqlpeg_test.go
+++ b/pql/pqlpeg_test.go
@@ -427,12 +427,12 @@ func TestPQLDeepEquality(t *testing.T) {
 			}},
 		{
 			name: "TopK",
-			call: "TopK(myfield, Row(), a=7)",
+			call: "TopK(myfield, Row()), k=7",
 			exp: &Call{
 				Name: "TopK",
 				Args: map[string]interface{}{
-					"a":      int64(7),
 					"_field": "myfield",
+					"k":      int64(7),
 				},
 				Children: []*Call{
 					{Name: "Row"},
@@ -440,12 +440,12 @@ func TestPQLDeepEquality(t *testing.T) {
 			}},
 		{
 			name: "TopKWithField=",
-			call: "TopK(field=myfield, Row(), a=7)",
+			call: "TopK(field=myfield, Row(), k=7)",
 			exp: &Call{
 				Name: "TopK",
 				Args: map[string]interface{}{
-					"a":      int64(7),
 					"_field": "myfield",
+					"k":      int64(7),
 				},
 				Children: []*Call{
 					{Name: "Row"},
@@ -453,24 +453,22 @@ func TestPQLDeepEquality(t *testing.T) {
 			}},
 		{
 			name: "Rows",
-			call: "Rows(myfield, 9, z=4)",
+			call: "Rows(myfield, z=4)",
 			exp: &Call{
 				Name: "Rows",
 				Args: map[string]interface{}{
 					"z":      int64(4),
 					"_field": "myfield",
-					"_row":   int64(9),
 				},
 			}},
 		{
 			name: "RowsWithField=",
-			call: "Rows(field=myfield, 9, z=4)",
+			call: "Rows(field=myfield, z=4)",
 			exp: &Call{
 				Name: "Rows",
 				Args: map[string]interface{}{
 					"z":      int64(4),
 					"_field": "myfield",
-					"_row":   int64(9),
 				},
 			}},
 		{