From: dan <Dan Kennedy>
Date: Fri, 5 Nov 2021 14:13:12 +0000 (+0000)
Subject: Update sqllimits1.test to account for recent changes to SQL function strftime().
X-Git-Tag: version-3.37.0~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=695c87f67d9f16b5503b19a72e9fffd08afa5e4b;p=thirdparty%2Fsqlite.git

Update sqllimits1.test to account for recent changes to SQL function strftime().

FossilOrigin-Name: 7bba415f91884a20f665e982376c2c5e91a4431e218c8eefe275be3684f2e59a
---

diff --git a/manifest b/manifest
index d4daef2b6c..98ca3f5eec 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sFTS_CORRUPT_VTAB\smacro\srather\sthan\sa\sdirect\scall\sto\nsqlite3Fts3Corrupt()\sin\s[2fad2a89527757b3]\sso\sthat\sthe\sbuild\sworks\nin\sall\scases.
-D 2021-11-05T12:34:06.422
+C Update\ssqllimits1.test\sto\saccount\sfor\srecent\schanges\sto\sSQL\sfunction\sstrftime().
+D 2021-11-05T14:13:12.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1424,7 +1424,7 @@ F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
 F test/spellfix4.test 51c7c26514ade169855c66bcf130bd5acfb4d7fd090cc624645ab275ae6a41fb
 F test/sqldiff1.test 182058e09c7082de5c6a470ff9c291337bbeb650052c2cc68fbb3d7e25861d91
-F test/sqllimits1.test daa412e62f445f1e24fa5b25e662f3571f88a4e811ad4dc3d29388bca83c0a8b
+F test/sqllimits1.test f46f405d754e702227dcdf5b73f94fffcd48c676e845afa37329e4ce2e32ccbf
 F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
 F test/startup.c 1beb5ca66fcc0fce95c3444db9d1674f90fc605499a574ae2434dcfc10d22805
 F test/stat.test 15a3106eddedfc882f64bc09f237b4169be4b92dd57c93031b8ff8b13af3e7c5
@@ -1930,7 +1930,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2927185be81a5aa0dce70dd06040d05c2816a4d18b5094a6f709732cfd6968dc
-R 31a5d1c00785c38024ae3ddc3e69a97d
-U drh
-Z b7c5d7b858dc3dc0475d30f599b50bf5
+P 029c59cdf9e7dbb431f5d110bc69c3597458edc9b6b009b2e91422de705a19fa
+R 15a965cec05acb9aa4a49131dbd146c1
+U dan
+Z 1ded954f2120e1480d077b81f101d3f7
diff --git a/manifest.uuid b/manifest.uuid
index b77af2650f..aebda4e0d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-029c59cdf9e7dbb431f5d110bc69c3597458edc9b6b009b2e91422de705a19fa
\ No newline at end of file
+7bba415f91884a20f665e982376c2c5e91a4431e218c8eefe275be3684f2e59a
\ No newline at end of file
diff --git a/test/sqllimits1.test b/test/sqllimits1.test
index f4c90bc039..6b7d7b6095 100644
--- a/test/sqllimits1.test
+++ b/test/sqllimits1.test
@@ -401,7 +401,7 @@ do_test sqllimits1-5.19 {
 unset blobvalue
 
 ifcapable datetime {
-  set strvalue [string repeat D [expr {$SQLITE_LIMIT_LENGTH-12}]]
+  set strvalue [string repeat D [expr {$SQLITE_LIMIT_LENGTH-11}]]
   do_test sqllimits1-5.20 {
     catchsql {SELECT strftime('%Y ' || $::strvalue, '2008-01-02')}
   } [list 0 [list "2008 $strvalue"]]
@@ -869,16 +869,21 @@ do_test sqllimits1-15.2 {
 # This test case doesn't really belong with the other limits tests.
 # It is in this file because it is taxing to run, like the limits tests.
 #
-do_test sqllimits1-16.1 {
-  set ::N [expr int(([expr pow(2,32)]/50) + 1)]
-  expr (($::N*50) & 0xffffffff)<55
-} {1}
-do_test sqllimits1-16.2 {
-  set ::format "[string repeat A 60][string repeat "%J" $::N]"
-  catchsql {
-    SELECT strftime($::format, 1);
-  }
-} {1 {string or blob too big}}
+# Update for 3.37.0: strftime() used to allocate a large static buffer
+# into which it would write its result. With that implementation, the
+# following would trigger an SQLITE_TOOBIG error. But strftime() now
+# uses the StrAccum functions, causing this test to fail.
+#
+#do_test sqllimits1-16.1 {
+#  set ::N [expr int(([expr pow(2,32)]/50) + 1)]
+#  expr (($::N*50) & 0xffffffff)<55
+#} {1}
+#do_test sqllimits1-16.2 {
+#  set ::format "[string repeat A 60][string repeat "%J" $::N]"
+#  catchsql {
+#    SELECT strftime($::format, 1);
+#  }
+#} {1 {string or blob too big}}
 
 do_catchsql_test sqllimits1.17.0 {
   SELECT *,*,*,*,*,*,*,* FROM (