Naming consistency: Always use the singular "STRICT AGGREGATE", not the plural.

FossilOrigin-Name: 275d056e461fa7f42a3df872cc9027799e8009a7296ea3546058e2c434886f68

diff --git a/manifest b/manifest
index c4cb8260c83a58951506a4043c50124805db40de..b5adc8b4a34b0c5ed74641c72e47baf0696b0d5f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\ssqlite3_error_offset()\svalues\sfor\sbare\scolumn\serrors\son\n'*'\sand\s'table.*'\sexpressions\sin\sSELECT\sstatements.
-D 2023-06-09T18:58:15.813
+C Naming\sconsistency:\s\sAlways\suse\sthe\ssingular\s"STRICT\sAGGREGATE",\snot\sthe\splural.
+D 2023-06-09T19:24:07.336
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/insert.c a38bbb944a4f2771d70140db9c5d57e36c37e28d5a366497b4f93272a6d2567e
 F src/json.c 14c474fb1249a46eb44e878e2361f36abfe686b134039b0d1883d93d61505b4a
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
-F src/main.c 52bcc36b18075e5aaf5afa89eaee5e2560baaea77a89bffddbf93930bf1d36da
+F src/main.c c787788005c6a41cc485f28921170ccd273dfda796b08b0a0652349ad6a64e5e
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -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 cd1f6b27d99272a2550fedf22fa1bf6fde0b2f29e51fe7c113a2441f210aa492
-R 4ff86b272f5c06b28bae89b7cde3ca53
+P 446ad162f76f2a32f3bfc5b5c1dadc8a139d4f338abb91fd912141ed8a768e8e
+R b27a0465564b28da534c8ad4a91cb159
 U drh
-Z d34e18280565db34c02a3f79def71ee7
+Z 744ba90604cbbc3d956bd8455d1b3554
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3fac7f38f9d384f9f2cf6d64a1ebd417326df72b..235785e32af9f68e5e013824494409aea113ef16 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-446ad162f76f2a32f3bfc5b5c1dadc8a139d4f338abb91fd912141ed8a768e8e
\ No newline at end of file
+275d056e461fa7f42a3df872cc9027799e8009a7296ea3546058e2c434886f68
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 4e3c0589186563511e0fda63e17bad063a2d5785..d4870b3ec0d86de059fb8f8c37fa0e788521cd43 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3358,7 +3358,7 @@ static int openDatabase(
 #if defined(SQLITE_ENABLE_STMT_SCANSTATUS)
                  | SQLITE_StmtScanStatus
 #endif
-#if defined(SQLITE_STRICT_AGGREGATES)
+#if defined(SQLITE_STRICT_AGGREGATE)
                  | SQLITE_StrictAgg
 #endif
       ;