Merge pull request #3187 from dolthub/angela/agg_match

Allow aggregate/window functions with match expressions

Author: angelamayxie

enginetest/queries/script_queries.go

@@ -11687,6 +11687,33 @@ select * from t1 except (
 			},
 		},
 	},
+	{
+		Name:    "aggregate function with match",
+		Dialect: "mysql",
+		SetUpScript: []string{
+			"CREATE TABLE test (pk INT PRIMARY KEY, doc TEXT, FULLTEXT idx (doc));",
+			"INSERT INTO test VALUES (2, 'g hhhh aaaab ooooo aaaa'), (1, 'bbbb ff cccc ddd eee'), (4, 'AAAA aaaa aaaac aaaa Aaaa aaaa'), (3, 'aaaA ff j kkkk llllllll');",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				// https://github.com/dolthub/dolt/issues/9761
+				Skip:  true,
+				Query: "SELECT pk, count(pk), MATCH(doc) AGAINST('aaaa') AS relevancy FROM test ORDER BY relevancy DESC;",
+				// TODO: replace with corresponding error once validation for aggregated query without group by
+				//  has been implemented https://github.com/dolthub/dolt/issues/9761
+				ExpectedErr: nil,
+			},
+			{
+				Query:    "SET SESSION sql_mode = REPLACE(@@SESSION.sql_mode, 'ONLY_FULL_GROUP_BY', '');",
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+
+			{
+				Query:    "SELECT pk, count(pk), MATCH(doc) AGAINST('aaaa') AS relevancy FROM test ORDER BY relevancy DESC;",
+				Expected: []sql.Row{{1, 4, float64(0)}},
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

sql/planbuilder/scalar.go

@@ -1015,10 +1015,6 @@ func (b *Builder) ConvertVal(v *ast.SQLVal) sql.Expression {
 // filter, since we only need to load the tables once. All steps after this
 // one can assume that the expression has been fully resolved and is valid.
 func (b *Builder) buildMatchAgainst(inScope *scope, v *ast.MatchExpr) *expression.MatchAgainst {
-	// TODO: implement proper scope support and remove this check
-	if (inScope.groupBy != nil && inScope.groupBy.hasAggs()) || inScope.windowFuncs != nil {
-		b.handleErr(fmt.Errorf("aggregate and window functions are not yet supported alongside MATCH expressions"))
-	}
 	rts := getTablesByName(inScope.node)
 	var rt *plan.ResolvedTable
 	var matchTable string