Set parent view id to object

shellyln · shellyln · commit aae2bd290200 · 2023-04-29T09:18:37.000+09:00
diff --git a/soql/parser/postprocess/normalize.go b/soql/parser/postprocess/normalize.go
@@ -252,10 +252,17 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 			q.From[i].ViewId = viewId
 		}
 
-		objDepth := len(q.From[i].Name) + ctx.headObjDepthOffset
+		nameLen := len(q.From[i].Name)
+		objDepth := nameLen + ctx.headObjDepthOffset
 		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
+			}
+		}
 	}
 
 	// TODO: * check object graph when aggregation(group by)

Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,17 @@ func (ctx *normalizeQueryContext) normalizeQuery(`
`252`	`252`	`q.From[i].ViewId = viewId`
`253`	`253`	`}`
`254`	`254`
`255`		`- objDepth := len(q.From[i].Name) + ctx.headObjDepthOffset`
	`255`	`+ nameLen := len(q.From[i].Name)`
	`256`	`+ objDepth := nameLen + ctx.headObjDepthOffset`
`256`	`257`	`if ctx.maxDepth < objDepth {`
`257`	`258`	`ctx.maxDepth = objDepth`
`258`	`259`	`}`
	`260`	`+ if nameLen > 1 {`
	`261`	`+ parentKey := nameutil.MakeDottedKeyIgnoreCase(q.From[i].Name, nameLen-1)`
	`262`	`+ if parentViewId, ok := ctx.viewIdMap[parentKey]; ok {`
	`263`	`+ q.From[i].ParentViewId = parentViewId`
	`264`	`+ }`
	`265`	`+ }`
`259`	`266`	`}`
`260`	`267`
`261`	`268`	`// TODO: * check object graph when aggregation(group by)`