Add Depth, QueryDepth, Query to QueryGraph. Add query id to query object.

Author: shellyln

soql/parser/postprocess/normalize.go

@@ -10,6 +10,7 @@ import (
 )
 
 type normalizeQueryContext struct {
+	queryId            int
 	viewId             int
 	viewIdMap          map[string]int
 	columnId           int
@@ -23,6 +24,9 @@ type normalizeQueryContext struct {
 func (ctx *normalizeQueryContext) normalizeQuery(
 	qPlace soqlQueryPlace, q *SoqlQuery, objNameMap map[string][]string) error {
 
+	q.QueryId = ctx.queryId
+	ctx.queryId++
+
 	var primaryObjectName []string // TODO: name is not good? it is primary or parent object
 
 	if qPlace == soqlQueryPlace_Primary || qPlace == soqlQueryPlace_ConditionalOperand {
@@ -268,7 +272,10 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 
 		ctx.viewGraph[q.From[i].ViewId] = SoqlGraphLeaf{
 			ParentViewId: q.From[i].ParentViewId,
+			Depth:        objDepth,
+			QueryDepth:   ctx.headObjDepthOffset + 1,
 			Object:       &q.From[i],
+			Query:        q,
 		}
 	}
 
@@ -390,6 +397,7 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 
 func Normalize(q *SoqlQuery) error {
 	ctx := normalizeQueryContext{
+		queryId:            1,
 		viewId:             1,
 		viewIdMap:          make(map[string]int),
 		columnId:           1,
@@ -406,6 +414,7 @@ func Normalize(q *SoqlQuery) error {
 
 	q.Meta.NextColumnId = ctx.columnId
 	q.Meta.NextViewId = ctx.viewId
+	q.Meta.NextQueryId = ctx.queryId
 	q.Meta.MaxDepth = ctx.maxDepth
 	q.Meta.ViewGraph = ctx.viewGraph
 

soql/parser/types/types.go

@@ -241,7 +241,10 @@ type SoqlForClause struct {
 
 type SoqlGraphLeaf struct {
 	ParentViewId int             `json:"parentViewId"`
+	Depth        int             `json:"depth"`
+	QueryDepth   int             `json:"queryDepth"`
 	Object       *SoqlObjectInfo `json:"-"`
+	Query        *SoqlQuery      `json:"-"`
 }
 
 type SoqlQueryMeta struct {
@@ -250,7 +253,8 @@ type SoqlQueryMeta struct {
 	Source       string                `json:"source,omitempty"`       // source
 	MaxDepth     int                   `json:"maxDepth,omitempty"`     // max depth of object graph
 	NextColumnId int                   `json:"nextColumnId,omitempty"` // next column id (a number of columns)
-	NextViewId   int                   `json:"nextViewId,omitempty"`   // next view id (a number of objects)
+	NextViewId   int                   `json:"nextViewId,omitempty"`   // next view id (a number of views)
+	NextQueryId  int                   `json:"nextQueryId,omitempty"`  // next query id (a number of queries)
 	ViewGraph    map[int]SoqlGraphLeaf `json:"viewGraph,omitempty"`    //
 }
 
@@ -267,6 +271,7 @@ type SoqlQuery struct {
 	IsAggregation    bool                     `json:"isAggregation,omitempty"`    // It is an aggregation result or not; Not used for "PerObjectQuery"
 	IsCorelated      bool                     `json:"isCorelated,omitempty"`      // Co-related query if true
 	PostProcessWhere []SoqlCondition          `json:"postProcessWhere,omitempty"` // Post-processing conditions (Conditions to apply after being filtered in the query for each object)
+	QueryId          int                      `json:"queryId,omitempty"`
 	Meta             *SoqlQueryMeta           `json:"meta,omitempty"`
 
 	// ParameterizedValues map[string]struct{} `json:"-"` // TODO: