Resolved expr v. selectExprs in injected exprs

Author: zachmu

sql/planbuilder/aggregates.go

@@ -521,8 +521,15 @@ func (b *Builder) buildOrderedInjectedExpr(inScope *scope, e *ast.OrderedInjecte
 	gb := inScope.groupBy
 
 	resolvedChildren := make([]any, len(e.Children))
-	for i, child := range e.Children {
-		resolvedChildren[i] = b.buildScalar(inScope, child)
+
+	if len(e.Children) > 0 {
+		for i, child := range e.Children {
+			resolvedChildren[i] = b.buildScalar(inScope, child)
+		}
+	} else {
+		for i, child := range e.SelectExprChildren {
+			resolvedChildren[i] = b.selectExprToExpression(inScope, child)
+		}
 	}
 
 	orderByScope := b.analyzeOrderBy(inScope, inScope, e.OrderBy)

sql/planbuilder/scalar.go

@@ -414,8 +414,14 @@ func (b *Builder) buildInjectedExpr(inScope *scope, v ast.InjectedExpr) sql.Expr
 		b.handleErr(err)
 	}
 	resolvedChildren := make([]any, len(v.Children))
-	for i, child := range v.Children {
-		resolvedChildren[i] = b.buildScalar(inScope, child)
+	if len(v.Children) > 0 {
+		for i, child := range v.Children {
+			resolvedChildren[i] = b.buildScalar(inScope, child)
+		}
+	} else {
+		for i, child := range v.SelectExprChildren {
+			resolvedChildren[i] = b.selectExprToExpression(inScope, child)
+		}
 	}
 	return b.buildInjectedExpressionFromResolvedChildren(v, resolvedChildren)
 }