unskip tests

Author: angelamayxie

enginetest/queries/queries.go

@@ -9352,6 +9352,20 @@ from typestable`,
 			{"0"}, {"1"}, {"0"}, {"1"},
 		},
 	},
+	// https://github.com/dolthub/dolt/issues/7095
+	// References in group by and having should be allowed to match select aliases
+	{
+		Query:    "select y as z from xy group by (y) having AVG(z) > 0",
+		Expected: []sql.Row{{1}, {2}, {3}},
+	},
+	{
+		Query:    "select y as z from xy group by (z) having AVG(z) > 0",
+		Expected: []sql.Row{{1}, {2}, {3}},
+	},
+	{
+		Query:    "select y + 1 as z from xy group by (z) having AVG(z) > 1",
+		Expected: []sql.Row{{2}, {3}, {4}},
+	},
 }
 
 var KeylessQueries = []QueryTest{
@@ -9603,20 +9617,6 @@ FROM mytable;`,
 			{"DECIMAL"},
 		},
 	},
-	// https://github.com/dolthub/dolt/issues/7095
-	// References in group by and having should be allowed to match select aliases
-	{
-		Query:    "select y as z from xy group by (y) having AVG(z) > 0",
-		Expected: []sql.Row{{1}, {2}, {3}},
-	},
-	{
-		Query:    "select y as z from xy group by (z) having AVG(z) > 0",
-		Expected: []sql.Row{{1}, {2}, {3}},
-	},
-	{
-		Query:    "select y + 1 as z from xy group by (z) having AVG(z) > 1",
-		Expected: []sql.Row{{2}, {3}, {4}},
-	},
 }
 
 var VersionedQueries = []QueryTest{

sql/planbuilder/aggregates.go

@@ -372,6 +372,7 @@ 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 GetField is an alias, alias must be masking a column
 		if gf, ok := e.(*expression.GetField); ok && gf.TableId() == 0 {
 			e = b.selectExprToExpression(inScope.parent, arg)
 		}