Change the name of the enabling compile-time macro to

SQLITE_ENABLE_ORDERED_SET_AGGREGATES.

FossilOrigin-Name: 3b1cdddf8339cc339ec74cd8be2bfa42e62b500048a444eb9e5d9817bc4702ae

4 files changed, 17 insertions, 9 deletions

diff --git a/src/ctime.c b/src/ctime.c
index 486b29a26..fe7849fec 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -295,8 +295,8 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
   "ENABLE_OFFSET_SQL_FUNC",
 #endif
-#ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
-  "ENABLE_ORDERED_SET_FUNCS",
+#ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
+  "ENABLE_ORDERED_SET_AGGREGATES",
 #endif
 #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   "ENABLE_OVERSIZE_CELL_CHECK",
diff --git a/src/parse.y b/src/parse.y
index 138a41d30..8ff232620 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -264,9 +264,9 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
   CURRENT FOLLOWING PARTITION PRECEDING RANGE UNBOUNDED
   EXCLUDE GROUPS OTHERS TIES
 %endif SQLITE_OMIT_WINDOWFUNC
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
   WITHIN
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 %ifndef SQLITE_OMIT_GENERATED_COLUMNS
   GENERATED ALWAYS
 %endif
@@ -1182,7 +1182,7 @@ expr(A) ::= idj(X) LP STAR RP. {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
 }
 
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 %include {
   /* Generate an expression node that represents an ordered-set aggregate function.
   **
@@ -1239,7 +1239,7 @@ expr(A) ::= idj(X) LP STAR RP. {
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP. {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
 }
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 
 %ifndef SQLITE_OMIT_WINDOWFUNC
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP filter_over(Z). {
@@ -1255,13 +1255,13 @@ expr(A) ::= idj(X) LP STAR RP filter_over(Z). {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
   sqlite3WindowAttach(pParse, A, Z);
 }
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP
             filter_over(Z). {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
   sqlite3WindowAttach(pParse, A, Z);
 }
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 
 %endif SQLITE_OMIT_WINDOWFUNC
 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b211299e6..5546793c9 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5623,7 +5623,7 @@ int sqlite3_create_window_function(
 ** used to invoke this function.  If the ordered-set aggregate notation is
 ** used on a function that lacks this flag, then an error is raised. Note
 ** that the ordered-set aggregate syntax is only available if SQLite is
-** built using the -DSQLITE_ENABLE_ORDERED_SET_FUNCS compile-time option.
+** built using the -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
 ** </dd>
 ** </dl>
 */
diff --git a/src/test_config.c b/src/test_config.c
index c4f06b7ca..49527861a 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -189,6 +189,14 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "offset_sql_func","0",TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
+  Tcl_SetVar2(interp, "sqlite_options",
+                      "ordered_set_aggregates","1",TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options",
+                      "ordered_set_aggregates","0",TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
   Tcl_SetVar2(interp, "sqlite_options", "preupdate", "1", TCL_GLOBAL_ONLY);
 #else