[FIX] Fix the flag that view is inner join or not. [FIX] Fix the non-result flag

Author: shellyln

soql/parser/parser_test.go

@@ -177,7 +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)
+			  , (select Id from r3.lkjh where name='www')
 			FROM
 			    Contact con
 			  , con.Account acc
@@ -189,7 +189,7 @@ func TestParse2(t *testing.T) {
 				and
 				acc.Id in ('a', 'b', 'c', null)
 				and
-				r3.Name in (select x,Id,Name from Contact)
+				r3.Name in (select x,Id,Name,(select w from ghjksfd) from Contact)
 				and
 				Name > 0001-01-02
 				and
@@ -200,6 +200,8 @@ func TestParse2(t *testing.T) {
 				con.Name = acc.Name
 				and
 				LEN(con.Name) > 0
+				and
+				foo__r.bar__r.zzz = 1
 			ORDER BY
 			    acc.Name desc nulls last
 			  --, acc.Id desc nulls last

soql/parser/postprocess/normalize.go

@@ -297,7 +297,7 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 			Depth:        objDepth,
 			QueryDepth:   queryDepth,
 			Many:         qPlace == soqlQueryPlace_Select && i == 0,
-			InnerJoin:    q.From[i].InnerJoin,
+			InnerJoin:    false, // set later
 			NonResult:    qPlace == soqlQueryPlace_ConditionalOperand,
 			Object:       &q.From[i],
 			Query:        q,
@@ -335,6 +335,12 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		return err
 	}
 
+	for i := 0; i < len(q.From); i++ {
+		leaf := ctx.viewGraph[q.From[i].ViewId]
+		leaf.InnerJoin = q.From[i].InnerJoin
+		ctx.viewGraph[q.From[i].ViewId] = leaf
+	}
+
 	for i := 0; i < len(q.Fields); i++ {
 		field := q.Fields[i]
 
@@ -453,6 +459,37 @@ func Normalize(q *SoqlQuery) error {
 		return err
 	}
 
+	// Propagate InnerJoin and NonResult of ctx.viewGraph
+	for k := range ctx.viewGraph {
+		leaf := ctx.viewGraph[k]
+		if leaf.InnerJoin {
+			next := leaf.ParentViewId
+			for next != 0 {
+				l2 := ctx.viewGraph[next]
+				if l2.Depth == 1 || l2.Many || l2.QueryId != leaf.QueryId {
+					break
+				}
+				l2.InnerJoin = true
+				ctx.viewGraph[next] = l2
+				next = l2.ParentViewId
+			}
+		}
+		if leaf.NonResult {
+			var applyNonResult func(next int)
+			applyNonResult = func(next int) {
+				for w := range ctx.viewGraph {
+					l2 := ctx.viewGraph[w]
+					if l2.ParentViewId == next {
+						l2.NonResult = true
+						ctx.viewGraph[w] = l2
+						applyNonResult(w)
+					}
+				}
+			}
+			applyNonResult(k)
+		}
+	}
+
 	q.Meta.NextQueryId = ctx.queryId
 	q.Meta.NextViewId = ctx.viewId
 	q.Meta.NextColumnId = ctx.columnId

soql/parser/postprocess/normalizeperobj.go

@@ -87,10 +87,6 @@ CHECK_FIELDS:
 			}
 		}
 	}
-	if !hasConditionsOriginally {
-		// TODO: More conditions?
-		innerJoined = true
-	}
 
 	for i := 0; i < len(conditions); i++ {
 		cond := conditions[i]
@@ -362,6 +358,7 @@ func (ctx *normalizeQueryContext) buildPerObjectInfo(q *SoqlQuery) error {
 
 		perObjQuery.For = q.For
 	}
+	q.From[0].InnerJoin = false
 
 	if err := makePostProcessWhereClause(q); err != nil {
 		return err