fix panic for group by binary type (#1844)

Author: jycor

enginetest/queries/order_by_group_by_queries.go

@@ -85,6 +85,38 @@ var OrderByGroupByScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "Group by BINARY: https://github.com/dolthub/dolt/issues/6179",
+		SetUpScript: []string{
+			"create table t (s varchar(100));",
+			"insert into t values ('abc'), ('def');",
+			"create table t1 (b binary(3));",
+			"insert into t1 values ('abc'), ('abc'), ('def'), ('abc'), ('def');",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "select binary s from t group by binary s order by binary s",
+				Expected: []sql.Row{
+					{[]uint8("abc")},
+					{[]uint8("def")},
+				},
+			},
+			{
+				Query: "select count(b), b from t1 group by b order by b",
+				Expected: []sql.Row{
+					{3, []uint8("abc")},
+					{2, []uint8("def")},
+				},
+			},
+			{
+				Query: "select binary s from t group by binary s order by s",
+				Expected: []sql.Row{
+					{[]uint8("abc")},
+					{[]uint8("def")},
+				},
+			},
+		},
+	},
 	{
 		Name: "https://github.com/dolthub/dolt/issues/3016",
 		SetUpScript: []string{

sql/analyzer/resolve_columns.go

@@ -344,7 +344,7 @@ func identifyGroupingAliasReferences(groupBy *plan.GroupBy) (*plan.GroupBy, tran
 			return e, transform.SameTree, nil
 		}
 
-		if stringContains(projectedAliases, strings.ToLower(uc.Name())) {
+		if stringContains(projectedAliases, uc.Name()) {
 			return expression.NewAliasReference(uc.Name()), transform.NewTree, nil
 		}
 

sql/analyzer/resolve_orderby.go

@@ -64,8 +64,7 @@ func pushdownSort(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scope,
 
 			for _, n := range ns {
 				col := tableColFromNameable(n)
-				name := strings.ToLower(n.Name())
-				if col.Table() == "" && stringContains(childAliases, name) {
+				if col.Table() == "" && stringContains(childAliases, n.Name()) {
 					colsFromChild = append(colsFromChild, n.Name())
 				} else if !tableColsContains(schemaCols, col) {
 					missingCols = append(missingCols, col)

sql/analyzer/validation_rules.go

@@ -329,7 +329,7 @@ func expressionReferencesOnlyGroupBys(groupBys []string, expr sql.Expression) bo
 		// TODO: this isn't complete, it's overly restrictive. Dependant columns are fine to reference.
 		default:
 			if stringContains(groupBys, expr.String()) {
-				return true
+				return false
 			}
 
 			if len(expr.Children()) == 0 {
@@ -659,8 +659,9 @@ func validateSubqueryColumns(ctx *sql.Context, a *Analyzer, n sql.Node, scope *p
 }
 
 func stringContains(strs []string, target string) bool {
+	lowerTarget := strings.ToLower(target)
 	for _, s := range strs {
-		if s == target {
+		if lowerTarget == strings.ToLower(s) {
 			return true
 		}
 	}

sql/rowexec/agg.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
 type groupByIter struct {
@@ -248,7 +249,10 @@ func groupingKey(
 
 		t, isStringType := expr.Type().(sql.StringType)
 		if isStringType && v != nil {
-			err = t.Collation().WriteWeightString(hash, v.(string))
+			v, err = types.ConvertToString(v, t)
+			if err == nil {
+				err = t.Collation().WriteWeightString(hash, v.(string))
+			}
 		} else {
 			_, err = fmt.Fprintf(hash, "%v", v)
 		}