From da258f52dae1e8380a70e6a9473900d67489e2d1 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 10 Jun 2023 17:27:59 +0000
Subject: [PATCH] Add documentation for SQLITE_DBCONFIG_STRICT_AGGREGATE.
FossilOrigin-Name: 76fb9151386d8c4557ea75b26af5b9a2c83b04f7bd5e635a2218ca30a48b5849
---
manifest | 12 ++++++------
manifest.uuid | 2 +-
src/sqlite.h.in | 16 ++++++++++++++++
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/manifest b/manifest
index 29696c13d6..c3942ffdf2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\snewbie-safe-aggregates\sbranch.
-D 2023-06-10T17:15:59.781
+C Add\sdocumentation\sfor\sSQLITE_DBCONFIG_STRICT_AGGREGATE.
+D 2023-06-10T17:27:59.458
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ F src/resolve.c c1457b920aeb33ed106bf478fad31b7473a8950a755ea898980c428928f3a514
F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
F src/select.c 5b2139b3033927d1c637e8ea0c577186b356357266c36b3bde20cdbdc2a23da6
F src/shell.c.in 359a1436b4cd24f30d98dc1bd751333e1ec670a6e752ba047545739187ad2910
-F src/sqlite.h.in 54623b116932859b1bc56b5f74ffa0c77ac9c3657cd2d5797590874afe2dbb08
+F src/sqlite.h.in 013691ac3ca4e9ff0581b38219655c2dd36dd2da78e7a9432f434392b5895380
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
F src/sqliteInt.h 4698b109255c3c1473b1a08d81a7a285298caeb9ebe7f24ea4f8324f3823e95b
@@ -2040,8 +2040,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c29ec76944e2ee62e3f3383047a92c05e97f59387874985381e74a47ffe69d28 b99135288b157044e2319833e8632c89483778f876aa45ee66e46ffb6ae42ab2
-R a9af6d8215c878aa8b271d2abee7bad7
+P e19e20fbaf6dedc5bf062120f3440eda86befb72a080d3ed70dbc45329ddf06d
+R 2ceba7e5753d15b7268bd32cc37aa86d
U drh
-Z 5768a19ec2fc1689ab2c8105d751d176
+Z 2aa283d2da5628dece14663d0d582909
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b5a4fd4a2f..e2482356cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e19e20fbaf6dedc5bf062120f3440eda86befb72a080d3ed70dbc45329ddf06d
\ No newline at end of file
+76fb9151386d8c4557ea75b26af5b9a2c83b04f7bd5e635a2218ca30a48b5849
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ea2fc2ec41..c393946ddf 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2486,6 +2486,22 @@ struct sqlite3_mem_methods {
** then 0 or 1 is written into the integer that the second argument points to
** depending on if the reverse scan order flag is set after processing the
** first argument.
+**
+** [[SQLITE_DBCONFIG_STRICT_AGGREGATE]]
+** SQLITE_DBCONFIG_STRICT_AGGREGATE
+** The SQLITE_DBCONFIG_STRICT_AGGREGATE disables the SQLite-specific
+** enhancement that allows bare columns that are not mentioned in the GROUP BY
+** clause and that are not contained within an aggregate function to appear
+** in aggregate queries. With that enhancement disabled, SQLite works more like
+** other SQL database engines such as PostgreSQL. The strict-aggregate flag
+** is off by default, meaning that the enhanced capabilities of SQLite are
+** enabled by default. This [sqlite3_db_config()] option takes
+** two arguments which are an integer and a pointer to an integer. The first
+** argument is 1, 0, or -1 to enable, disable, or leave unchanged the
+** strict-aggregate flag, respectively. If the second argument is not NULL,
+** then 0 or 1 is written into the integer that the second argument points to
+** depending on if the strict-aggregate flag is set after processing the
+** first argument.
**
**
**
--
2.47.2