Trying to fix TestTime_DayOfWeek

Signed-off-by: kuba-- <[email protected]>

Author: kuba--

engine_test.go

@@ -113,6 +113,14 @@ var queries = []struct {
 		"SELECT i FROM mytable WHERE i NOT BETWEEN 1 AND 2",
 		[]sql.Row{{int64(3)}},
 	},
+	{
+		"SELECT substring(mytable.s, 1, 5) as s FROM mytable INNER JOIN othertable ON (substring(mytable.s, 1, 5) = SUBSTRING(othertable.s2, 1, 5)) GROUP BY 1",
+		[]sql.Row{
+			{"third"},
+			{"secon"},
+			{"first"},
+		},
+	},
 	{
 		"SELECT i, i2, s2 FROM mytable INNER JOIN othertable ON i = i2",
 		[]sql.Row{

sql/analyzer/resolve_columns.go

@@ -104,6 +104,9 @@ func qualifyColumns(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error)
 							col.Name(),
 						)
 					default:
+						if _, ok := n.(*plan.GroupBy); ok {
+							return expression.NewUnresolvedColumn(col.Name()), nil
+						}
 						return nil, ErrAmbiguousColumnName.New(col.Name(), strings.Join(tables, ", "))
 					}
 				} else {

sql/expression/function/time_test.go

@@ -243,7 +243,7 @@ func TestTime_DayOfWeek(t *testing.T) {
 		{"null date", sql.NewRow(nil), nil, false},
 		{"invalid type", sql.NewRow([]byte{0, 1, 2}), nil, false},
 		{"date as string", sql.NewRow(stringDate), int32(3), false},
-		{"date as time", sql.NewRow(time.Now()), int32(time.Now().UTC().Weekday()+1) % 7, false},
+		{"date as time", sql.NewRow(time.Now()), int32(time.Now().UTC().Weekday() + 1), false},
 		{"date as unix timestamp", sql.NewRow(int64(tsDate)), int32(1), false},
 	}