Add view graph to meta info

Author: shellyln

soql/parser/postprocess/normalize.go

@@ -17,6 +17,7 @@ type normalizeQueryContext struct {
 	colIndexMap        map[string]int
 	headObjDepthOffset int
 	maxDepth           int
+	viewGraph          map[int]SoqlGraphLeaf
 }
 
 func (ctx *normalizeQueryContext) normalizeQuery(
@@ -257,12 +258,18 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		if ctx.maxDepth < objDepth {
 			ctx.maxDepth = objDepth
 		}
+
 		if nameLen > 1 {
 			parentKey := nameutil.MakeDottedKeyIgnoreCase(q.From[i].Name, nameLen-1)
 			if parentViewId, ok := ctx.viewIdMap[parentKey]; ok {
 				q.From[i].ParentViewId = parentViewId
 			}
 		}
+
+		ctx.viewGraph[q.From[i].ViewId] = SoqlGraphLeaf{
+			ParentViewId: q.From[i].ParentViewId,
+			Object:       &q.From[i],
+		}
 	}
 
 	// TODO: * check object graph when aggregation(group by)
@@ -390,6 +397,7 @@ func Normalize(q *SoqlQuery) error {
 		colIndexMap:        map[string]int{},
 		headObjDepthOffset: 0,
 		maxDepth:           0,
+		viewGraph:          make(map[int]SoqlGraphLeaf),
 	}
 
 	if err := ctx.normalizeQuery(soqlQueryPlace_Primary, q, nil); err != nil {
@@ -399,6 +407,7 @@ func Normalize(q *SoqlQuery) error {
 	q.Meta.NextColumnId = ctx.columnId
 	q.Meta.NextViewId = ctx.viewId
 	q.Meta.MaxDepth = ctx.maxDepth
+	q.Meta.ViewGraph = ctx.viewGraph
 
 	return nil
 }

soql/parser/types/types.go

@@ -239,13 +239,19 @@ type SoqlForClause struct {
 	UpdateViewstat bool `json:"updateViewstat,omitempty"` // for update viewstat (set with Update)
 }
 
+type SoqlGraphLeaf struct {
+	ParentViewId int             `json:"parentViewId"`
+	Object       *SoqlObjectInfo `json:"-"`
+}
+
 type SoqlQueryMeta struct {
-	Version      string    `json:"version,omitempty"`      // format version
-	Date         time.Time `json:"date,omitempty"`         // compiled datetime
-	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)
+	Version      string                `json:"version,omitempty"`      // format version
+	Date         time.Time             `json:"date,omitempty"`         // compiled datetime
+	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)
+	ViewGraph    map[int]SoqlGraphLeaf `json:"viewGraph,omitempty"`    //
 }
 
 type SoqlQuery struct {