passes most tests

Author: angelamayxie

sql/planbuilder/aggregates.go

@@ -374,16 +374,16 @@ func (b *Builder) buildAggFunctionArgs(inScope *scope, e *ast.FuncExpr, gb *grou
 		e := b.selectExprToExpression(inScope, 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 {
+			//	// 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))
+			//	}
+			//}
 			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)

sql/planbuilder/project.go

@@ -135,7 +135,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(), originalCol: gf.Name()}
+				col = scopeColumn{id: id, tableId: gf.TableId(), col: e.Name(), db: gf.Database(), table: gf.Table(), typ: gf.Type(), scalar: e, 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

@@ -125,7 +125,7 @@ func (b *Builder) buildScalar(inScope *scope, e ast.Expr) (ex sql.Expression) {
 		if !ok {
 			alias, ok := inScope.selectColumnAliases[colName]
 			if ok {
-				return alias.scalarGf()
+				return alias.scalar
 			}
 			sysVar, scope, ok := b.buildSysVar(v, ast.SetScope_None)
 			if ok {

sql/planbuilder/scope.go

@@ -443,6 +443,12 @@ func (s *scope) copy() *scope {
 	if !s.colset.Empty() {
 		ret.colset = s.colset.Copy()
 	}
+	if s.selectColumnAliases != nil {
+		ret.selectColumnAliases = make(map[string]scopeColumn, len(s.selectColumnAliases))
+		for k, v := range s.selectColumnAliases {
+			ret.selectColumnAliases[k] = v
+		}
+	}
 
 	return &ret
 }
@@ -650,7 +656,7 @@ func (c scopeColumn) scalarGf() sql.Expression {
 		case *expression.ProcedureParam:
 			return e
 		case *expression.Alias:
-			return e.Child
+			return e
 		}
 	}
 	if c.originalCol != "" {