ea2529528e
Merge all the latest trunk fixes and enhancements into the json5 branch.
...
FossilOrigin-Name: b5ca15cfc19380cf870b70be6a86e70f2026cc3d6d89005b45891d58c4f11c2d
2023-04-28 10:23:01 +00:00
90f549a0cf
Do not assert() a bad string representation in an sqlite3_value after
...
an OOM. dbsqlfuzz c822a17a23c524a0ac7cfb203c7198209da15de8.
FossilOrigin-Name: 91fee79a01971259b21478e60a069a711a00efc79ddfececa6224a152cd8d09a
2023-04-28 10:10:52 +00:00
fb016bf257
Make CLI .load slightly harder to abuse.
...
FossilOrigin-Name: 2779f9270cc431786d0e16ef05ec05b0f22dda2307f3bf17467ad0b25304e160
2023-04-28 00:28:06 +00:00
fe03773305
In the CLI, early out from the output_quoted_string() routine if the
...
input string is NULL. [forum:/forumpost/8a22c0bfa7|forum post 8a22c0bfa7].
FossilOrigin-Name: 2881978d7b7014738a21c590b0430c4fa40e6b00b9547d0284b7656124523ae9
2023-04-28 00:19:55 +00:00
93b4c3beb8
Use a new technique to detect fresh OOM faults in columnName() that does not
...
rely on there being no OOMs prior to entry into columnName(), as
[forum/forumpost/fb6811c2f9|forum post fb6811c2f9] demonstrates a technique
which could cause an OOM prior to entry into columnName().
FossilOrigin-Name: a63346d6a0c0ca7ba4c87499de2e461be9c77e9b5d98f2bebf308cdb6599f33c
2023-04-27 23:59:51 +00:00
bfd28f9e01
Remove a faulty assert() from the CLI.
...
[forum:/forumpost/726c4f7db0|Forum post 726c4f7db0].
FossilOrigin-Name: 4bbebb6bfb9910265d91b777c1711b3b8e0732bcf299f7459b20c4ea110422bd
2023-04-27 23:44:38 +00:00
d5de1f39b5
Remove an ALWAYS() macro that can in fact sometimes be false.
...
[forum:/forumpost/f0e872fcee|Forum post f0e872fcee].
FossilOrigin-Name: d85880e4ed89e2198beea642818051f7a91a71fea9929be0a7ed0603b493ce47
2023-04-27 23:40:03 +00:00
52da6d2607
Test cases added, and some bugs fixed.
...
FossilOrigin-Name: bc84a82e4ddc1b71025c56c49e62a44f0b12fa87a6417ad61967d9d3121a0d4e
2023-04-27 23:29:09 +00:00
263b86c54c
Fix compilation issues seen with older versions of MSVC.
...
FossilOrigin-Name: 4ba2a651120391d779a3db9881c0fb17e1322cc9d8738f915a46e31a2f313578
2023-04-27 22:17:12 +00:00
cf5dce045f
Adjust OSTRACE usage so that it works with the changes in the previous check-in.
...
FossilOrigin-Name: 1eb4573e9092d350d00d05ba716cb0272e2dbb1ecbaadc2a7cc22de0b8cc2bda
2023-04-27 21:31:21 +00:00
ae31f48826
Further optimizations to the JSON parser.
...
FossilOrigin-Name: bb8f1c16f244f893170f3d03bc445bd15fc337804c7c3e76c548397f5b95b39a
2023-04-27 19:30:53 +00:00
1371df2117
Faster implementation of numberic literal parsing in JSON.
...
FossilOrigin-Name: 58398292e8473b0b9e4b77dd5ed27334bc24a85d0c399e8d0b86de6fb59dadce
2023-04-27 19:13:20 +00:00
49d8e0ef97
Add support for hexadecimal integer literals in JSON.
...
FossilOrigin-Name: 85e00c9e68d0695592e8f72555ee133c096bfca5a860a8e21d1e0ef756705aaf
2023-04-27 18:28:10 +00:00
47dd0e735d
All floating point literals "NaN" and "Infinity". Additional variants
...
of these literals are available if compiled with SQLITE_EXTENDED_NAN_INF.
FossilOrigin-Name: c13346afbecb92275e741252897d00478dab4be2d158889bc735e80efd9444f5
2023-04-27 17:32:29 +00:00
8ded164200
Fix handling of reverse solidus in string literals. Allow decimal points
...
in floating point literals to occurs and the beginning or end of the mantissa.
FossilOrigin-Name: d92a6ab2871095ac66c60cfa15dbafa7b762f83d287d452f61792eb30cf5b26b
2023-04-27 16:57:14 +00:00
dbcea23976
Fix the handling of escape solidus in the JSON routines.
...
FossilOrigin-Name: 676877aca235e620ee12d10235dd6ad009d4968455ec170daeb1998b94a7e0a2
2023-04-27 16:24:12 +00:00
13f8a80d94
JSON string literals may span multiple lines by escaping new line characters.
...
FossilOrigin-Name: 66da4bd4a30c390fa1a7960ce2edaef82e63971ecf33ffb6b906db9f278041c5
2023-04-27 15:48:58 +00:00
ef3a162be6
Allow the labels on JSON objects to be unquoted identifier names.
...
FossilOrigin-Name: fb428db3f64f148ab9a3478fdcc8b3733e58102b3c8895a482e2551d974d5661
2023-04-27 15:11:26 +00:00
0d8579120a
Performance optimization in the JSON parser.
...
FossilOrigin-Name: 5a88ba743f55d45b1c0ce0090bb3b396bcf7fcf7b3bcb989aaf30b8bb772599e
2023-04-27 14:38:51 +00:00
2e225a35b4
Fix a problem on windows sometimes causing SQLITE_NOMEM to be returned if an error occurred while opening a temp file.
...
FossilOrigin-Name: c22a39a6b28e3039fe453c0c0db98744b8a63ef9063cc3f6e0ed67d2506d34be
2023-04-27 13:55:29 +00:00
a549e7a527
Permit JSON5 whitespace in all contexts of objects and arrays.
...
FossilOrigin-Name: 93f3ab26b57c0469862a56e97d4b3c796b27f9f582046fcff1f2aa8d8910c550
2023-04-27 13:44:26 +00:00
f59c01e24c
Translate JSON5-only string literal escape sequences into the JSON equivalents.
...
FossilOrigin-Name: 14e82f36eed31af1237898728bf353b968523c62b1f8d1d90dbbabd92d0c2834
2023-04-27 12:24:00 +00:00
c5ee2d8e80
Implement some of the JSON5 enhancements to string and numeric literals.
...
This is an incremental check-in of work in progress.
FossilOrigin-Name: 9508efa9d61c0ff0eb73100dd52889dadc5fa2a2091b944a9b8a74e8a5c50e82
2023-04-26 20:26:14 +00:00
d924af2325
When changing a large integer into a floating point value, cancel the
...
string representation. Fix for
[forum:/forumpost/5c74a3bc4a|forum post 5c74a3bc4a].
FossilOrigin-Name: 3e2da8a7e35c839128d26aac575605e1e34889e8ab3484440bdd65c4d752c6bb
2023-04-26 18:23:47 +00:00
f14b2e35fa
Partial implementation of JSON5 numeric literal extensions. Use a switch()
...
statement in the parser for better performance.
FossilOrigin-Name: 78404dc37024cad5fe7eacf78ea85b56f08b129a1b9a046c3e1b11275068a485
2023-04-26 17:30:28 +00:00
f62518f65d
Work toward implementing JSON5 whitespace. Untested and incomplete.
...
FossilOrigin-Name: d262c059455ebe0650a45a6c1c04d1baf9609c635df352732dd192426e1bdc39
2023-04-26 15:19:19 +00:00
058f3dbb27
The json_valid() function only returns true for pure JSON. JSON5 (or
...
at least that subset of JSON5 that has been so far implemented) is accepted
by all routines, but json_valid() still returns false for JSON5 inputs.
The new json_valid5(X) routine returns true or false if X is or is not valid
JSON5. All of this is experimental and subject to change.
FossilOrigin-Name: 5d33ab77800765c8b3a13ffcc02ba8a348d71b2b425924560418b517d723494d
2023-04-25 21:24:20 +00:00
77a159212b
Remove unused variable ltoj accidentally added by [1783655e].
...
FossilOrigin-Name: faa1575ce0a39a2335a77057e8769a4e67aedd6326b4627988d03f0cb21fc39a
2023-04-25 14:54:18 +00:00
0941ea8a62
Avoid assuming that an expression in an ON() clause that evaluates to zero implies that the query will return zero rows when the query contains a RIGHT JOIN. [forum:95849acbe1|Forum Post 95849acbe1].
...
FossilOrigin-Name: 1783655ea422185e75593b89e4ef452a6f5496aefd389f88ce7fe4b7d41d6a98
2023-04-25 14:37:12 +00:00
be5bada4d0
Allow trailing commas in objects and arrays of JSON.
...
FossilOrigin-Name: 4031b231c223db598b45dbd192b027a99a9b82a981d43c75f723a3fb06720b82
2023-04-24 23:14:34 +00:00
022a042897
CLI to have "undocumented" dot-commands, not usually shown by .help
...
FossilOrigin-Name: 17f5dd2d2ae02a95180b9208b7de805922ba20271d3263e3193f0d46f4ec324c
2023-04-23 00:12:23 +00:00
223c6b48a9
The sqlite_stat4.idx field is case insensitive. It should work even if
...
some entries use a different case than others. Fix for
[forum:/info/6c118daad0f1f5ef|forum post 6c118daad0f1f5ef].
FossilOrigin-Name: f097ca70b5b967d1aadebd74ac5020813e00b7c30cc543814dbf5f359d1328f1
2023-04-22 22:32:19 +00:00
2f251f4929
Enhance the ".tables" command in the CLI so that it is able to deal
...
gracefully with an OOM situation.
FossilOrigin-Name: 5157fd1cf753b1c01c6c00e9ac2712da2631a673837ed15ec3420ec869ee66aa
2023-04-22 20:22:17 +00:00
f661db3050
The assertion-fault fix in [53a61f7423a7f057] was not quite complete. This
...
additional change enhances it to deal with WITHOUT ROWID tables. No changes
to deliverable code.
FossilOrigin-Name: 4d5af42c651bc1655a4f09b743f2a1424f19c1e4248e041b3fd4a042fd1f9799
2023-04-22 20:07:48 +00:00
e945b29359
Add --unsafe-testing invocation option to CLI. Needs some tests added and changed.
...
FossilOrigin-Name: b3d9ac052d5c2dd1afeeeb5c9cfac9dd91a1b8d6a74a2ef10aa2037ca505abce
2023-04-22 16:46:38 +00:00
a9c4c82ef1
Fix an incorrect assert() statement in btree.c as found by
...
[forum:/info/d03345d572713fe6|forum post d03345d572713fe6].
FossilOrigin-Name: cd485b302c54aef066d751a153df34eea0cd23e54a414e291f636ad9929fe78a
2023-04-22 12:47:16 +00:00
fb50f96121
Fix a incorrect assert() statement in the pre-update hook logic. No changes
...
to production code. Fix for the problem reported by
[forum:/info/19b217bfe709a072|forum post 19b217bfe709a072].
FossilOrigin-Name: 53a61f7423a7f057568a1d8a1e63be01a2328997850dc32e3d8c6d51f1c5ab0b
2023-04-22 12:37:41 +00:00
bbe1986761
Fix harmless compiler warning in [1489e7f53a4863b3].
...
FossilOrigin-Name: da907dbc60b4f754845ae0bedc05cbda4cbfed9f468be3ffdc18860c763d9324
2023-04-22 12:11:31 +00:00
1a2c7f9029
Also fix no-length string intolerance for CLI json mode.
...
FossilOrigin-Name: 3ac1984039a50445ff65db97468a5313d7f09db7b604755e444b77ac9346ea76
2023-04-22 11:33:27 +00:00
d9eb39e625
Early out from sqlite3Prepare() following an OOM to avoid possible
...
problems further along in the parse. Fix for the NULL pointer dereference
reported by [forum:/info/2e5131839365682a|forum post 2e5131839365682a].
FossilOrigin-Name: f35ce7c122017009496b777f33e641d0be086abee6ea8e25aab4c3e0fb45731a
2023-04-22 11:29:36 +00:00
8bfa190e9a
CLI to handle absurd string length limit better. [forum:5180af725f1cc375|forum post 5180af725f1cc375]
...
FossilOrigin-Name: 1489e7f53a4863b316af6dee10d9c66491d1bed6cf52a3538ac118c03b1d7ef9
2023-04-22 11:24:52 +00:00
c40a7c82fa
Avoid need for cast in CLI shell_check_oom() calls.
...
FossilOrigin-Name: c88550ef6711b03a81e2e6d121e2eb99ccff6e925c025dd6e85dd81088508400
2023-04-22 09:26:36 +00:00
5870e942c2
Fix unchecked return in CLI .dbi command. ([forum 79e2cd1bc](forum:)79e2cd1bc)
...
FossilOrigin-Name: 81a74ee9d66ba23dfadd875e372ce96491dd6bf146e03e7fec8c3fd98e6be825
2023-04-22 09:14:22 +00:00
0e38c6e696
Change the return type of the ts_read/write() family of functions from int to ssize_t, per report in [forum post 947169d5e7](forum:947169d5e7).
...
FossilOrigin-Name: 7809e7ce6a70657b8ea239eb4778698f7986a658e9177a57b2fb7814c069c936
2023-04-21 15:37:33 +00:00
88ed723490
Increase CLI tolerance of arifically low memory.
...
FossilOrigin-Name: 13f2638622871db9b91db547dcfd38f61c03e7696e4df5144adefcd86140aeba
2023-04-20 20:07:14 +00:00
1829f34f46
CLI .ar made to enforce getting a proper subcommand.
...
FossilOrigin-Name: 104ab105ac0e96c0fc61c6d69179bf984fcfe5e0efb2c82f3742456c1b5fe5d1
2023-04-20 16:15:20 +00:00
5eca6ffe5c
Fix a function declaration so that it correctly appears as private in
...
the amalgamation. [forum:/forumpost/ec8c77516c|Forum post ec8c77516c].
FossilOrigin-Name: 1864569bb9fe28a5e77f34b199f26ac272dbbb1a6642dacd7e50ddd29aa567b6
2023-04-20 10:40:37 +00:00
f23adcbaa4
Improved rebustness of the pcache tracing logic.
...
FossilOrigin-Name: 0a43235b8368a0996d1856c4e956786a5321275458cb9179ce818aa47bb824ed
2023-04-19 18:36:49 +00:00
2cc723a2da
Remove unreachable legacy code.
...
FossilOrigin-Name: e3e7fb87d90690c29b70da261887c8f7d87b62188d15577e48db91232e13608c
2023-04-19 18:32:32 +00:00
3115b36d67
Fix a segfault that could occur if a non-empty in-memory database was the destination of a backup operation from a database with a smaller page size.
...
FossilOrigin-Name: 020968f857d7b90bab3525fc9d6b859a019f6a80422c3d5ffb88f5bdb8e02a11
2023-04-19 17:07:35 +00:00
drh