hacky, but whatever

Author: James Cor

sql/analyzer/replace_count_star.go

@@ -35,8 +35,17 @@ func replaceCountStar(ctx *sql.Context, a *Analyzer, n sql.Node, _ *plan.Scope,
 
 	return transform.Node(n, func(n sql.Node) (sql.Node, transform.TreeIdentity, error) {
 		if agg, ok := n.(*plan.GroupBy); ok {
+			if !qFlags.JoinIsSet() {
+				print()
+			}
+			if !qFlags.SubqueryIsSet() {
+				print()
+			}
+			if !qFlags.IsSet(sql.QFlagAnyAgg) {
+				print()
+			}
 
-			if len(agg.GroupByExprs) == 0 && !qFlags.JoinIsSet() && !qFlags.SubqueryIsSet() && !qFlags.IsSet(sql.QFlagAnyAgg) {
+			if len(agg.GroupByExprs) == 0 && !qFlags.JoinIsSet() && !qFlags.SubqueryIsSet() && !qFlags.IsSet(sql.QFlagAnyAgg) && !qFlags.IsSet(sql.QFlagAnalyzeProcedure) {
 				// top-level aggregation with a single group and no "any_value" functions can only return one row
 				qFlags.Set(sql.QFlagMax1Row)
 			}

sql/analyzer/stored_procedures.go

@@ -181,7 +181,9 @@ func applyProcedures(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scop
 			return nil, transform.SameTree, sql.ErrStoredProceduresNotSupported.New(call.Database().Name())
 		}
 
+		qFlags.Set(sql.QFlagAnalyzeProcedure)
 		analyzedNode, _, err := analyzeProcedureBodies(ctx, a, call.Procedure, false, scope, sel, qFlags)
+		qFlags.Unset(sql.QFlagAnalyzeProcedure)
 		if err != nil {
 			return nil, transform.SameTree, err
 		}

sql/query_flags.go

@@ -55,6 +55,7 @@ const (
 	QFlagCreateEvent
 	QFlagCreateTrigger
 	QFlagCreateProcedure
+	QFlagAnalyzeProcedure
 )
 
 type QueryFlags struct {