From: dan <Dan Kennedy>
Date: Sat, 20 Jan 2024 18:45:30 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.46.0~190^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b75dc61a531bd5ec7141c9adc3a7c0c5586426e7;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 03ade4a810516ff84bc5c1a716b0e454cc8a89374100415ff21a82449112811b
---

b75dc61a531bd5ec7141c9adc3a7c0c5586426e7
diff --cc manifest
index 85784dcc72,eec8b0a2e9..6c05005d18
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stest\scases\sfor\sthe\snew\scode\son\sthis\sbranch.
- D 2024-01-20T16:46:25.186
 -C Ensure\sthat\svalues\sgenerated\sby\sDEFAULT\sclauses\sthat\sspecify\sreal\snumbers\sthat\scan\sbe\sexpressed\sas\s64-bit\sintegers\s(e.g.\s-1234.0)\sare\snot\ssilently\sconverted\sto\sintegers.
 -D 2024-01-20T18:41:13.528
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-01-20T18:45:30.244
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1355,7 -1355,7 +1355,7 @@@ F test/like2.test d3be15fefee3e02fc8894
  F test/like3.test a76e5938fadbe6d32807284c796bafd869974a961057bc5fc5a28e06de98745c
  F test/limit.test 350f5d03c29e7dff9a2cde016f84f8d368d40bcd02fa2b2a52fa10c4bf3cbfaf
  F test/limit2.test 9409b033284642a859fafc95f29a5a6a557bd57c1f0d7c3f554bd64ed69df77e
- F test/literal.test 62415688179c0d586f3633482e6c8e441edb805cd73c306964cf39912a6bff0e
 -F test/literal.test 12e3c865a9e20f984240dbfb362be2a53ad5ca4ee25a6d429cf059115a9ac48f
++F test/literal.test 17d21dda2f877018a02c28e2a85947b82ed638f2ca5ef3fa47c92359f02520a3
  F test/loadext.test faa4f6eed07a5aac35d57fdd7bc07f8fc82464cfd327567c10cf0ba3c86cde04
  F test/loadext2.test 0408380b57adca04004247179837a18e866a74f7
  F test/lock.test be4fe08118fb988fed741f429b7dd5d65e1c90db
@@@ -2159,8 -2159,8 +2159,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 401650aaccbc99246bd4e1ff37a28b78f528178aee2f294d87b9f7fecd7432bb
- R f613ae2f01e87601e8fa7113cad6d125
 -P aaa5a044d8a4942278eb4269fa8c7252f9f1dc161408e618e7c97c55a12283ff
 -R 363a8d4d24bb7774a5f7eceb24c4f650
++P 49f29a7b4f44f691ecf7a57b26477971e6ffaf2a0b1690b4926ffbb43fa3929b 298d6977285c71be917896bc875a8a26d985dcf0a74069b7c4d290e8ff0ac618
++R d4f77c6633329aa6323323954676adb8
  U dan
- Z 0deb0f7f0bb54434edd39b41a13f24b4
 -Z ee966b48b47570fa6886cd7583990b8c
++Z 02dbf9257e243f2009f448d2d8147299
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a510d65faa,3883df6b7b..5f5c21e2d7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 49f29a7b4f44f691ecf7a57b26477971e6ffaf2a0b1690b4926ffbb43fa3929b
 -298d6977285c71be917896bc875a8a26d985dcf0a74069b7c4d290e8ff0ac618
++03ade4a810516ff84bc5c1a716b0e454cc8a89374100415ff21a82449112811b
diff --cc test/literal.test
index 01ea7b954c,4e957c05db..e29789d37d
--- a/test/literal.test
+++ b/test/literal.test
@@@ -42,16 -42,12 +42,20 @@@ test_literal 1.10 -45                in
  test_literal 1.11 '0xFF'             text 0xFF
  test_literal 1.12 '-0xFF'            text -0xFF
  test_literal 1.13 -'0xFF'            integer 0
- 
- test_literal 2.1  1_000   integer 1000
- test_literal 2.2  1.1_1   real    1.11
- test_literal 2.3  1_0.1_1 real    10.11
- test_literal 2.4  1e1_000 real    Inf
- test_literal 2.5  123______456.7_8__9_ real 123456.789
- test_literal 2.6  9_223_372_036_854_775_807 integer 9223372036854775807
- test_literal 2.7  9_223_372_036_854_775_808 real 9.22337203685478e+18
- test_literal 2.8  -9_223_372_036_854_775_808 integer -9223372036854775808
--
- test_literal 3.3  1e12    real    1000000000000.0
+ test_literal 1.14 -9223372036854775808 integer -9223372036854775808
+ 
+ test_literal 2.1  1e12    real    1000000000000.0
+ test_literal 2.2  1.0     real    1.0
+ test_literal 2.3  1e1000  real    Inf
+ test_literal 2.4  -1e1000  real   -Inf
+ 
++test_literal 3.1  1_000   integer 1000
++test_literal 3.2  1.1_1   real    1.11
++test_literal 3.3  1_0.1_1 real    10.11
++test_literal 3.4  1e1_000 real    Inf
++test_literal 3.5  123______456.7_8__9_ real 123456.789
++test_literal 3.6  9_223_372_036_854_775_807 integer 9223372036854775807
++test_literal 3.7  9_223_372_036_854_775_808 real 9.22337203685478e+18
++test_literal 3.8  -9_223_372_036_854_775_808 integer -9223372036854775808
 +
  finish_test