Add checking that subquery on select clause is not allowed with aggregation query

Author: shellyln

soql/parser/parser_test.go

@@ -200,6 +200,129 @@ func TestParse2(t *testing.T) {
 				con.Name = acc.Name
 				and
 				LEN(con.Name) > 0
+			ORDER BY
+			    acc.Name desc nulls last
+			  --, acc.Id desc nulls last
+			  , xid
+			  , con.Name
+			OFFSET 1000 LIMIT 100
+			FOR update viewstat, tracking
+		`},
+		want:    nil,
+		wantErr: false,
+	}}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.dbgBreak {
+				t.Log("debug")
+			}
+
+			got, err := parser.Parse(tt.args.s)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Parse() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if err != nil {
+				return
+			}
+
+			{
+				s := got.Meta.ElapsedTime.String()
+				t.Log(s)
+			}
+
+			if !reflect.DeepEqual(got, tt.want) {
+				// t.Errorf("Parse() = %v, want %v", got, tt.want)
+				// return
+				t.Logf("Parse() = %v, want %v", got, tt.want)
+			}
+
+			jsonBytes1, err := json.Marshal(got)
+			if err != nil {
+				t.Errorf("json.Marshal() (1) error = %v", err)
+				return
+			}
+			var unmarshal1 types.SoqlQuery
+			err = json.Unmarshal(jsonBytes1, &unmarshal1)
+			if err != nil {
+				t.Errorf("json.Unmarshal() (1) error = %v", err)
+				return
+			}
+
+			jsonBytes2, err := json.Marshal(unmarshal1)
+			if err != nil {
+				t.Errorf("json.Marshal() (2) error = %v", err)
+				return
+			}
+			var unmarshal2 types.SoqlQuery
+			err = json.Unmarshal(jsonBytes2, &unmarshal2)
+			if err != nil {
+				t.Errorf("json.Unmarshal() (2) error = %v", err)
+				return
+			}
+			if string(jsonBytes1) != string(jsonBytes2) {
+				t.Errorf("Marshal(1) = %v, Marshal(2) %v", string(jsonBytes1), string(jsonBytes2))
+				return
+			}
+
+			jsonBytes3, err := json.Marshal(unmarshal2)
+			if err != nil {
+				t.Errorf("json.Marshal() (3) error = %v", err)
+				return
+			}
+			if string(jsonBytes1) != string(jsonBytes3) {
+				t.Errorf("Marshal(1) = %v, Marshal(3) %v", string(jsonBytes1), string(jsonBytes3))
+				return
+			}
+		})
+	}
+}
+
+func TestParse3(t *testing.T) {
+	type args struct {
+		s string
+	}
+	tests := []struct {
+		name     string
+		args     args
+		want     interface{}
+		wantErr  bool
+		dbgBreak bool
+	}{{
+		name: "1",
+		args: args{s: `
+			SELECT
+			    acc.Id xid
+			  --, con.foo__r.xxx
+			  , foo__r.bar__r.zzz
+			  , foo__r.yyy
+			  , con.Name xname
+			  , con.acc.ddd xddd
+			  , CONCAT(TRIM(acc.Name), '/', TRIM(con.Name), 123.45, 0xacc0) cname
+			  , FLAT(acc.Name)
+			FROM
+			    Contact con
+			  , con.Account acc
+			  , PPP.QQQ.RRR r3
+			WHERE
+			    not (Name like 'a%' or Name like 'b%')
+				and
+				acc.Name in ('a', 'b', 'c', null)
+				and
+				acc.Id in ('a', 'b', 'c', null)
+				and
+				r3.Name in (select x,Id,Name from Contact)
+				and
+				Name > 0001-01-02
+				and
+				(((Name > 0001-01-02T01:01:01.123456789Z)
+				or
+				Name = :param1))
+				and
+				con.Name = acc.Name
+				and
+				LEN(con.Name) > 0
 			GROUP BY
 			    acc.Name
 			  --, acc.Id

soql/parser/postprocess/normalize.go

@@ -304,10 +304,6 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		}
 	}
 
-	// TODO: * check object graph when aggregation(group by)
-	//           * subquery on select clause is not allowed.
-	//           * ...
-
 	ctx.assignColumnIds(q)
 
 	ctx.assignImplicitAliasNames(q, fieldAliasMap)
@@ -366,6 +362,16 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		ctx.parameters[q.OffsetAndLimit.LimitParamName] = struct{}{}
 	}
 
+	if q.IsAggregation {
+		for i := 0; i < len(q.Fields); i++ {
+			if q.Fields[i].Type == SoqlFieldInfo_SubQuery {
+				return errors.New(
+					"Subquery on aggregation query is not allowed: " +
+						strings.Join(q.From[0].Name, "."))
+			}
+		}
+	}
+
 	savedViewIdMap := ctx.viewIdMap
 	savedColumnIdMap := ctx.columnIdMap
 	savedColIndexMap := ctx.colIndexMap

web/index.html

@@ -63,49 +63,19 @@ <h4 class="title"><img
         <div class="input-area">
             <textarea id="soql" name="soql" rows="35" cols="120"
 >SELECT
-  -- FIELDS(all)
-    acc.Id xid
-  , foo__r.bar__r.zzz
-  , foo__r.yyy
-  , con.Name xname
-  , con.acc.ddd xddd
-  , CONCAT(TRIM(acc.Name), '/', TRIM(con.Name), 123.45, 0xacc0) cname
-  , FLAT(acc.Name)
-  , (SELECT Id FROM con.Departments) qwerty
+    Id
+  , Name
+  , Contact.Id
+  , Contact.Name
 FROM
-    Contact con
-  , con.Account acc
-  , PPP.QQQ.RRR r3
+    Account
 WHERE
-    not (Name like 'a%' or Name like 'b%')
-    and
-    Name in ('a', 'b', 'c', null)
-    and
-    Name in (select x from Foobar)
-    and
-    Name &gt; 0001-01-02
-    and
-    (((Name &gt; 0001-01-02T01:01:01.123456789Z)
+    Contact.Name like 'Jane %'
     or
-    Name = :param1))
-    and
-    con.Name = acc.Name
-    and
-    LEN(con.Name) > 0
-GROUP BY
-    acc.Name
-  , con.Name
-  , xid
-  , foo__r.bar__r.zzz
-  , foo__r.yyy
-  , con.acc.ddd
-HAVING
-    LEN(MAX(con.Name)) &gt; FOO(0)
-    and
-    LEN(MAX(con.Name)) &gt; 0
+    Contact.Name like 'John %'
 ORDER BY
-    acc.Id desc nulls last
-  , con.Name
+    Name desc nulls last
+  , Id
 OFFSET 1000 LIMIT 100
 FOR update viewstat, tracking
 </textarea>