Merge pull request #45 from runreveal/ej/project-bugfix

Fix project, minor parsing bug.

parser/parser.go

@@ -396,9 +396,12 @@ func (p *parser) projectOperator(pipe, keyword Token) (*ProjectOperator, error)
 				return op, makeErrorOpaque(err)
 			}
 			sep, ok = p.next()
-			if !ok || sep.Kind != TokenComma {
+			if !ok {
 				return op, nil
 			}
+			if sep.Kind != TokenComma {
+				return op, fmt.Errorf("expected ',' or EOF, got %s", formatToken(p.source, sep))
+			}
 		default:
 			p.prev()
 			return op, nil

parser/parser_test.go

@@ -1104,6 +1104,42 @@ var parserTests = []struct {
 			},
 		},
 	},
+	{
+		name:  "ProjectError",
+		query: "StormEvents | project EventId=1 State",
+		err:   true,
+		want: &TabularExpr{
+			Source: &TableRef{
+				Table: &Ident{
+					Name:     "StormEvents",
+					NameSpan: newSpan(0, 11),
+				},
+			},
+			Operators: []TabularOperator{
+				&ProjectOperator{
+					Pipe:    newSpan(12, 13),
+					Keyword: newSpan(14, 21),
+					Cols: []*ProjectColumn{
+						{
+							Name: &Ident{
+								Name:     "EventId",
+								NameSpan: newSpan(22, 29),
+							},
+							Assign: Span{
+								Start: 29,
+								End:   30,
+							},
+							X: &BasicLit{
+								Kind:      TokenNumber,
+								Value:     "1",
+								ValueSpan: newSpan(30, 31),
+							},
+						},
+					},
+				},
+			},
+		},
+	},
 	{
 		name:  "ProjectExpr",
 		query: "StormEvents | project TotalInjuries = InjuriesDirect + InjuriesIndirect",