pass all tests

Author: angelamayxie

sql/planbuilder/aggregates.go

@@ -372,18 +372,14 @@ func (b *Builder) buildAggFunctionArgs(inScope *scope, e *ast.FuncExpr, gb *grou
 	var args []sql.Expression
 	for _, arg := range e.Exprs {
 		e := b.selectExprToExpression(inScope, arg)
+		if gf, ok := e.(*expression.GetField); ok && gf.TableId() == 0 {
+			e = b.selectExprToExpression(inScope.parent, arg)
+		}
 		switch e := e.(type) {
 		case *expression.GetField:
-			//if e.TableId() == 0 {
-			//	// TODO: not sure where this came from but it's not true
-			//	// aliases are not valid aggregate arguments, the alias must be masking a column
-			//	gf := b.selectExprToExpression(inScope.parent, arg)
-			//	// var ok bool
-			//	e, ok := gf.(*expression.GetField)
-			//	if !ok || e.TableId() == 0 {
-			//		b.handleErr(fmt.Errorf("failed to resolve aggregate column argument: %s", gf))
-			//	}
-			//}
+			if e.TableId() == 0 {
+				b.handleErr(fmt.Errorf("failed to resolve aggregate column argument: %s", e))
+			}
 			args = append(args, e)
 			col := scopeColumn{tableId: e.TableID(), db: e.Database(), table: e.Table(), col: e.Name(), scalar: e, typ: e.Type(), nullable: e.IsNullable()}
 			gb.addInCol(col)
@@ -953,6 +949,7 @@ func (b *Builder) buildHaving(fromScope, projScope, outScope *scope, having *ast
 	havingScope := b.newScope()
 	if fromScope.parent != nil {
 		havingScope.parent = fromScope.parent
+		havingScope.parent.selectColumnAliases = fromScope.selectColumnAliases
 	}
 
 	// add columns from fromScope referenced in the groupBy

sql/planbuilder/project.go

@@ -144,7 +144,7 @@ func (b *Builder) analyzeSelectList(inScope, outScope *scope, selectExprs ast.Se
 					err := sql.ErrColumnNotFound.New(gf.String())
 					b.handleErr(err)
 				}
-				col = scopeColumn{id: id, tableId: gf.TableId(), col: e.Name(), db: gf.Database(), table: gf.Table(), typ: gf.Type(), scalar: e, nullable: gf.IsNullable()}
+				col = scopeColumn{id: id, tableId: gf.TableId(), col: e.Name(), db: gf.Database(), table: gf.Table(), scalar: e, typ: gf.Type(), nullable: gf.IsNullable()}
 			} else if sq, ok := e.Child.(*plan.Subquery); ok {
 				col = scopeColumn{col: e.Name(), scalar: e, typ: sq.Type(), nullable: sq.IsNullable()}
 			} else {

sql/planbuilder/scalar.go

@@ -123,8 +123,7 @@ func (b *Builder) buildScalar(inScope *scope, e ast.Expr) (ex sql.Expression) {
 		colName := strings.ToLower(v.Name.String())
 		c, ok := inScope.resolveColumn(dbName, tblName, colName, true, false)
 		if !ok {
-			alias, ok := inScope.selectColumnAliases[colName]
-			if ok {
+			if alias, ok := inScope.selectColumnAliases[colName]; ok {
 				return alias.scalar
 			}
 			sysVar, scope, ok := b.buildSysVar(v, ast.SetScope_None)

sql/planbuilder/scope.go

@@ -655,8 +655,6 @@ func (c scopeColumn) scalarGf() sql.Expression {
 		switch e := c.scalar.(type) {
 		case *expression.ProcedureParam:
 			return e
-		case *expression.Alias:
-			return e
 		}
 	}
 	if c.originalCol != "" {