Merge pull request #9443 from influxdata/js-9273-reduce-field-express…

…ions

Fix regression when math between literals is used in a field

query/compile.go

@@ -195,12 +195,15 @@ func (c *compiledStatement) compileFields(stmt *influxql.SelectStatement) error
 
 		// Append this field to the list of processed fields and compile it.
 		field := &compiledField{
-			global:        c,
-			Field:         f,
+			global: c,
+			Field: &influxql.Field{
+				Expr:  influxql.Reduce(f.Expr, nil),
+				Alias: f.Alias,
+			},
 			AllowWildcard: true,
 		}
 		c.Fields = append(c.Fields, field)
-		if err := field.compileExpr(f.Expr); err != nil {
+		if err := field.compileExpr(field.Field.Expr); err != nil {
 			return err
 		}
 	}

query/compile_test.go

@@ -81,6 +81,7 @@ func TestCompile_Success(t *testing.T) {
 		`SELECT value FROM cpu WHERE time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T01:00:00Z'`,
 		`SELECT value FROM (SELECT value FROM cpu) ORDER BY time DESC`,
 		`SELECT count(distinct(value)), max(value) FROM cpu`,
+		`SELECT last(value) / (1 - 0) FROM cpu`,
 	} {
 		t.Run(tt, func(t *testing.T) {
 			stmt, err := influxql.ParseStatement(tt)