Add object max depth to query meta info

Author: shellyln

soql/parser/parser_test.go

@@ -81,10 +81,15 @@ func TestParse(t *testing.T) {
 		want:    nil,
 		wantErr: false,
 	}, {
-		name:     "fieldset 2",
-		args:     args{s: `SELECT fields(con.acc.all) FROM Contact con, con.Account acc`},
+		name:    "fieldset 2",
+		args:    args{s: `SELECT fields(con.acc.all) FROM Contact con, con.Account acc`},
+		want:    nil,
+		wantErr: true,
+	}, {
+		name:     "cond subquery",
+		args:     args{s: `SELECT Id FROM Contact WHERE Name in (select asd.x from qwe)`},
 		want:     nil,
-		wantErr:  true,
+		wantErr:  false,
 		dbgBreak: true,
 	}}
 	for _, tt := range tests {
@@ -172,6 +177,7 @@ func TestParse2(t *testing.T) {
 			  , CONCAT(TRIM(acc.Name), '/', TRIM(con.Name), 123.45, 0xacc0) cname
 			  , FLAT(acc.Name)
 			  , (SELECT Id FROM con.Departments where uuu=con.Zzz and vvv=con.Id) qwerty
+			  , (select Id from r3.lkjh)
 			FROM
 			    Contact con
 			  , con.Account acc

soql/parser/postprocess/normalize.go

@@ -10,11 +10,13 @@ import (
 )
 
 type normalizeQueryContext struct {
-	viewId      int
-	viewIdMap   map[string]int
-	columnId    int
-	columnIdMap map[string]int
-	colIndexMap map[string]int
+	viewId             int
+	viewIdMap          map[string]int
+	columnId           int
+	columnIdMap        map[string]int
+	colIndexMap        map[string]int
+	headObjDepthOffset int
+	maxDepth           int
 }
 
 func (ctx *normalizeQueryContext) normalizeQuery(
@@ -249,6 +251,11 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		} else {
 			q.From[i].ViewId = viewId
 		}
+
+		objDepth := len(q.From[i].Name) + ctx.headObjDepthOffset
+		if ctx.maxDepth < objDepth {
+			ctx.maxDepth = objDepth
+		}
 	}
 
 	// TODO: * check object graph when aggregation(group by)
@@ -311,9 +318,11 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 	savedViewIdMap := ctx.viewIdMap
 	savedColumnIdMap := ctx.columnIdMap
 	savedColIndexMap := ctx.colIndexMap
+	savedHeadObjDepthOffset := ctx.headObjDepthOffset
 	ctx.viewIdMap = make(map[string]int)
 	ctx.columnIdMap = make(map[string]int)
 	ctx.colIndexMap = make(map[string]int)
+	ctx.headObjDepthOffset = len(q.From[0].Name)
 
 	if q.Where != nil {
 		for i := 0; i < len(q.Where); i++ {
@@ -360,17 +369,20 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 	ctx.viewIdMap = savedViewIdMap
 	ctx.columnIdMap = savedColumnIdMap
 	ctx.colIndexMap = savedColIndexMap
+	ctx.headObjDepthOffset = savedHeadObjDepthOffset
 
 	return nil
 }
 
 func Normalize(q *SoqlQuery) error {
 	ctx := normalizeQueryContext{
-		viewId:      1,
-		viewIdMap:   make(map[string]int),
-		columnId:    1,
-		columnIdMap: make(map[string]int),
-		colIndexMap: map[string]int{},
+		viewId:             1,
+		viewIdMap:          make(map[string]int),
+		columnId:           1,
+		columnIdMap:        make(map[string]int),
+		colIndexMap:        map[string]int{},
+		headObjDepthOffset: 0,
+		maxDepth:           0,
 	}
 
 	if err := ctx.normalizeQuery(soqlQueryPlace_Primary, q, nil); err != nil {
@@ -379,6 +391,7 @@ func Normalize(q *SoqlQuery) error {
 
 	q.Meta.NextColumnId = ctx.columnId
 	q.Meta.NextViewId = ctx.viewId
+	q.Meta.MaxDepth = ctx.maxDepth
 
 	return nil
 }

soql/parser/types/types.go

@@ -87,9 +87,9 @@ type SoqlFieldInfo struct {
 	NotSelected bool              `json:"notSelected,omitempty"` // It appears only in parameters and conditional expressions.
 	Aggregated  bool              `json:"aggregated,omitempty"`  // It is an aggregation function result field or not
 	Hints       []SoqlQueryHint   `json:"hints,omitempty"`       // TODO: hints
-	ColumnId    int               `json:"columnId,omitempty"`    // (internal use) for all; 1-based; If 0, it is not set.; Unique column Id across all main and sub queries
+	ColumnId    int               `json:"columnId,omitempty"`    // Column unique id; 1-based; If 0, it is not set.; Unique column Id across all main and sub queries
 	ColIndex    int               `json:"colIndex"`              // Column index in the object
-	ViewId      int               `json:"viewId,omitempty"`      // TODO: (internal use) for SubQuery and Function; 1-based; If 0, it is not set.
+	ViewId      int               `json:"viewId,omitempty"`      // View (table/object) unique id; 1-based; If 0, it is not set.
 	Key         string            `json:"key,omitempty"`         // (internal use) Base64-encoded, dot-delimited Name field value
 }
 
@@ -135,7 +135,8 @@ type SoqlObjectInfo struct {
 	InnerJoin      bool            `json:"innerJoin,omitempty"`     // When this object is on the left side, an inner join is performed.
 	Hints          []SoqlQueryHint `json:"hints,omitempty"`         // TODO: hints
 	PerObjectQuery *SoqlQuery      `json:"perObjectQuery"`          // A query that extracts only the filter and sort conditions and fields related to this object. A simple query, not including function calls, etc.
-	ViewId         int             `json:"viewId,omitempty"`        // TODO: (internal use) for SubQuery and Function; 1-based; If 0, it is not set.
+	ViewId         int             `json:"viewId,omitempty"`        // View (table/object) unique id; 1-based; If 0, it is not set.
+	ParentViewId   int             `json:"parentViewId,omitempty"`  // TODO:
 	Key            string          `json:"key,omitempty"`           // (internal use) Base64-encoded, dot-delimited Name field value
 }
 
@@ -245,6 +246,7 @@ type SoqlQueryMeta struct {
 	Version      string    `json:"version,omitempty"`
 	Date         time.Time `json:"date,omitempty"`
 	Source       string    `json:"source,omitempty"`
+	MaxDepth     int       `json:"maxDepth,omitempty"` // TODO:
 	NextColumnId int       `json:"nextColumnId,omitempty"`
 	NextViewId   int       `json:"nextViewId,omitempty"`
 }