Hopefully, this should fix the remaining issues with invariants vs views (see #7863)

Author: dyemanov

src/dsql/ExprNodes.cpp

@@ -5334,19 +5334,19 @@ ValueExprNode* DerivedExprNode::pass1(thread_db* tdbb, CompilerScratch* csb)
 
 	SortedStreamList newStreams;
 
-	for (const auto i : internalStreamList)
-	{
-		markVariant(csb, i);
-		expandViewStreams(csb, i, newStreams);
-	}
+	for (const auto stream : internalStreamList)
+		expandViewStreams(csb, stream, newStreams);
 
 #ifdef CMP_DEBUG
 	for (const auto i : newStreams)
 		csb->dump(" %d", i);
 	csb->dump("\n");
 #endif
 
-	internalStreamList.assign(newStreams.begin(), newStreams.getCount());
+	for (const auto stream : newStreams)
+		markVariant(csb, stream);
+
+	internalStreamList.assign(newStreams);
 
 	return this;
 }