mirror of
https://github.com/tursodatabase/libsql.git
synced 2025-05-13 18:43:07 +00:00
* Remove unused elements from the json_tree() cursor. FossilOrigin-Name: 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0 * Same results as the legacy JsonNode implementation on a small set of test cases. FossilOrigin-Name: c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085 * Fix corner-case error conditions. FossilOrigin-Name: ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d * All tests passing. FossilOrigin-Name: b5a5660ca22437640c9bf32c44d92c76a7293dafcbaf4fa6a4c171128d64871d * Give the json_valid() function an optional second argument that determines what is meant by "valid". FossilOrigin-Name: a4e19ad43dac81e7655ec03ff69bb99d1d02b0c227034c90fb41415fd4793fe3 * Enhance the (SQLITE_DEBUG-only) json_parse() routine so that it shows a decoding of JSONB when given a BLOB argument. FossilOrigin-Name: af267868562e0799ad691dccad05f17afbc34d609eede8c55f57d209290246ef * In SQLITE_ENABLE_SETLK_TIMEOUT builds, use blocking locks in place of sleep() when opening a read-transaction. FossilOrigin-Name: a51ef39998e25e86bd0600e71d15011b12e05f4319608018293bdaecb09e8c97 * Have SQLITE_ENABLE_SETLK_TIMEOUT builds block when locking a read-lock slot. FossilOrigin-Name: f797baf47cf7859cfd8ce248f4f3087af4551a7040af990333426e5a7c269504 * Add untested (#ifdefed-out) code for the MergePatch algorithm against JSONB. Add (and test) the jsonBlobEdit() routine that is needed by the new MergePatch. FossilOrigin-Name: 4d353387fc10e1038cfdd86e66007bf728c231a928e588897bbee0fbfe76f225 * More aggressive use of jsonBlobEdit(). Improvements to the MergePatch implementation sketch. FossilOrigin-Name: fbca9570fd2e1465739e4d3a8d9bb40fad594fd78ab49b2cb34efa27ebdd8361 * The json_patch() code for JSONB compiles and works sometimes, but there are still issues. Incremental check-in. FossilOrigin-Name: e0099464a0045a04f4ccf29bc2b8325fc8c7f39ccf4847e74818f928c9153588 * All legacy tests are passing. FossilOrigin-Name: 2c436806b8d5f57de99c00f6154b038454fb9ae427d00d7b4a46ab9c7c69bcb9 * Handle an SQLITE_BUSY_TIMEOUT error if one occurs while attempting a shared lock on a read-lock slot. FossilOrigin-Name: 5fbf3906d272df3eb981f67455eb35f649ad2774cba9fc3f077b28d9bef3f0cb * The json_remove() function now uses only JSONB, never JsonNodes, internally. FossilOrigin-Name: b69786e746ae2b927b64d9871fd120b7f8f06cc53739fd46a4da51aa16cf8576 * Attempt to get json_extract() working with pure JSONB only, and without the use of JsonNode. Mostly working, but there are some differences from legacy in corner cases. FossilOrigin-Name: 8c324af1eca27e86adc45622af4f3b06a67a3f968596ac58aa7434b1f6f05f3c * Preserve flexibility in the format of the RHS of -> and ->> operators found in legacy. FossilOrigin-Name: 6231ec43adb7436195eb1497de39a6c13c6b4f1c5032e6ea52515d214e61fdbc * Do not set the J subtype when the output is JSONB. FossilOrigin-Name: 4f106b64fe8988435872806bd0a6c223b61f53af0dd1c47c847bb4eec4e03e27 * Convert the json_array_length() function to use JSONB instead of JsonNodes. FossilOrigin-Name: 5ab790736d943e08f097efcee5cfbf0d83c65b0a53f273060330ba719affa5e5 * The assertion change at check-in [7946c79567b0ccd3] is insufficient to fix the problem of a Table object being deleted out from under the OP_VCheck opcode. We need to reference count the Table, which is accomplished here. FossilOrigin-Name: cad269d5e274443c39203a56603b991accc0399135d436996fc039d1d28ec9db * In the recovery extension, if a payload size is unreasonably large, it is probably corrupt, so truncate it. FossilOrigin-Name: 988c3179e978a3a6d42541e9c7a2ab98150383671810926503376ed808f150ff * Fix signed integer overflow in fts5. FossilOrigin-Name: 60e46c7ec68fd8caaed960ca06d98fb06855b2d0bb860dd2fb7b5e89a5e9c7b4 * The json_patch() function now operates exclusively on JSONB. This patch also includes improvements to JSONB debug printing routines. FossilOrigin-Name: fee19d0098242110d2c44ec7b9620c1210ef3f87913305f66ec85d277dd96ab6 * Convert the json_error_position() routine to use only JSONB internally. FossilOrigin-Name: e7a8ba35bff6fde55827f978de5b343b6c134c7fa53827f5c63915a9dc2598ad * Convert json_insert(), json_replace(), json_set() to use JSONB internally. Mostly working, but some corner cases are still not quite right. FossilOrigin-Name: 99c8f6bd5c9a31b6d00f92e383bec8a8235ed553916ad59adbb1b7663f6ebff1 * Update some OPFS-related help text in WASM tests. Minor cleanups in speedtest1-worker.js. FossilOrigin-Name: 263f6d3a7784ef7d032dbf7a3265aca8dd70bf50797f28f6b2e8ddb6a301f83a * New test cases for insert/set/replace with paths that indicate substructure that does not yet exist. FossilOrigin-Name: 146c717c51940b2139befc45ac74e7a1c36ef3c32fd3cfe35b334488eebe6298 * New JSON test cases showing insert or set with missing substructure. FossilOrigin-Name: 6802b6459d0d16c961ff41d240a6c88287f197d8f609090f79308707490a49c2 * Simplification of the new JSON insert/set test cases. FossilOrigin-Name: 04c0d5644372446c924a2e31a26edf51ddc563a1990d170b0ed4739e3e8b239b * Enhance json_set() and json_insert() so that they create missing substructure. FossilOrigin-Name: cc7a641ab5ae739d31c24f0ad0caeb15a481a63fa8f13720718ea922c25862ff * Convert json_type() to use JSONB internally. FossilOrigin-Name: 83074835b900ce85cf67059e674ce959801505c37592671af25ca0af7ed483f1 * Add a basic batch-mode SQL runner for the SAH Pool VFS, for use in comparing it against WebSQL. Bring the WebSQL batch runner up to date, noting that it cannot run without addition of an "origin trial" activation key from Google because that's now the only way to enable WebSQL in Chrome (that part is not checked in because that key is private). Minor code-adjacent cleanups. FossilOrigin-Name: 883990e7938c1f63906300a6113f0fadce143913b7c384e8aeb5f886f0be7c62 * Convert json_valid() over to using only JSONB as its internal format. FossilOrigin-Name: 7b5756fa6d00b093bf083a8d7a5ef5485f7a09e4eac473785c8380688f861a1b * Remove all trace of JsonNode from the JSON implementation. The JSONB format is used as the internal binary encoding for searching and editing. FossilOrigin-Name: 11ebb5f712cc7a515e2e0f2be8c1d71de20c97fe5b74c4f4d72c84fd21182d35 * First attempt to get the JSON text-to-binary cache working. All test cases pass, but the cache seems not to help much. FossilOrigin-Name: 25ed295f300fea6185104a73721076bccd2b2a6e411c78564266fa6dca4ff70c * Cache is working better, but does not preserve the hasJson5 flag. FossilOrigin-Name: a12add7ab9f5aee5bb2ede0c4d22e599dd28f7a107dce72b2ea48ef92d233e8a * Fix up the JSON cache to work better. FossilOrigin-Name: 1fdbc39521f63aedc6f08ecaafa54ea467b8c6316a692a18ad01eecbf22a0977 * Different approach to querying a tokendata=1 table. Saves cpu and memory. FossilOrigin-Name: c523f40895866e6fc979a26483dbea8206126b4bbdf4b73b77263c09e13c855e * Remove old code for tokendata=1 queries. FossilOrigin-Name: b0a489e8e1bf0290c2117ab32d78b1cc7d67bcb226b55ec044c8367ebde3815b * Performance optimization in the JSON parser. FossilOrigin-Name: 68d191f40e708962ec88e0c245b4496bc4a671300484b1cc0f3fc7e6d199a6e6 * Fix harmless compiler warnings and enhance performance the parser. FossilOrigin-Name: 285633da6d188547e52f07779e209c9e5f3dc33ce0668e14858f3337889ef4b8 * Unroll a loop in the parser for a performance increase. FossilOrigin-Name: a6dc29e4d5e13949e0fcd9d5dde575c2670eb10a230ab9df3806fc8c3016c540 * Remove a NEVER that can be true if a virtual table column is declared to have a DEFAULT. See [forum:/forumpost/3d4de8917627d058|forum post 3d4de8917627d058]. FossilOrigin-Name: 8abc2ccaf8106f20243568cd7fa74174386eb85d7ea381201e97e2fd527033e0 * Simplification and optimization of the JSON parser. FossilOrigin-Name: f5ec9485119a2a6cb33eb864c7ca9b41d4a2ed08ab6ad9a6b0dd9358ab253576 * Performance optimization in jsonAppendString(). FossilOrigin-Name: fdf00e96239c73fb67e2acecc5b95f55a1fc51c3deed4512613c0d6070ce5805 * Minor fix to the header comment on jsonXlateTextToBlob(). FossilOrigin-Name: c3677ba410208c07b711f5f526eb5cf039a8eee49f632c7ae04fa55cdfbb9058 * Fix potential unsigned integer underflow in jsonAppendString(). FossilOrigin-Name: d2fba2cbdc3870d34228c1a9446eced884325acc183900d7dd0b96132570fb4a * Do not allow a JsonParse object to be considered "editable" after an OOM. FossilOrigin-Name: c6bacf57bd6fe0fee00c9d41163a270b60997c20659949971bbf5c6c62622bfe * Protect a memcpy() against OOM conditions. FossilOrigin-Name: 26144d1c25ae0435db568009ba05e485d23d146f2b1f29f3a426c87860316aed * Ensure that tokendata=1 queries avoid loading large doclists for queries like "common AND uncommon", just as tokendata=0 queries do. FossilOrigin-Name: 7bda09ab404a110d57449e149a3281fca8dc4cacf7bd9832ea2a1356ad20fe8e * Take extra care to ensure that JSONB values that are in cache are actually owned by the JSON subsystem, and that ownership of such values is not handed back to the bytecode engine. FossilOrigin-Name: 1304534001e9ef66c6b12752b69d790bfa3427cc803f87cc48ca22ae12df0fdf * When tokendata=1 queries require multiple segment-cursors, allow those cursors to share a single array of in-memory tombstone pages. FossilOrigin-Name: e0175d07e4094db5ea4b0378a5ff480dafb6ba9da86a113fa767c4c89c3c866f * Fix harmless compiler warnings. Refactor some identifier names for clearer presentation. FossilOrigin-Name: 7e3941502789c5afaf19b08112f464abf5e3cba7f92fc9290af2a0f96127ad9a * Code and comment cleanup. Everything should work the same. FossilOrigin-Name: c640754df0d3ffdad994745f0d0e10c8f19f424b87f6a6e6e269491a0350b950 * Fix various compiler warnings and other problems with the new code on this branch. FossilOrigin-Name: 3a623cfa173b4035c759cb84985d11d8727053beb383648503987d6ab15c0ef0 * Fix harmless compiler warnings reported by MSVC. FossilOrigin-Name: 419652c0c82980bd043584dcd2976f91dfff7b926b216d597698299850b855c0 * Implement strict JSONB checking in the json_valid() function. FossilOrigin-Name: 0f26d38880fcbc207abcc94dbc170a7428bab1b4f0b7731aaf5bee0224000994 * Minor code changes for consistency and to simplify testing. FossilOrigin-Name: df272bd837910ad9e03e222716a1201a601399664365f1dcf73d5932372518ed * Do not let bad hexadecimal digits in malformed JSONB cause an assertion fault. FossilOrigin-Name: 8dec1ba1e5076ff596756e00c1e2ada0245f168a503dd1cadadf848331acfac3 * Enable incorrect JSONB to be rendered into text without hitting an assertion for a bad whitespace escape in a string. FossilOrigin-Name: 4d6a9a217df6792b41766b774fb0c0553b45f9104c26a0955bf4a30862d7d7bf * Ensure that OOM conditions in the generation of the "bad JSON path" error message result in an SQLITE_NOMEM error. FossilOrigin-Name: aa0e02b5c26a2ef3d6216a0ed8bc01382be43173485f898cb63f2a8c559f2e74 * Avoid problems when the path argument to json_tree() contains embedded U+0000 characters. FossilOrigin-Name: 9f055091af01a5dddba1a7e9868ad030c8f206237e1569215cb161e53e54aa71 * Remove dead code. Improved reporting of errors in JSON inputs. FossilOrigin-Name: 2eaa738e6b5c1b67b3e57c868d9c3a30eea38a0b3b8b02482f06d57a45b10921 * Back off on the use of strlen() for situations where sqlite3_value_bytes() will work as well, for performance. FossilOrigin-Name: 79fb54fbb8b9c30f47cdbd437d24a21542716241e822749e5e28c9fbc449bfa8 * Better pre-scan size estimations for objects in the JSON parser resulting in fewer reallocations and memmove operations. FossilOrigin-Name: 526b27f90897f5e35dfff7257daf6c4ce4798d649b09b8aecfb02df0449e3c51 * Repair issues and inefficiencies found during testing. FossilOrigin-Name: ae973cb1515f9d76409c92a2ca2ffd6b71f32b0b490a4886770e7c1b90f12611 * Add tests for using tokendata=1 and contentless_delete=1 together. FossilOrigin-Name: a2506b8c9718054912270055638204753c4156bbc115e55194e6df9d7e76cb10 * Two new NEVER macros. FossilOrigin-Name: 52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f * Remove reachable ALWAYS and NEVER macros. FossilOrigin-Name: f601de3eeabd85993c1f5ee96b62de6fdabbeae2fe8950e00d08feb48d42c498 * Fix bug in xInstToken() causing the wrong token to be returned. FossilOrigin-Name: da78d07e77cbc783fbc725758911c230fd6a1c1885d9576125de955dcc2bd37f * Continuing simplifications and code cleanup. FossilOrigin-Name: ddf92b5059a9106753fd18b82ba8daa269a62af947561c460790107b83416f0b * Fix a problem with the xInstCount() API and "ORDER BY rank" queries. FossilOrigin-Name: 317a50563d9e8586fda136e513727241b414e7267d50a06571c8ebd0eae710bc * Fix memory leak in new code on this branch. FossilOrigin-Name: ebc160b9a05568df66f86e30804399ee29d34b44a60c57e062f98cb92826353f * Fixes for xInstToken() with tokendata=0 tables. And with prefix queries. FossilOrigin-Name: 78fbb71598b1ca756acc078253880a1d0f7983a5a26b9efc683e6488122505a1 * Fix errors in rendering JSON5 escape sequences embedded in JSONB. FossilOrigin-Name: f1a51ae3863557526a51c6e98e71fcdf4f1ed14a36212b3c90f7408f926345e4 * Do not make the input JSONB editable in json_remove() if there are no PATH argument. FossilOrigin-Name: 66594544f3ba9977475a3e3f74404eb2b2fb845053b28bd24c2b52c7df94e9d7 * Fixes to error handling in json_array_length(). FossilOrigin-Name: aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b * Add further tests for xInstToken(). FossilOrigin-Name: 8582707f16133f003a6687f68cbea03d4eb6c2a0e2e07746b7cace0c44e84fa4 * Rename the internal routine jsonMergePatchBlob() to just jsonMergePatch(). FossilOrigin-Name: ebf667b616235bb64b83832008342ba5e7b10b2c170d7cebc431f040fef7ecfb * Fix OOM and corrupt JSONB handling in json_patch(). FossilOrigin-Name: 1910feb0b7d5cc2b810c3322f6cca281d8730182d30d162bd7bb56800979ea91 * Use an assert() to fix a harmless static analyzer warning. FossilOrigin-Name: a249ca657e624028bc6b3d2c2bcedd7162d118addb7d62ce519920cecebf1860 * Clean up the JSONB performance test script. FossilOrigin-Name: 905301075a7fc1010ee7e754867b1b698c9b8576d50e98125def32a5dfb7ee9d * Small performance gain by unwinding the string literal delimiter search loop in the JSON parser by one more level. FossilOrigin-Name: 4c587feac153e8ebe526559ec3d254f545f81e8d1ed3126f91a5ff25ec4aa72e * Use strspn() to accelerate whitespace bypass in the JSON parser. FossilOrigin-Name: 843197df08352bdff4b87be91d160e574572aded0d0c66142fd960000c0b4701 * Miscellaneous comment cleanup and typo fixes. FossilOrigin-Name: 59446dc0bd0091572122a3c8b4653d7a2dc867d16c4a5919f79b81bc3a673ce3 * Further tests for the new code on this branch. FossilOrigin-Name: 59d008b6c23ab900377bc696ee19381feb7614bac80546eae361e401c3620c4e * Use extra assert() statement to silence harmless static analyzer warnings. FossilOrigin-Name: 174c2b2eef5fecd96a5fc89b81032fe81f7801f12097cea10e7e7f0a02114813 * README.md typo fix reported in the forum and update all links from http: to https:. FossilOrigin-Name: 5c48acdbb44185b352b54911a57a6986d6c7e624bdeba2af48b985d29f0292bf * Increased rigor in comparisons between object labels in JSON. FossilOrigin-Name: 2bc86d145fccc07107b7753cb1a69122676d4096fe59c454497bd81a6142d45e * The rule for the RHS of the ->> and -> operators when the RHS does not begin with $ is that it must be (1) all digits, or (2) all alphanumerics, or (3) contained within [..] or else it will become a quoted label. FossilOrigin-Name: 0e059a546ec11fa5c6d007bd65c249ee2422f1facbdb2792c53e0bc0ccc97e14 * Test cases for object label matching with escape sequences. FossilOrigin-Name: c6f2aa38e95b7888650cfa7bb773b18a28e01d883033ac77be6d504ffe417d18 * In CLI, move -interactive flag handling back to arg-loop pass 2. FossilOrigin-Name: 63cb05a862532d2d56e9e81fe32ced09bf58f03146587a118f11c2a84e195e69 * Fix the routine that determines the json_tree.path value for the first row so that it correctly takes into account escape sequences in the path argument. FossilOrigin-Name: b9243ee8a37c62eb8848e765bd4af83bc1b3d3eb24fb4268a1357ad1f8b2e1fb * Correctly handle 8-byte sizes in the JSONB format. [forum:/forumpost/283daf08e91183fc|Forum post 283daf08e91183fc]. FossilOrigin-Name: 73d390f39c0bbbc017e01544e4d43c76761f2599bd57f900131c706270dfd202 * Update documentation comments in fts5.h. FossilOrigin-Name: 38c50e22c98607e6c1fd78d7615cda534773b6d4fd85c712b54749fcd7af0c83 * Work around LLVM's newfound hatred of function pointer casts. [forum:/forumpost/1a7d257346636292|Forum post 1a7d257346636292]. FossilOrigin-Name: ec0ae4030968c782af48d1c776351c14b2ada21d40aeb97915f33df30706e18f * Fix compiler warning about shadowed variable in fts5_index.c. FossilOrigin-Name: ee70e4c1c9c41617850228e48d8df44f105cf2fbbe789340ceca6f27ad6ce5eb * Improved detection of corrupt JSONB in the jsonReturnFromBlob() function. FossilOrigin-Name: b014736c1f80ccc46fb4b24ac04310a6ce5cb5b6653665efff366cb3bc742257 * Add ALWAYS() on branches added in [ec0ae4030968c782] that are always true. FossilOrigin-Name: 451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f * Rework the jsonEachPathLength() routine in json_tree() so that it is less susceptible to problems due to goofy object labels. FossilOrigin-Name: 858b76a00e8ff55215f7a2e6a4cd77fc4d4f98dea7224cd90488744f5ce246a4 * Different fix for the fts5 COMMIT-following-OOM problem first fixed by [fba3129d]. This one does not cause problems if an fts5 table is renamed and then dropped within the same transaction. FossilOrigin-Name: d8c6b246944934a7a6e027b3f5b986fd64a19dd5c5c5175f4ea8586da59a6764 * Fix a problem with handling OOM and other errors in fts5 when querying tokendata=1 tables. FossilOrigin-Name: bc911ab5953532956510c199be72b1d3c556f2d0ddbd7fc0ae6f5f917b337b48 * Fix a null-pointer dereference in fts5 tokendata=1 code. FossilOrigin-Name: d69fa8f0504887f968d9a190ecb889ddb40bb1b56d0d4479f9819c106aec719b * Avoid an assert() failure when querying an fts5vocab table that accesses a tokendata=1 fts5 table with corrupt %_data records. FossilOrigin-Name: 386ba9e20423fb2f623d6adc9d3c310fb1b135f54a1dad15ef3b593d97886926 * Ensure an fts5vocab table never uses a special tokendata=1 merge cursor. FossilOrigin-Name: 1e26510e83b40c9bd2e8bfa2a0e81f2cb915e78fed773204ef537683e48b61dc * Avoid dropping an error code in new fts5 tokendata=1 code. FossilOrigin-Name: a66596e33dc9aa4bab2ec3ff45546e1321d0a11bdc764f8381b315292ca92423 * Fix a harmless compiler warning about "confusing indentation". FossilOrigin-Name: 34f9e9a8c4bea13f60f43062e25cd7d9422f2e7f5b371ed0ddadc9abeb3ca256 * Fix a potential problem RCStr access on a JsonString object that is not really and RCStr. Fuzzer/UBSAN find. FossilOrigin-Name: d2f2174ce2cc89606034e158149a2d05fc3627ec4d5cdb772add7a2250f29d78 * Fix a harmless UBSAN warning. FossilOrigin-Name: 1503cba6d17e9bade7a5c103ddd23241ff4741f9a2e3032ffe2987af243dae65 * Fix a potential use of uninitialized value in json_valid() with 2nd argument of 8. FossilOrigin-Name: fa102036fe46eeb71b7df3e265be1935ae5c78e0b939b08841bcfb8abadbc77a * Work toward enhanced functionality for json_valid() with deep checking of the JSONB (second argument has bit 0x08). FossilOrigin-Name: c370d573198b151767f04e91bf8baa4ae0076751ae468c5709742a0b0ed16770 * Add SQLITE_TESTCTRL_VALIDATE_JSONB, which if enabled under SQLITE_DEBUG causes cross-checking of generate JSONB. FossilOrigin-Name: b410a4db74a650003539ffaaea18519d5159b504daac47db6a4874b730f40ac8 * Rename the new test-control to SQLITE_TESTCTRL_JSON_SELFCHECK. Make it so that the current value of the setting can be interrogated. FossilOrigin-Name: 7aff1d9a4cb17ecd5abab21ab032f35a78741dd641ddd8cbcc85fc4a81a0707d * Activate JSON_SELFCHECK within fuzzcheck. FossilOrigin-Name: 4d14e733bb521aed65e98533969d2303738232ae87dab70fdf7962e6513195f5 * json_valid(*,8) allows minus-signs on hexadecimal literals. FossilOrigin-Name: c0d7f4520d839a268b3fd2474d0897a9832aa608bd6238b3e287fabecf07a350 * json_error_position() now uses jsonValidityCheck() to find the approximate position of an error in a JSONB blob. FossilOrigin-Name: c3d60cf7028a333b825d5b89516945a73e0c158ac81d8bcc117d21bfd98602c8 * The json_error_position() function now reports an approximate byte offset to the problem in a JSONB if there is a problem. FossilOrigin-Name: 80d5d94dff6a2d2557039be3d7d47c1a6003c4b98defe0bd411acfeb963ad5dd * Validity checking of text nodes in JSONB. FossilOrigin-Name: fa5160687c2f970d407e8af73c246f7cd806bb4ce35f29a79ac534a8646a6c8e * Improvements to JSONB validation - catch more cases where the input does not conform to spec. FossilOrigin-Name: be1864eac4eb75cc30bf98f73092c8608467f4bd956240df6a0cbea9f1e09e85 * Add NEVER to two unreachable branches in JSON. FossilOrigin-Name: c96ebb086feb89341565cc52b970ae7799ce1327fe1ad4fc790f1b0dcaa6e229 * Worker1 Promiser API: when multiple db connections are active then use the requested connection instead of always the first-opened connection. Bug reported in [forum:894c330e7f23b177|forum post 894c330e7f23b177]. FossilOrigin-Name: 194276e18e0268829061c09317e7f9f527a703eb45f1755ff1dd30bd99dc1b68 * Fix the JSON object label comparison object so that it works correctly even if the label ends with escaped whitespace. FossilOrigin-Name: 4d5353cadd7b7c5f105bc197f3ec739e2d041472d6b3e939654c9f9cfc2749ae * Improvements to UTF8 handling, and especially the handling of invalid UTF8, in the JSON routines. FossilOrigin-Name: 1b229c1101d6c384a30f343c5e47b471ab084b2d8e81170eb8f642afc1c67e3b * Bug fix in the JSONB validator. dbsqlfuzz ac6fa521a08609a642198e7decf64180e750b3c4 FossilOrigin-Name: 3e940a6a08b0a0434650cd3d8dd286e09ad8ab805b0a4d515e57bba5d3608577 * Avoid invoking sqlite3ExprColUsage() on an unresolve column reference. dbsqlfuzz fc34aa62df4de103705d11b807074687ffafbda5. FossilOrigin-Name: ac9314c0e335694b48c613145f5397247bb88c51806cd0dc3ed4ec306db4bbad * In CLI, fix .read inability to open 2GB+ files on WIN32. FossilOrigin-Name: 56c80a62d2e033d64ba5d545ae9cbe3ed7c9d046c0a3fafb6cfa2f0b562d1ef0 * Pass subtype information through the aggregate ORDER BY sorter for aggregate functions that use subtype information. FossilOrigin-Name: 3536f4030eab6d650b7ed729d2f71eb6cc3b5fbe16b4e96b99008d66522aaccb * Improve the error message returned by an fts5 'rebuild' command on an external content table if there is a problem with the content table or view. FossilOrigin-Name: 0fbf4b8a58fde1c187908934da6f59999b146f32e07ac255cc531c5c4d7007fd * Fix harmless compiler warnings in JSON and FTS5. FossilOrigin-Name: 90135efccfeb1046f002bfcbd8dfec9a1a3b40cbe1b5c714ae065b06368e354f * Add assert()s to FTS5 to fix static analyzer warnings. FossilOrigin-Name: 27d4a89a5ff96b7b7fc5dc9650e1269f7c7edf91de9b9aafce40be9ecc8b95e9 * Use SQLITE_STRICT_SUBTYPE=1 by default for the JNI and WASM builds unless they're explicitly built with SQLITE_STRICT_SUBTYPE=0. FossilOrigin-Name: 990211357badf0ab08bd34cf6d25b58849d0fd8503e289c1839fc837a74e1909 * Correct --enable-sab flag in ext/wasm/GNUmakefile to fix a silent alhttpd args-parsing error. FossilOrigin-Name: 7b9b757d872a31395b0f6454e2309a6a4664b8bdd8749f6a15371cbe72c05b60 * Avoid running the "no_mutex_try" tests with SQLITE_ENABLE_SETLK_TIMEOUT builds as part of the release test. FossilOrigin-Name: 6b4e1344a28c213cbe8fb97f7f3f6688de93fb73ed96bf460ff74c959da1a712 * Do not run test script fts5origintest4.test with either "memsubsys1" or "mmap" permutations. FossilOrigin-Name: 05a63d9603ef42cbee6dadff72d97583a9c78e549f70e9a808534d5c1ae7c28a * Fix a new JSON test case so that it works even if SQLITE_OMIT_VIRTUALTABLE is defined. FossilOrigin-Name: b995aae510888a9746b46545d176a0885d4738e1f1bc0b7ad7937ed023efd7d6 * Add mention of --buildonly and --dryrun to the testrunner.tcl usage screen. FossilOrigin-Name: 23b92d915c12ee768857e2c3c961832f390cad9b53b8bcfc2b97664baab25bb7 * Avoid expiring prepared statements in the middle of an integrity-check. FossilOrigin-Name: 88beb48472da4667c0727c8ebabe046ea526450ff837fe789d041ed3f1ff105e * In the count-of-view optimization, deferring freeing obsolete parts of the parse tree, on the off-chance that some other part of the code might be holding a pointer to those parts. FossilOrigin-Name: da442578856c87137eb1677d9b13b7c1cf15828cc41d4756572b278060f69bae * New test case based on Chromium bug report 1511689. FossilOrigin-Name: 2c7ef4b4d215f99f8d6787adb64e2037ae96e5dd6cb49c8b81634249f5e1b328 * Enable SQLITE_STRICT_SUBTYPE for default builds of the shell, fuzzcheck, and testfixture. FossilOrigin-Name: 5a0c517ed7e46c0f8a3db752cf5b9f8010c60f35084606abe9e7c1c4f993b4a7 * Enhancements to the "randomjson.c" extension. Automatically load that extension into fuzzcheck. FossilOrigin-Name: 70620405ab01d6a5d38bafa9ae175fd6e4eabaf2efb7854734278dafd7b05c99 * Enhancements to ext/misc/randomjson.c. FossilOrigin-Name: a4e6d1f86f3a502e4170f5a90031e269e48363e95114a66b84d373e3ce0b2704 * Bug fix in the randomjson.c extension. FossilOrigin-Name: 1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91 * Ensure that all object labels for individual objects generated by randomjson.c are unique. FossilOrigin-Name: 29c46aca231b3f1e997ef306a5a651408185bf3ad09ab9fc1fe21ed18caa4d02 * Add randomjson.c to testfixture. Use it for a new set of invariant tests against JSON functions. FossilOrigin-Name: f1c040606bfe784804134d8f3ca130908fad5212b47e3c32792baab977470943 * Ensure that the insert/delete size delta on JSONB objects in the JSON cache are always set to zero. FossilOrigin-Name: 4b4581668a908473dbf1322a3e98bc7cca122998c44518ea183af7f0d1ba9f95 * Fix JSON to JSONB translation so that it deals correctly with Infinity and NaN. FossilOrigin-Name: 178cb84f36bdb45ba17511900d6d8ea8dfa14912fc5bf7094a20348174a36c95 * Add NEVER() to an unfalsifiable branch. FossilOrigin-Name: 9a0c67db366d38a0b0741f6a1ae333cf27cfe6f6b7c6eed94bdec9686f9f9f8a * New JSON invariant test cases. FossilOrigin-Name: a6a1367b0bf364b1a2e20e153c5f4a578624b8846f9ec0b7c9c3cba0ea2ec346 * Remove a stray comment in the JSON code. FossilOrigin-Name: 6618bdf0679405b43911ea8cd94050b12a5dc469f3dfe4759ee3ff850a55229e * Extra ALWAYS() macros to verify state in the sqlite3ExprCanBeNull() routine. FossilOrigin-Name: be19b84c9f3fe127165809908add148dbe9a827a55608b0490de7e69b7f7f191 * Always make the sqlite_dbdata virtual table available in the CLI. FossilOrigin-Name: e5fd3b32ad87586a7413570e568c9c1859a37a4f836cca074126471b125fb682 * When unable to resolve an identifier, change the Expr node into TK_NULL rather than TK_COLUMN, to prevent any downstream misuse of the non-existent column. dbsqlfuzz 71869261db80a95e4733afa10ff5724bf3c78592. FossilOrigin-Name: d2e6117e4f97ab98b01deb5fcad5520f8181d00bed8d904d34963c01d73df857 * Test case for the previous check-in. FossilOrigin-Name: df5a07e1a5122e08c2fa6076ac08adb2820f997ee11dd88b84863666899dfb57 * Ignore COLLATE operators when determining whether the result of a subexpression should be shallow-copied or deep-copied. FossilOrigin-Name: 34ae36a45e814bed7c8340412c7ef3fc849b82357656d0eb5f0f805e59d846d0 * Add ALWAYS() and NEVER() on branches made unreachable by recent changes. FossilOrigin-Name: c50e6c2ace49d0928b05cbfd877c621e9a0f77dc4e056ccb1dbe5cf118a00d00 * More precise computation of the size of data structures in the query planner. Response to [forum:/forumpost/7d8685d49d|Forum post 7d8685d49d]. FossilOrigin-Name: 0c8d88e41167ea92341dd1129be01b596a73f46bdcd5b0dd931441a979c013d0 * Fix harmless compiler warning in the randomjson.c extension. FossilOrigin-Name: debe7060b16669ada7304ffb9bf7616c8fa30bd286d8be871ed17fd6d64a3d4c * On second thought, we don't really need sqlite_dbdata accessible to the CLI. FossilOrigin-Name: 36fe6a61ef8fb393281a5e15119d716521219c7b971fbfd63bdea07d27a78ac9 * Remove redundant conditional from sqlite3ExprCanBeNull(). FossilOrigin-Name: 257f96a2d22c605885fa66220c28cf7dc5941c330bccee3f132b9e7b70d89d30 * In JSON - minor code cleanup and refactoring with a small size reduction and performance increase. FossilOrigin-Name: 215fabda38daecdbd38b1eca5a6aafbc61b6a36a8303f1d7164d5a1138e63134 * Avoid harmless integer overflow in pager status statistics gathering. Response to [forum:/forumpost/7f4cdf23f9|forum post 7f4cdf23f9]. FossilOrigin-Name: 206d8c650d937bc700946c40a82a62ea6bc4a80e5f3fb42d0ae2968de25f0644 * Fix SQLITE_ENABLE_SETLK_TIMEOUT assert() statements in os_unix.c to avoid reading past the end of the unixShmNode.aMutex[] array. FossilOrigin-Name: 029a05cd2928d43d81e4549cce5388c432e2c9e75e3fa0b2fe6e91021b2fb9ac * Add internal core-developer-only documentation of the JSONB format. FossilOrigin-Name: 4d30478863b2a60512010de9ec6e3099bfaf75d4afee20acec536713fe94334d * Add a new comment to debugging output routine sqlite3WhereLoopPrint() to remind us of what the various fields of the debug output mean. No changes to code. FossilOrigin-Name: da5f34fd4052432b1ae27bb12e56b358cdc5c1282653d60ed0f0fe62f727e4ee * Fix a usan complaint about signed integer overflow. FossilOrigin-Name: e65907e0279f4814ec957f0790777d8b94a86926cd27c52442b311b27efc0185 * Update #ifdef checks in pager.c and util.c to account for [0462a2612d1fc1d0] to resolve the build problem reported in [forum:9819032aac|forum post 9819032aac]. FossilOrigin-Name: 0f22d809a1c6c80e381f6bcd931fe4ec36dca0e28d07ab4f4f7f83c813424f60 * Add the -fno-sanitize-recover=undefined to the sanitizer builds used for sdevtest and release testing. To ensure that any test that provokes undefined behaviour fails. FossilOrigin-Name: 89563311adb0ab7c7a3eadb11c2e27fbca50c56fce8ca616628facbc00d72b88 * Change parameters on a debugging function to include "const". FossilOrigin-Name: 94c3e1110c6590261bd30ba317fba4dd94023d69b81a94f4b216cce748fe7489 * Add debugging output routines sqlite3ShowWhereLoop(X) and sqlite3ShowWhereLoopList(X) that can be invoked from a debugger to show a summary of the content of a single WhereLoop object or a list of WhereLoop objects. No change in release builds. FossilOrigin-Name: 5db30bcc338aac1cf081de2deec7e60749ae012e2b6f95ccf745623adb4a31dc * Improvements to the query planner to address the inefficiency described by [forum/forumpost/2568d1f6e6|forum post 2568d1f6e6]. FossilOrigin-Name: 72fcc12cda910a0e3f7875eb3d117b2a5608705c97703985427a02960f1ab5c5 * Avoid signed integer overflow during integrity_check of FTS5. FossilOrigin-Name: 5937df3b25799eceaadfb04d7226c9995d44c8d8edb5ac3ad02af9d7e3570726 * Fix harmless compiler warnings associated with [5db30bcc338aac1c] FossilOrigin-Name: e55d1c2333f35fc20615aa83a7843d08cae7945710a2156d44eee0cc37d90ade * Remove an ALWAYS() added in [c50e6c2ace49d092] because it is sometimes false. dbsqlfuzz c393a4f783d42efd9552772110aff7e5d937f15e. FossilOrigin-Name: b9daf37e57cde12c4de271a2b1995e8e91b6411f8c2e8882e536241929609b3a * Improved handling of malformed unicode within JSON strings. FossilOrigin-Name: e252bdf5f5de26ba8e2bcc6b0ad94121ed6fc4d86c02fe4a2a058ada93747beb * Ensure that the xColumnText(), xQueryPhrase() and xPhraseFirstColumn() APIs all return SQLITE_RANGE if they are passed a bad column or phrase number. FossilOrigin-Name: 1a8a9b1c89519d265869251e8b6d3c5db733f0d3a7dea6c7962811a8f1157dff * Fix a problem in the shell tool (not library) causing an out-of-bounds write if an ".open" command failed, then the user pressed ctrl-c to interrupt a query running on the substitute in-memory database. FossilOrigin-Name: 026618b9e321576f616a32e41329066ba629814170c6cfeef35430343f5003f3 * Enhance the (undocumented, debug-only) json_parse() SQL function so that it returns the text rendering of the JSONB parse of the input, rather than printing the rendering on stdout. FossilOrigin-Name: 056de8d551dcbdf1d162e2db15ed418fa9c786f900cd3972ef8a1dea3f4f3aa1 * Fix harmless compiler warnings in FTS5. FossilOrigin-Name: 3cd5ef44e40570c357f913a9483fa1cd72e7f2827a5ed5826bff99febae213b1 * Performance improvement by unwinding a loop in jsonAppendString(). FossilOrigin-Name: 190ab3c08431a0ba24d76392eab251f5c1792add05e4ec780998b299208eca95 * Update fts5origintext4.test to work with SQLITE_DIRECT_OVERFLOW_READ. FossilOrigin-Name: 15ed002aed12556aeb9bbe537c4ba839f0c95bac65a69d03401b37cc3fd11b92 * Enable SQLITE_DIRECT_OVERFLOW_READ unless it is specifically disabled using the -DSQLITE_DIRECT_OVERFLOW_READ=0 compile-time option. FossilOrigin-Name: 630604a4e604bfb36c31602917bfa8d42c10c82966d0819932bf8f827b9158b8 * Minor doc touchup in the JS bits. FossilOrigin-Name: 8d2120c35425081e2158d6a8a6b083c4adf8d694046b2d98f5fd235520920432 * Use SQLITE_ENABLE_STAT4 in both the WASM and JNI builds. FossilOrigin-Name: 99d11e6d0ae687ff6bac5119027f7b04d5e7185214e79cf8c56289cfa809b0f9 * WASM: various build cleanups and add initial infrastructure for a build which elides the oo1 API and its dependents (worker1 and promiser). Sidebar: an attempt was made to move generation of the build rules to an external script, but the mixed-mode make/script was even less legible than the $(eval) indirection going on in the makefile. FossilOrigin-Name: 563d313163c02b398ae85b7c2ed231019a14e006726f09a7c1f294a58bf4363f * JNI: move the ByteBuffer-using APIs from public to package visibility for the time being because they have UB-inducing possibilities which need to be worked out. Update test code to account for a change in custom FTS5 columntext() impls. FossilOrigin-Name: dc501275fcfab3ad9b6ebbadf7588b225a9dd07a0abac5be83d96f15bfba99e9 * Extra steps taken to avoid using low-quality indexes in a query plan. This branch accomplishes the same end as the nearby enhanced-stat1 branch, but with much less change and hence less risk. FossilOrigin-Name: c030e646262fee43a59b45fdc1630d972f8bf88ac3c142b6bdaf4cbb36695a4f * Remove some unnecessary computations from ANALYZE so that ANALYZE runs with fewer CPU cycles. These changes were spotted while working on the nearby enhanced-stat1 branch. So even if enhanced-stat1 is abandoned, that effort put into it will not have been in vain. FossilOrigin-Name: 5527e8c4abb904b1a438ec1c353d4a960bf82faaf3a2c742af1df7c613850441 * Back out [99d11e6d0ae6] (enabling of STAT4 in WASM/JNI), per /chat discussion. FossilOrigin-Name: cd7929ee2e2c305475fa5a4dff2edaccf90067126ef04a1c2714cf464925453f * Update and clean up the in-makefile docs for ext/wasm. FossilOrigin-Name: 7a7b295e6d7e95ee4a46cc42761895d11700ab295870c5a4380072bb4a5b7099 * Elaborate on the various build flavors used by ext/wasm/. Doc changes only. FossilOrigin-Name: d489232aa492618d4c8e5817addb2323d0ca067742d7140216914239a66fb221 * Increase the default "max_page_count" to its theoretical maximum of 4294967294. FossilOrigin-Name: ffb35f1784a4305b979a850485f57f56938104a3a03f4a7aececde92864c4879 * Fix a problem in fts5 caused by a COMMIT involving fts5 data that immediately follows a ROLLBACK TO that does not. FossilOrigin-Name: 55c61f6a8d6a1bc79497b05669beac5c5397b06382bf24b6bec54845962d219b * Adjust the sqlite3PagerDirectReadOk() routine (part of the SQLITE_DIRECT_OVERFLOW_READ optimization) to use less code and to be more easily testable. FossilOrigin-Name: eed670ea2a9424f7df4eeb01c152fc38f7190a5e39aa891651b28dc91fcdc019 * Back out [b517a52fa36df0a0] which is no longer reachable due to early error detection enhancements in [166e82dd20efbfd3]. FossilOrigin-Name: 704943e96f2620b99260667ac9922c2f72bc3e92e2dfe1d9c2a91c7b704564d9 * Update the sqldiff.exe utility program so that it uses the sqlite3_str string interface, and so that it does console output using the ext/consio extension. FossilOrigin-Name: 4443b7e592da97d1cb1b3b79ed0559452d8057a33aba4d184c2fffbf200e05f5 * Enhance sqlite3_analyzer.exe so that it uses the ext/consio extension. FossilOrigin-Name: 769de0b98e136e4a0945b80216d0c9583c1ccd9de69cb0494875c2300e172646 * Change a constant from decimal to hex to avoid a compiler warning on Mac. FossilOrigin-Name: e3acb8a43ad544fd5b5341058276bd3b61b6bdb6b719790476a90e0de4320f90 * Convert the JSON functions to use lookaside memory allocation whenever feasible, to avoid hitting the global memory allocator mutex. FossilOrigin-Name: a79a244954f728596da3c0e28fa3b887258d1bd831f53881970f418f3fba84c7 * Fix a #ifdef in sqlite3_test_control() that was preventing builds with SQLITE_OMIT_WSD. FossilOrigin-Name: d546a9c94caf7408cc6e4530ec190d3a13fae09dc15b71b03d6369e02ee62abd * Restructure some code to fix what appears to be a false-positive UBSAN warning. FossilOrigin-Name: fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567 * Avoid errors with SQLITE_OMIT_VIRTUALTABLE builds in json106.test and unionall.test. FossilOrigin-Name: 90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6 * Update extension ext/misc/totext.c to avoid both ubsan warnings and dubious real->integer conversions. FossilOrigin-Name: c626aa108a7a30cef54af8d93ac9e45749568ed38e4e06623a6bad6b4bf6e8ec * Update JSON performance testing procedures for clarity and to describe how to do performance testing of JSONB. FossilOrigin-Name: b115b4f75bc7c4e6d9bab5edf13297f27a36f30083c80d2c502b01208da5dfc0 * Ensure that SQLITE_PROTOCOL is not returned too early when a SQLITE_ENABLE_SETLK_TIMEOUT build fails to open a transaction on a wal mode database in cases where blocking locks are not being used. FossilOrigin-Name: b934a33671d8a0190082ad7e5e68c78fe0c558d102404eafc1de26e4e7d65b92 * Updates to RTREE to facility testing. FossilOrigin-Name: 7a5b42ff74882c58493dc8b710fde73d4ff251f5d42271d84be73ceaabc01698 * Remove an ALWAYS() from RTREE. Dbsqlfuzz found a way to make it false. FossilOrigin-Name: 40f0a29e6dd90fcb969d7c0e49728ba0ee8f31d9e8f502b9a21469620a8ad283 * Minor change to os_unix.c to facilitate 100% MC/DC testing. FossilOrigin-Name: 0dfa7b4da134db281c3c4eddb4569c53a450f955f0af2f410e13db801aff4ea2 * Automatically turn off DEFENSIVE mode in the shell tool when executing scripts generated by the ".dump" command against an empty database. Add a warning to the top of generated ".dump" scripts that populate virtual tables. FossilOrigin-Name: 6e9e96b7e7afb9420110f4b93d10b945c9eadfde5e9c81e59ae9ee8167e75707 * Fix date on new file shell9.test. FossilOrigin-Name: c82da712113d5dcd63b764dbc68842026989627abc840acb4a33f3a4972b832a * Improved resolution of unqualified names in the REINDEX command. [forum:/info/74cd0ceabd|Forum thread 74cd0ceabd]. FossilOrigin-Name: 97709ce2a1f5ae05495e412ca27108048e5b8a63a1e3bca4be13933f7527da7b * Put an SQLITE_ENABLE_SETLK_TIMEOUT branch inside the appropriate ifdef with an assert on the else since the condition is always false if SETLK_TIMEOUT is not available. FossilOrigin-Name: d81e7a036ac5d70b6a6ee6ab7d81e041c1f5fc04b70bcee47e203d521caf7e93 * In fts5, flush the contents of the in-memory hash table whenever the secure-delete option is toggled. This prevents spurious corruption reports under some circumstances. FossilOrigin-Name: ccf552319a62bfb329820a3bc1f490bacbaa6e90694a257fc65a568a605542c3 * Fix a comment in sessions. No functional changes. [forum:/forumpost/8c20dc935b|Forum post 8c20dc935b]. FossilOrigin-Name: b0eb6d3628c1f70399a22d9fd3b79a796bc343adfeba50515440db609565961a * Have the shell tool automatically enable SQLITE_CONFIG_DQS_DDL when executing a ".dump" script against an empty db. FossilOrigin-Name: f47a5f4e0ce078e6cc1183e6cbb3c4013af379b496efae94863a42e5c39928ed * Version 3.45.0 FossilOrigin-Name: 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d * wasm build: reformulate an awk invocation to account for awks which do not support the -e flag. Problem reported on the forum via a docker-hosted build. FossilOrigin-Name: 90dd51153fd0a6197e2ee49b5492ad120f0bfc324b60651f3d4f47c286887b46 * When backing out a character in a constructed string in JSON, first make sure the string has not been reset by on OOM. FossilOrigin-Name: 950bf9fe7829864e0abe6d71ca0495f346feb5d7943d76c95e55a6b86ea855da * Ensure that the xIntegrity methods of fts3 and fts5 work on read-only databases. FossilOrigin-Name: e79b97369fa740f62f695057d4a2cf8dae48a683982ec879f04a19039c9cb418 * When a JSON input is a blob, but it looks like valid JSON when cast to text, then accept it as valid JSON. This replicates a long-standing bug in the behavior of JSON routines, and thus avoids breaking legacy apps. FossilOrigin-Name: 4c2c1b97dce46a279846380c937ac6de5c367927c6843516641eead7ea6db472 * Bump the version number to 3.45.1 FossilOrigin-Name: 54d34edb89430b266221b7e6eea0afbd2c9dafbe774344469473abc8ad1e13fd * Fix harmless "unused parameter" compiler warning in the new fts3IntegrityMethod implementation. FossilOrigin-Name: 9d459f6b50fb6f995e6284a0815c5e211cacac44aad0b96bf01ba68af97f51fc * In os_unix.c and os_win.c, do not allow xFetch() to return a pointer to a page buffer that is right at the end of the mapped region - if the database is corrupted in a specific way such a page buffer might be overread by several bytes. FossilOrigin-Name: d131cab652ac11795322af13d0b330e7e44ab91587a1a3e73fe7b9a14b2dd531 * Slight adjustment to test results for Windows in mmap1.test due to the previous check-in. FossilOrigin-Name: a8043eaed899285b5cf4aab0c23c3dabb8975910c353cb579fd1f1655db390f6 * Apply the same fix found in [99057383acc8f920] to descending scans. FossilOrigin-Name: 593d6a1c2e9256d797f160e867278414e882a3d04d7fea269bea86965eaa7576 * Automatically disable the DISTINCT optimization during query planning if the ORDER BY clause exceeds 63 terms. FossilOrigin-Name: 6edbdcc02d18727f68f0236e15dde4ecfc77e6f452b522eb4e1e895929b1fb63 * When rendering JSONB back into text JSON, report an error if a zero-length integer or floating-point node is encountered. Otherwise, if the node occurs at the very end of the JSONB, the rendering logic might read one byte past the end of the initialized part of the BLOB byte array. OSSFuzz 66284. FossilOrigin-Name: 3ab08ac75d97ffd9920f5c924362a4819560b40faa8a4f9100068057f5fa420a * Avoid a potential buffer overread when handling corrupt json blobs. FossilOrigin-Name: ac402cc551b2cbe3f8fbbc9c711a04942eab5eeb9d2f4a394e9370d2380427b5 * Detect malformed nested JSONB earlier and stop rendering to avoid long delays. FossilOrigin-Name: ab40e282465c989bf249453d7c6f60072a38b691f579411cdf9aad234b20f0f7 * Version 3.45.1 FossilOrigin-Name: e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a --------- Co-authored-by: drh <> Co-authored-by: dan <Dan Kennedy> Co-authored-by: stephan <stephan@noemail.net> Co-authored-by: larrybr <larrybr@noemail.net>
1955 lines
75 KiB
JavaScript
1955 lines
75 KiB
JavaScript
//#ifnot omit-oo1
|
|
/*
|
|
2022-07-22
|
|
|
|
The author disclaims copyright to this source code. In place of a
|
|
legal notice, here is a blessing:
|
|
|
|
* May you do good and not evil.
|
|
* May you find forgiveness for yourself and forgive others.
|
|
* May you share freely, never taking more than you give.
|
|
|
|
***********************************************************************
|
|
|
|
This file contains the so-called OO #1 API wrapper for the sqlite3
|
|
WASM build. It requires that sqlite3-api-glue.js has already run
|
|
and it installs its deliverable as globalThis.sqlite3.oo1.
|
|
*/
|
|
globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
|
|
const toss = (...args)=>{throw new Error(args.join(' '))};
|
|
const toss3 = (...args)=>{throw new sqlite3.SQLite3Error(...args)};
|
|
|
|
const capi = sqlite3.capi, wasm = sqlite3.wasm, util = sqlite3.util;
|
|
/* What follows is colloquially known as "OO API #1". It is a
|
|
binding of the sqlite3 API which is designed to be run within
|
|
the same thread (main or worker) as the one in which the
|
|
sqlite3 WASM binding was initialized. This wrapper cannot use
|
|
the sqlite3 binding if, e.g., the wrapper is in the main thread
|
|
and the sqlite3 API is in a worker. */
|
|
|
|
/**
|
|
In order to keep clients from manipulating, perhaps
|
|
inadvertently, the underlying pointer values of DB and Stmt
|
|
instances, we'll gate access to them via the `pointer` property
|
|
accessor and store their real values in this map. Keys = DB/Stmt
|
|
objects, values = pointer values. This also unifies how those are
|
|
accessed, for potential use downstream via custom
|
|
wasm.xWrap() function signatures which know how to extract
|
|
it.
|
|
*/
|
|
const __ptrMap = new WeakMap();
|
|
/**
|
|
Map of DB instances to objects, each object being a map of Stmt
|
|
wasm pointers to Stmt objects.
|
|
*/
|
|
const __stmtMap = new WeakMap();
|
|
|
|
/** If object opts has _its own_ property named p then that
|
|
property's value is returned, else dflt is returned. */
|
|
const getOwnOption = (opts, p, dflt)=>{
|
|
const d = Object.getOwnPropertyDescriptor(opts,p);
|
|
return d ? d.value : dflt;
|
|
};
|
|
|
|
// Documented in DB.checkRc()
|
|
const checkSqlite3Rc = function(dbPtr, sqliteResultCode){
|
|
if(sqliteResultCode){
|
|
if(dbPtr instanceof DB) dbPtr = dbPtr.pointer;
|
|
toss3(
|
|
sqliteResultCode,
|
|
"sqlite3 result code",sqliteResultCode+":",
|
|
(dbPtr
|
|
? capi.sqlite3_errmsg(dbPtr)
|
|
: capi.sqlite3_errstr(sqliteResultCode))
|
|
);
|
|
}
|
|
return arguments[0];
|
|
};
|
|
|
|
/**
|
|
sqlite3_trace_v2() callback which gets installed by the DB ctor
|
|
if its open-flags contain "t".
|
|
*/
|
|
const __dbTraceToConsole =
|
|
wasm.installFunction('i(ippp)', function(t,c,p,x){
|
|
if(capi.SQLITE_TRACE_STMT===t){
|
|
// x == SQL, p == sqlite3_stmt*
|
|
console.log("SQL TRACE #"+(++this.counter)+' via sqlite3@'+c+':',
|
|
wasm.cstrToJs(x));
|
|
}
|
|
}.bind({counter: 0}));
|
|
|
|
/**
|
|
A map of sqlite3_vfs pointers to SQL code or a callback function
|
|
to run when the DB constructor opens a database with the given
|
|
VFS. In the latter case, the call signature is (theDbObject,sqlite3Namespace)
|
|
and the callback is expected to throw on error.
|
|
*/
|
|
const __vfsPostOpenSql = Object.create(null);
|
|
|
|
/**
|
|
A proxy for DB class constructors. It must be called with the
|
|
being-construct DB object as its "this". See the DB constructor
|
|
for the argument docs. This is split into a separate function
|
|
in order to enable simple creation of special-case DB constructors,
|
|
e.g. JsStorageDb and OpfsDb.
|
|
|
|
Expects to be passed a configuration object with the following
|
|
properties:
|
|
|
|
- `.filename`: the db filename. It may be a special name like ":memory:"
|
|
or "".
|
|
|
|
- `.flags`: as documented in the DB constructor.
|
|
|
|
- `.vfs`: as documented in the DB constructor.
|
|
|
|
It also accepts those as the first 3 arguments.
|
|
*/
|
|
const dbCtorHelper = function ctor(...args){
|
|
if(!ctor._name2vfs){
|
|
/**
|
|
Map special filenames which we handle here (instead of in C)
|
|
to some helpful metadata...
|
|
|
|
As of 2022-09-20, the C API supports the names :localStorage:
|
|
and :sessionStorage: for kvvfs. However, C code cannot
|
|
determine (without embedded JS code, e.g. via Emscripten's
|
|
EM_JS()) whether the kvvfs is legal in the current browser
|
|
context (namely the main UI thread). In order to help client
|
|
code fail early on, instead of it being delayed until they
|
|
try to read or write a kvvfs-backed db, we'll check for those
|
|
names here and throw if they're not legal in the current
|
|
context.
|
|
*/
|
|
ctor._name2vfs = Object.create(null);
|
|
const isWorkerThread = ('function'===typeof importScripts/*===running in worker thread*/)
|
|
? (n)=>toss3("The VFS for",n,"is only available in the main window thread.")
|
|
: false;
|
|
ctor._name2vfs[':localStorage:'] = {
|
|
vfs: 'kvvfs', filename: isWorkerThread || (()=>'local')
|
|
};
|
|
ctor._name2vfs[':sessionStorage:'] = {
|
|
vfs: 'kvvfs', filename: isWorkerThread || (()=>'session')
|
|
};
|
|
}
|
|
const opt = ctor.normalizeArgs(...args);
|
|
let fn = opt.filename, vfsName = opt.vfs, flagsStr = opt.flags;
|
|
if(('string'!==typeof fn && 'number'!==typeof fn)
|
|
|| 'string'!==typeof flagsStr
|
|
|| (vfsName && ('string'!==typeof vfsName && 'number'!==typeof vfsName))){
|
|
sqlite3.config.error("Invalid DB ctor args",opt,arguments);
|
|
toss3("Invalid arguments for DB constructor.");
|
|
}
|
|
let fnJs = ('number'===typeof fn) ? wasm.cstrToJs(fn) : fn;
|
|
const vfsCheck = ctor._name2vfs[fnJs];
|
|
if(vfsCheck){
|
|
vfsName = vfsCheck.vfs;
|
|
fn = fnJs = vfsCheck.filename(fnJs);
|
|
}
|
|
let pDb, oflags = 0;
|
|
if( flagsStr.indexOf('c')>=0 ){
|
|
oflags |= capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
|
|
}
|
|
if( flagsStr.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
|
|
if( 0===oflags ) oflags |= capi.SQLITE_OPEN_READONLY;
|
|
oflags |= capi.SQLITE_OPEN_EXRESCODE;
|
|
const stack = wasm.pstack.pointer;
|
|
try {
|
|
const pPtr = wasm.pstack.allocPtr() /* output (sqlite3**) arg */;
|
|
let rc = capi.sqlite3_open_v2(fn, pPtr, oflags, vfsName || 0);
|
|
pDb = wasm.peekPtr(pPtr);
|
|
checkSqlite3Rc(pDb, rc);
|
|
capi.sqlite3_extended_result_codes(pDb, 1);
|
|
if(flagsStr.indexOf('t')>=0){
|
|
capi.sqlite3_trace_v2(pDb, capi.SQLITE_TRACE_STMT,
|
|
__dbTraceToConsole, pDb);
|
|
}
|
|
}catch( e ){
|
|
if( pDb ) capi.sqlite3_close_v2(pDb);
|
|
throw e;
|
|
}finally{
|
|
wasm.pstack.restore(stack);
|
|
}
|
|
this.filename = fnJs;
|
|
__ptrMap.set(this, pDb);
|
|
__stmtMap.set(this, Object.create(null));
|
|
try{
|
|
// Check for per-VFS post-open SQL/callback...
|
|
const pVfs = capi.sqlite3_js_db_vfs(pDb);
|
|
if(!pVfs) toss3("Internal error: cannot get VFS for new db handle.");
|
|
const postInitSql = __vfsPostOpenSql[pVfs];
|
|
if(postInitSql instanceof Function){
|
|
postInitSql(this, sqlite3);
|
|
}else if(postInitSql){
|
|
checkSqlite3Rc(
|
|
pDb, capi.sqlite3_exec(pDb, postInitSql, 0, 0, 0)
|
|
);
|
|
}
|
|
}catch(e){
|
|
this.close();
|
|
throw e;
|
|
}
|
|
};
|
|
|
|
/**
|
|
Sets SQL which should be exec()'d on a DB instance after it is
|
|
opened with the given VFS pointer. The SQL may be any type
|
|
supported by the "string:flexible" function argument conversion.
|
|
Alternately, the 2nd argument may be a function, in which case it
|
|
is called with (theOo1DbObject,sqlite3Namespace) at the end of
|
|
the DB() constructor. The function must throw on error, in which
|
|
case the db is closed and the exception is propagated. This
|
|
function is intended only for use by DB subclasses or sqlite3_vfs
|
|
implementations.
|
|
*/
|
|
dbCtorHelper.setVfsPostOpenSql = function(pVfs, sql){
|
|
__vfsPostOpenSql[pVfs] = sql;
|
|
};
|
|
|
|
/**
|
|
A helper for DB constructors. It accepts either a single
|
|
config-style object or up to 3 arguments (filename, dbOpenFlags,
|
|
dbVfsName). It returns a new object containing:
|
|
|
|
{ filename: ..., flags: ..., vfs: ... }
|
|
|
|
If passed an object, any additional properties it has are copied
|
|
as-is into the new object.
|
|
*/
|
|
dbCtorHelper.normalizeArgs = function(filename=':memory:',flags = 'c',vfs = null){
|
|
const arg = {};
|
|
if(1===arguments.length && arguments[0] && 'object'===typeof arguments[0]){
|
|
Object.assign(arg, arguments[0]);
|
|
if(undefined===arg.flags) arg.flags = 'c';
|
|
if(undefined===arg.vfs) arg.vfs = null;
|
|
if(undefined===arg.filename) arg.filename = ':memory:';
|
|
}else{
|
|
arg.filename = filename;
|
|
arg.flags = flags;
|
|
arg.vfs = vfs;
|
|
}
|
|
return arg;
|
|
};
|
|
/**
|
|
The DB class provides a high-level OO wrapper around an sqlite3
|
|
db handle.
|
|
|
|
The given db filename must be resolvable using whatever
|
|
filesystem layer (virtual or otherwise) is set up for the default
|
|
sqlite3 VFS.
|
|
|
|
Note that the special sqlite3 db names ":memory:" and ""
|
|
(temporary db) have their normal special meanings here and need
|
|
not resolve to real filenames, but "" uses an on-storage
|
|
temporary database and requires that the VFS support that.
|
|
|
|
The second argument specifies the open/create mode for the
|
|
database. It must be string containing a sequence of letters (in
|
|
any order, but case sensitive) specifying the mode:
|
|
|
|
- "c": create if it does not exist, else fail if it does not
|
|
exist. Implies the "w" flag.
|
|
|
|
- "w": write. Implies "r": a db cannot be write-only.
|
|
|
|
- "r": read-only if neither "w" nor "c" are provided, else it
|
|
is ignored.
|
|
|
|
- "t": enable tracing of SQL executed on this database handle,
|
|
sending it to `console.log()`. To disable it later, call
|
|
`sqlite3.capi.sqlite3_trace_v2(thisDb.pointer, 0, 0, 0)`.
|
|
|
|
If "w" is not provided, the db is implicitly read-only, noting
|
|
that "rc" is meaningless
|
|
|
|
Any other letters are currently ignored. The default is
|
|
"c". These modes are ignored for the special ":memory:" and ""
|
|
names and _may_ be ignored altogether for certain VFSes.
|
|
|
|
The final argument is analogous to the final argument of
|
|
sqlite3_open_v2(): the name of an sqlite3 VFS. Pass a falsy value,
|
|
or none at all, to use the default. If passed a value, it must
|
|
be the string name of a VFS.
|
|
|
|
The constructor optionally (and preferably) takes its arguments
|
|
in the form of a single configuration object with the following
|
|
properties:
|
|
|
|
- `filename`: database file name
|
|
- `flags`: open-mode flags
|
|
- `vfs`: the VFS fname
|
|
|
|
The `filename` and `vfs` arguments may be either JS strings or
|
|
C-strings allocated via WASM. `flags` is required to be a JS
|
|
string (because it's specific to this API, which is specific
|
|
to JS).
|
|
|
|
For purposes of passing a DB instance to C-style sqlite3
|
|
functions, the DB object's read-only `pointer` property holds its
|
|
`sqlite3*` pointer value. That property can also be used to check
|
|
whether this DB instance is still open.
|
|
|
|
In the main window thread, the filenames `":localStorage:"` and
|
|
`":sessionStorage:"` are special: they cause the db to use either
|
|
localStorage or sessionStorage for storing the database using
|
|
the kvvfs. If one of these names are used, they trump
|
|
any vfs name set in the arguments.
|
|
*/
|
|
const DB = function(...args){
|
|
dbCtorHelper.apply(this, args);
|
|
};
|
|
DB.dbCtorHelper = dbCtorHelper;
|
|
|
|
/**
|
|
Internal-use enum for mapping JS types to DB-bindable types.
|
|
These do not (and need not) line up with the SQLITE_type
|
|
values. All values in this enum must be truthy and distinct
|
|
but they need not be numbers.
|
|
*/
|
|
const BindTypes = {
|
|
null: 1,
|
|
number: 2,
|
|
string: 3,
|
|
boolean: 4,
|
|
blob: 5
|
|
};
|
|
BindTypes['undefined'] == BindTypes.null;
|
|
if(wasm.bigIntEnabled){
|
|
BindTypes.bigint = BindTypes.number;
|
|
}
|
|
|
|
/**
|
|
This class wraps sqlite3_stmt. Calling this constructor
|
|
directly will trigger an exception. Use DB.prepare() to create
|
|
new instances.
|
|
|
|
For purposes of passing a Stmt instance to C-style sqlite3
|
|
functions, its read-only `pointer` property holds its `sqlite3_stmt*`
|
|
pointer value.
|
|
|
|
Other non-function properties include:
|
|
|
|
- `db`: the DB object which created the statement.
|
|
|
|
- `columnCount`: the number of result columns in the query, or 0
|
|
for queries which cannot return results. This property is a proxy
|
|
for sqlite3_column_count() and its use in loops should be avoided
|
|
because of the call overhead associated with that. The
|
|
`columnCount` is not cached when the Stmt is created because a
|
|
schema change made via a separate db connection between this
|
|
statement's preparation and when it is stepped may invalidate it.
|
|
|
|
- `parameterCount`: the number of bindable parameters in the query.
|
|
*/
|
|
const Stmt = function(){
|
|
if(BindTypes!==arguments[2]){
|
|
toss3(capi.SQLITE_MISUSE, "Do not call the Stmt constructor directly. Use DB.prepare().");
|
|
}
|
|
this.db = arguments[0];
|
|
__ptrMap.set(this, arguments[1]);
|
|
this.parameterCount = capi.sqlite3_bind_parameter_count(this.pointer);
|
|
};
|
|
|
|
/** Throws if the given DB has been closed, else it is returned. */
|
|
const affirmDbOpen = function(db){
|
|
if(!db.pointer) toss3("DB has been closed.");
|
|
return db;
|
|
};
|
|
|
|
/** Throws if ndx is not an integer or if it is out of range
|
|
for stmt.columnCount, else returns stmt.
|
|
|
|
Reminder: this will also fail after the statement is finalized
|
|
but the resulting error will be about an out-of-bounds column
|
|
index rather than a statement-is-finalized error.
|
|
*/
|
|
const affirmColIndex = function(stmt,ndx){
|
|
if((ndx !== (ndx|0)) || ndx<0 || ndx>=stmt.columnCount){
|
|
toss3("Column index",ndx,"is out of range.");
|
|
}
|
|
return stmt;
|
|
};
|
|
|
|
/**
|
|
Expects to be passed the `arguments` object from DB.exec(). Does
|
|
the argument processing/validation, throws on error, and returns
|
|
a new object on success:
|
|
|
|
{ sql: the SQL, opt: optionsObj, cbArg: function}
|
|
|
|
The opt object is a normalized copy of any passed to this
|
|
function. The sql will be converted to a string if it is provided
|
|
in one of the supported non-string formats.
|
|
|
|
cbArg is only set if the opt.callback or opt.resultRows are set,
|
|
in which case it's a function which expects to be passed the
|
|
current Stmt and returns the callback argument of the type
|
|
indicated by the input arguments.
|
|
*/
|
|
const parseExecArgs = function(db, args){
|
|
const out = Object.create(null);
|
|
out.opt = Object.create(null);
|
|
switch(args.length){
|
|
case 1:
|
|
if('string'===typeof args[0] || util.isSQLableTypedArray(args[0])){
|
|
out.sql = args[0];
|
|
}else if(Array.isArray(args[0])){
|
|
out.sql = args[0];
|
|
}else if(args[0] && 'object'===typeof args[0]){
|
|
out.opt = args[0];
|
|
out.sql = out.opt.sql;
|
|
}
|
|
break;
|
|
case 2:
|
|
out.sql = args[0];
|
|
out.opt = args[1];
|
|
break;
|
|
default: toss3("Invalid argument count for exec().");
|
|
};
|
|
out.sql = util.flexibleString(out.sql);
|
|
if('string'!==typeof out.sql){
|
|
toss3("Missing SQL argument or unsupported SQL value type.");
|
|
}
|
|
const opt = out.opt;
|
|
switch(opt.returnValue){
|
|
case 'resultRows':
|
|
if(!opt.resultRows) opt.resultRows = [];
|
|
out.returnVal = ()=>opt.resultRows;
|
|
break;
|
|
case 'saveSql':
|
|
if(!opt.saveSql) opt.saveSql = [];
|
|
out.returnVal = ()=>opt.saveSql;
|
|
break;
|
|
case undefined:
|
|
case 'this':
|
|
out.returnVal = ()=>db;
|
|
break;
|
|
default:
|
|
toss3("Invalid returnValue value:",opt.returnValue);
|
|
}
|
|
if(!opt.callback && !opt.returnValue && undefined!==opt.rowMode){
|
|
if(!opt.resultRows) opt.resultRows = [];
|
|
out.returnVal = ()=>opt.resultRows;
|
|
}
|
|
if(opt.callback || opt.resultRows){
|
|
switch((undefined===opt.rowMode)
|
|
? 'array' : opt.rowMode) {
|
|
case 'object': out.cbArg = (stmt)=>stmt.get(Object.create(null)); break;
|
|
case 'array': out.cbArg = (stmt)=>stmt.get([]); break;
|
|
case 'stmt':
|
|
if(Array.isArray(opt.resultRows)){
|
|
toss3("exec(): invalid rowMode for a resultRows array: must",
|
|
"be one of 'array', 'object',",
|
|
"a result column number, or column name reference.");
|
|
}
|
|
out.cbArg = (stmt)=>stmt;
|
|
break;
|
|
default:
|
|
if(util.isInt32(opt.rowMode)){
|
|
out.cbArg = (stmt)=>stmt.get(opt.rowMode);
|
|
break;
|
|
}else if('string'===typeof opt.rowMode
|
|
&& opt.rowMode.length>1
|
|
&& '$'===opt.rowMode[0]){
|
|
/* "$X": fetch column named "X" (case-sensitive!). Prior
|
|
to 2022-12-14 ":X" and "@X" were also permitted, but
|
|
having so many options is unnecessary and likely to
|
|
cause confusion. */
|
|
const $colName = opt.rowMode.substr(1);
|
|
out.cbArg = (stmt)=>{
|
|
const rc = stmt.get(Object.create(null))[$colName];
|
|
return (undefined===rc)
|
|
? toss3(capi.SQLITE_NOTFOUND,
|
|
"exec(): unknown result column:",$colName)
|
|
: rc;
|
|
};
|
|
break;
|
|
}
|
|
toss3("Invalid rowMode:",opt.rowMode);
|
|
}
|
|
}
|
|
return out;
|
|
};
|
|
|
|
/**
|
|
Internal impl of the DB.selectValue(), selectArray(), and
|
|
selectObject() methods.
|
|
*/
|
|
const __selectFirstRow = (db, sql, bind, ...getArgs)=>{
|
|
const stmt = db.prepare(sql);
|
|
try {
|
|
const rc = stmt.bind(bind).step() ? stmt.get(...getArgs) : undefined;
|
|
stmt.reset(/*for INSERT...RETURNING locking case*/);
|
|
return rc;
|
|
}finally{
|
|
stmt.finalize();
|
|
}
|
|
};
|
|
|
|
/**
|
|
Internal impl of the DB.selectArrays() and selectObjects()
|
|
methods.
|
|
*/
|
|
const __selectAll =
|
|
(db, sql, bind, rowMode)=>db.exec({
|
|
sql, bind, rowMode, returnValue: 'resultRows'
|
|
});
|
|
|
|
/**
|
|
Expects to be given a DB instance or an `sqlite3*` pointer (may
|
|
be null) and an sqlite3 API result code. If the result code is
|
|
not falsy, this function throws an SQLite3Error with an error
|
|
message from sqlite3_errmsg(), using db (or, if db is-a DB,
|
|
db.pointer) as the db handle, or sqlite3_errstr() if db is
|
|
falsy. Note that if it's passed a non-error code like SQLITE_ROW
|
|
or SQLITE_DONE, it will still throw but the error string might be
|
|
"Not an error." The various non-0 non-error codes need to be
|
|
checked for in client code where they are expected.
|
|
|
|
The thrown exception's `resultCode` property will be the value of
|
|
the second argument to this function.
|
|
|
|
If it does not throw, it returns its first argument.
|
|
*/
|
|
DB.checkRc = (db,resultCode)=>checkSqlite3Rc(db,resultCode);
|
|
|
|
DB.prototype = {
|
|
/** Returns true if this db handle is open, else false. */
|
|
isOpen: function(){
|
|
return !!this.pointer;
|
|
},
|
|
/** Throws if this given DB has been closed, else returns `this`. */
|
|
affirmOpen: function(){
|
|
return affirmDbOpen(this);
|
|
},
|
|
/**
|
|
Finalizes all open statements and closes this database
|
|
connection. This is a no-op if the db has already been
|
|
closed. After calling close(), `this.pointer` will resolve to
|
|
`undefined`, so that can be used to check whether the db
|
|
instance is still opened.
|
|
|
|
If this.onclose.before is a function then it is called before
|
|
any close-related cleanup.
|
|
|
|
If this.onclose.after is a function then it is called after the
|
|
db is closed but before auxiliary state like this.filename is
|
|
cleared.
|
|
|
|
Both onclose handlers are passed this object, with the onclose
|
|
object as their "this," noting that the db will have been
|
|
closed when onclose.after is called. If this db is not opened
|
|
when close() is called, neither of the handlers are called. Any
|
|
exceptions the handlers throw are ignored because "destructors
|
|
must not throw."
|
|
|
|
Note that garbage collection of a db handle, if it happens at
|
|
all, will never trigger close(), so onclose handlers are not a
|
|
reliable way to implement close-time cleanup or maintenance of
|
|
a db.
|
|
*/
|
|
close: function(){
|
|
if(this.pointer){
|
|
if(this.onclose && (this.onclose.before instanceof Function)){
|
|
try{this.onclose.before(this)}
|
|
catch(e){/*ignore*/}
|
|
}
|
|
const pDb = this.pointer;
|
|
Object.keys(__stmtMap.get(this)).forEach((k,s)=>{
|
|
if(s && s.pointer){
|
|
try{s.finalize()}
|
|
catch(e){/*ignore*/}
|
|
}
|
|
});
|
|
__ptrMap.delete(this);
|
|
__stmtMap.delete(this);
|
|
capi.sqlite3_close_v2(pDb);
|
|
if(this.onclose && (this.onclose.after instanceof Function)){
|
|
try{this.onclose.after(this)}
|
|
catch(e){/*ignore*/}
|
|
}
|
|
delete this.filename;
|
|
}
|
|
},
|
|
/**
|
|
Returns the number of changes, as per sqlite3_changes()
|
|
(if the first argument is false) or sqlite3_total_changes()
|
|
(if it's true). If the 2nd argument is true, it uses
|
|
sqlite3_changes64() or sqlite3_total_changes64(), which
|
|
will trigger an exception if this build does not have
|
|
BigInt support enabled.
|
|
*/
|
|
changes: function(total=false,sixtyFour=false){
|
|
const p = affirmDbOpen(this).pointer;
|
|
if(total){
|
|
return sixtyFour
|
|
? capi.sqlite3_total_changes64(p)
|
|
: capi.sqlite3_total_changes(p);
|
|
}else{
|
|
return sixtyFour
|
|
? capi.sqlite3_changes64(p)
|
|
: capi.sqlite3_changes(p);
|
|
}
|
|
},
|
|
/**
|
|
Similar to the this.filename but returns the
|
|
sqlite3_db_filename() value for the given database name,
|
|
defaulting to "main". The argument may be either a JS string
|
|
or a pointer to a WASM-allocated C-string.
|
|
*/
|
|
dbFilename: function(dbName='main'){
|
|
return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
|
|
},
|
|
/**
|
|
Returns the name of the given 0-based db number, as documented
|
|
for sqlite3_db_name().
|
|
*/
|
|
dbName: function(dbNumber=0){
|
|
return capi.sqlite3_db_name(affirmDbOpen(this).pointer, dbNumber);
|
|
},
|
|
/**
|
|
Returns the name of the sqlite3_vfs used by the given database
|
|
of this connection (defaulting to 'main'). The argument may be
|
|
either a JS string or a WASM C-string. Returns undefined if the
|
|
given db name is invalid. Throws if this object has been
|
|
close()d.
|
|
*/
|
|
dbVfsName: function(dbName=0){
|
|
let rc;
|
|
const pVfs = capi.sqlite3_js_db_vfs(
|
|
affirmDbOpen(this).pointer, dbName
|
|
);
|
|
if(pVfs){
|
|
const v = new capi.sqlite3_vfs(pVfs);
|
|
try{ rc = wasm.cstrToJs(v.$zName) }
|
|
finally { v.dispose() }
|
|
}
|
|
return rc;
|
|
},
|
|
/**
|
|
Compiles the given SQL and returns a prepared Stmt. This is
|
|
the only way to create new Stmt objects. Throws on error.
|
|
|
|
The given SQL must be a string, a Uint8Array holding SQL, a
|
|
WASM pointer to memory holding the NUL-terminated SQL string,
|
|
or an array of strings. In the latter case, the array is
|
|
concatenated together, with no separators, to form the SQL
|
|
string (arrays are often a convenient way to formulate long
|
|
statements). If the SQL contains no statements, an
|
|
SQLite3Error is thrown.
|
|
|
|
Design note: the C API permits empty SQL, reporting it as a 0
|
|
result code and a NULL stmt pointer. Supporting that case here
|
|
would cause extra work for all clients: any use of the Stmt API
|
|
on such a statement will necessarily throw, so clients would be
|
|
required to check `stmt.pointer` after calling `prepare()` in
|
|
order to determine whether the Stmt instance is empty or not.
|
|
Long-time practice (with other sqlite3 script bindings)
|
|
suggests that the empty-prepare case is sufficiently rare that
|
|
supporting it here would simply hurt overall usability.
|
|
*/
|
|
prepare: function(sql){
|
|
affirmDbOpen(this);
|
|
const stack = wasm.pstack.pointer;
|
|
let ppStmt, pStmt;
|
|
try{
|
|
ppStmt = wasm.pstack.alloc(8)/* output (sqlite3_stmt**) arg */;
|
|
DB.checkRc(this, capi.sqlite3_prepare_v2(this.pointer, sql, -1, ppStmt, null));
|
|
pStmt = wasm.peekPtr(ppStmt);
|
|
}
|
|
finally {
|
|
wasm.pstack.restore(stack);
|
|
}
|
|
if(!pStmt) toss3("Cannot prepare empty SQL.");
|
|
const stmt = new Stmt(this, pStmt, BindTypes);
|
|
__stmtMap.get(this)[pStmt] = stmt;
|
|
return stmt;
|
|
},
|
|
/**
|
|
Executes one or more SQL statements in the form of a single
|
|
string. Its arguments must be either (sql,optionsObject) or
|
|
(optionsObject). In the latter case, optionsObject.sql must
|
|
contain the SQL to execute. By default it returns this object
|
|
but that can be changed via the `returnValue` option as
|
|
described below. Throws on error.
|
|
|
|
If no SQL is provided, or a non-string is provided, an
|
|
exception is triggered. Empty SQL, on the other hand, is
|
|
simply a no-op.
|
|
|
|
The optional options object may contain any of the following
|
|
properties:
|
|
|
|
- `sql` = the SQL to run (unless it's provided as the first
|
|
argument). This must be of type string, Uint8Array, or an array
|
|
of strings. In the latter case they're concatenated together
|
|
as-is, _with no separator_ between elements, before evaluation.
|
|
The array form is often simpler for long hand-written queries.
|
|
|
|
- `bind` = a single value valid as an argument for
|
|
Stmt.bind(). This is _only_ applied to the _first_ non-empty
|
|
statement in the SQL which has any bindable parameters. (Empty
|
|
statements are skipped entirely.)
|
|
|
|
- `saveSql` = an optional array. If set, the SQL of each
|
|
executed statement is appended to this array before the
|
|
statement is executed (but after it is prepared - we don't have
|
|
the string until after that). Empty SQL statements are elided
|
|
but can have odd effects in the output. e.g. SQL of: `"select
|
|
1; -- empty\n; select 2"` will result in an array containing
|
|
`["select 1;", "--empty \n; select 2"]`. That's simply how
|
|
sqlite3 records the SQL for the 2nd statement.
|
|
|
|
==================================================================
|
|
The following options apply _only_ to the _first_ statement
|
|
which has a non-zero result column count, regardless of whether
|
|
the statement actually produces any result rows.
|
|
==================================================================
|
|
|
|
- `columnNames`: if this is an array, the column names of the
|
|
result set are stored in this array before the callback (if
|
|
any) is triggered (regardless of whether the query produces any
|
|
result rows). If no statement has result columns, this value is
|
|
unchanged. Achtung: an SQL result may have multiple columns
|
|
with identical names.
|
|
|
|
- `callback` = a function which gets called for each row of the
|
|
result set, but only if that statement has any result rows. The
|
|
callback's "this" is the options object, noting that this
|
|
function synthesizes one if the caller does not pass one to
|
|
exec(). The second argument passed to the callback is always
|
|
the current Stmt object, as it's needed if the caller wants to
|
|
fetch the column names or some such (noting that they could
|
|
also be fetched via `this.columnNames`, if the client provides
|
|
the `columnNames` option). If the callback returns a literal
|
|
`false` (as opposed to any other falsy value, e.g. an implicit
|
|
`undefined` return), any ongoing statement-`step()` iteration
|
|
stops without an error. The return value of the callback is
|
|
otherwise ignored.
|
|
|
|
ACHTUNG: The callback MUST NOT modify the Stmt object. Calling
|
|
any of the Stmt.get() variants, Stmt.getColumnName(), or
|
|
similar, is legal, but calling step() or finalize() is
|
|
not. Member methods which are illegal in this context will
|
|
trigger an exception, but clients must also refrain from using
|
|
any lower-level (C-style) APIs which might modify the
|
|
statement.
|
|
|
|
The first argument passed to the callback defaults to an array of
|
|
values from the current result row but may be changed with ...
|
|
|
|
- `rowMode` = specifies the type of he callback's first argument.
|
|
It may be any of...
|
|
|
|
A) A string describing what type of argument should be passed
|
|
as the first argument to the callback:
|
|
|
|
A.1) `'array'` (the default) causes the results of
|
|
`stmt.get([])` to be passed to the `callback` and/or appended
|
|
to `resultRows`.
|
|
|
|
A.2) `'object'` causes the results of
|
|
`stmt.get(Object.create(null))` to be passed to the
|
|
`callback` and/or appended to `resultRows`. Achtung: an SQL
|
|
result may have multiple columns with identical names. In
|
|
that case, the right-most column will be the one set in this
|
|
object!
|
|
|
|
A.3) `'stmt'` causes the current Stmt to be passed to the
|
|
callback, but this mode will trigger an exception if
|
|
`resultRows` is an array because appending the transient
|
|
statement to the array would be downright unhelpful.
|
|
|
|
B) An integer, indicating a zero-based column in the result
|
|
row. Only that one single value will be passed on.
|
|
|
|
C) A string with a minimum length of 2 and leading character of
|
|
'$' will fetch the row as an object, extract that one field,
|
|
and pass that field's value to the callback. Note that these
|
|
keys are case-sensitive so must match the case used in the
|
|
SQL. e.g. `"select a A from t"` with a `rowMode` of `'$A'`
|
|
would work but `'$a'` would not. A reference to a column not in
|
|
the result set will trigger an exception on the first row (as
|
|
the check is not performed until rows are fetched). Note also
|
|
that `$` is a legal identifier character in JS so need not be
|
|
quoted.
|
|
|
|
Any other `rowMode` value triggers an exception.
|
|
|
|
- `resultRows`: if this is an array, it functions similarly to
|
|
the `callback` option: each row of the result set (if any),
|
|
with the exception that the `rowMode` 'stmt' is not legal. It
|
|
is legal to use both `resultRows` and `callback`, but
|
|
`resultRows` is likely much simpler to use for small data sets
|
|
and can be used over a WebWorker-style message interface.
|
|
exec() throws if `resultRows` is set and `rowMode` is 'stmt'.
|
|
|
|
- `returnValue`: is a string specifying what this function
|
|
should return:
|
|
|
|
A) The default value is (usually) `"this"`, meaning that the
|
|
DB object itself should be returned. The exception is if
|
|
the caller passes neither of `callback` nor `returnValue`
|
|
but does pass an explicit `rowMode` then the default
|
|
`returnValue` is `"resultRows"`, described below.
|
|
|
|
B) `"resultRows"` means to return the value of the
|
|
`resultRows` option. If `resultRows` is not set, this
|
|
function behaves as if it were set to an empty array.
|
|
|
|
C) `"saveSql"` means to return the value of the
|
|
`saveSql` option. If `saveSql` is not set, this
|
|
function behaves as if it were set to an empty array.
|
|
|
|
Potential TODOs:
|
|
|
|
- `bind`: permit an array of arrays/objects to bind. The first
|
|
sub-array would act on the first statement which has bindable
|
|
parameters (as it does now). The 2nd would act on the next such
|
|
statement, etc.
|
|
|
|
- `callback` and `resultRows`: permit an array entries with
|
|
semantics similar to those described for `bind` above.
|
|
|
|
*/
|
|
exec: function(/*(sql [,obj]) || (obj)*/){
|
|
affirmDbOpen(this);
|
|
const arg = parseExecArgs(this, arguments);
|
|
if(!arg.sql){
|
|
return toss3("exec() requires an SQL string.");
|
|
}
|
|
const opt = arg.opt;
|
|
const callback = opt.callback;
|
|
const resultRows =
|
|
Array.isArray(opt.resultRows) ? opt.resultRows : undefined;
|
|
let stmt;
|
|
let bind = opt.bind;
|
|
let evalFirstResult = !!(
|
|
arg.cbArg || opt.columnNames || resultRows
|
|
) /* true to step through the first result-returning statement */;
|
|
const stack = wasm.scopedAllocPush();
|
|
const saveSql = Array.isArray(opt.saveSql) ? opt.saveSql : undefined;
|
|
try{
|
|
const isTA = util.isSQLableTypedArray(arg.sql)
|
|
/* Optimization: if the SQL is a TypedArray we can save some string
|
|
conversion costs. */;
|
|
/* Allocate the two output pointers (ppStmt, pzTail) and heap
|
|
space for the SQL (pSql). When prepare_v2() returns, pzTail
|
|
will point to somewhere in pSql. */
|
|
let sqlByteLen = isTA ? arg.sql.byteLength : wasm.jstrlen(arg.sql);
|
|
const ppStmt = wasm.scopedAlloc(
|
|
/* output (sqlite3_stmt**) arg and pzTail */
|
|
(2 * wasm.ptrSizeof) + (sqlByteLen + 1/* SQL + NUL */)
|
|
);
|
|
const pzTail = ppStmt + wasm.ptrSizeof /* final arg to sqlite3_prepare_v2() */;
|
|
let pSql = pzTail + wasm.ptrSizeof;
|
|
const pSqlEnd = pSql + sqlByteLen;
|
|
if(isTA) wasm.heap8().set(arg.sql, pSql);
|
|
else wasm.jstrcpy(arg.sql, wasm.heap8(), pSql, sqlByteLen, false);
|
|
wasm.poke(pSql + sqlByteLen, 0/*NUL terminator*/);
|
|
while(pSql && wasm.peek(pSql, 'i8')
|
|
/* Maintenance reminder:^^^ _must_ be 'i8' or else we
|
|
will very likely cause an endless loop. What that's
|
|
doing is checking for a terminating NUL byte. If we
|
|
use i32 or similar then we read 4 bytes, read stuff
|
|
around the NUL terminator, and get stuck in and
|
|
endless loop at the end of the SQL, endlessly
|
|
re-preparing an empty statement. */ ){
|
|
wasm.pokePtr([ppStmt, pzTail], 0);
|
|
DB.checkRc(this, capi.sqlite3_prepare_v3(
|
|
this.pointer, pSql, sqlByteLen, 0, ppStmt, pzTail
|
|
));
|
|
const pStmt = wasm.peekPtr(ppStmt);
|
|
pSql = wasm.peekPtr(pzTail);
|
|
sqlByteLen = pSqlEnd - pSql;
|
|
if(!pStmt) continue;
|
|
if(saveSql) saveSql.push(capi.sqlite3_sql(pStmt).trim());
|
|
stmt = new Stmt(this, pStmt, BindTypes);
|
|
if(bind && stmt.parameterCount){
|
|
stmt.bind(bind);
|
|
bind = null;
|
|
}
|
|
if(evalFirstResult && stmt.columnCount){
|
|
/* Only forward SELECT-style results for the FIRST query
|
|
in the SQL which potentially has them. */
|
|
let gotColNames = Array.isArray(
|
|
opt.columnNames
|
|
/* As reported in
|
|
https://sqlite.org/forum/forumpost/7774b773937cbe0a
|
|
we need to delay fetching of the column names until
|
|
after the first step() (if we step() at all) because
|
|
a schema change between the prepare() and step(), via
|
|
another connection, may invalidate the column count
|
|
and names. */) ? 0 : 1;
|
|
evalFirstResult = false;
|
|
if(arg.cbArg || resultRows){
|
|
for(; stmt.step(); stmt._lockedByExec = false){
|
|
if(0===gotColNames++) stmt.getColumnNames(opt.columnNames);
|
|
stmt._lockedByExec = true;
|
|
const row = arg.cbArg(stmt);
|
|
if(resultRows) resultRows.push(row);
|
|
if(callback && false === callback.call(opt, row, stmt)){
|
|
break;
|
|
}
|
|
}
|
|
stmt._lockedByExec = false;
|
|
}
|
|
if(0===gotColNames){
|
|
/* opt.columnNames was provided but we visited no result rows */
|
|
stmt.getColumnNames(opt.columnNames);
|
|
}
|
|
}else{
|
|
stmt.step();
|
|
}
|
|
stmt.reset(
|
|
/* In order to trigger an exception in the
|
|
INSERT...RETURNING locking scenario:
|
|
https://sqlite.org/forum/forumpost/36f7a2e7494897df
|
|
*/).finalize();
|
|
stmt = null;
|
|
}/*prepare() loop*/
|
|
}/*catch(e){
|
|
sqlite3.config.warn("DB.exec() is propagating exception",opt,e);
|
|
throw e;
|
|
}*/finally{
|
|
wasm.scopedAllocPop(stack);
|
|
if(stmt){
|
|
delete stmt._lockedByExec;
|
|
stmt.finalize();
|
|
}
|
|
}
|
|
return arg.returnVal();
|
|
}/*exec()*/,
|
|
|
|
/**
|
|
Creates a new UDF (User-Defined Function) which is accessible
|
|
via SQL code. This function may be called in any of the
|
|
following forms:
|
|
|
|
- (name, function)
|
|
- (name, function, optionsObject)
|
|
- (name, optionsObject)
|
|
- (optionsObject)
|
|
|
|
In the final two cases, the function must be defined as the
|
|
`callback` property of the options object (optionally called
|
|
`xFunc` to align with the C API documentation). In the final
|
|
case, the function's name must be the 'name' property.
|
|
|
|
The first two call forms can only be used for creating scalar
|
|
functions. Creating an aggregate or window function requires
|
|
the options-object form (see below for details).
|
|
|
|
UDFs can be removed as documented for
|
|
sqlite3_create_function_v2() and
|
|
sqlite3_create_window_function(), but doing so will "leak" the
|
|
JS-created WASM binding of those functions (meaning that their
|
|
entries in the WASM indirect function table still
|
|
exist). Eliminating that potential leak is a pending TODO.
|
|
|
|
On success, returns this object. Throws on error.
|
|
|
|
When called from SQL arguments to the UDF, and its result,
|
|
will be converted between JS and SQL with as much fidelity as
|
|
is feasible, triggering an exception if a type conversion
|
|
cannot be determined. The docs for sqlite3_create_function_v2()
|
|
describe the conversions in more detail.
|
|
|
|
The values set in the options object differ for scalar and
|
|
aggregate functions:
|
|
|
|
- Scalar: set the `xFunc` function-type property to the UDF
|
|
function.
|
|
|
|
- Aggregate: set the `xStep` and `xFinal` function-type
|
|
properties to the "step" and "final" callbacks for the
|
|
aggregate. Do not set the `xFunc` property.
|
|
|
|
- Window: set the `xStep`, `xFinal`, `xValue`, and `xInverse`
|
|
function-type properties. Do not set the `xFunc` property.
|
|
|
|
The options object may optionally have an `xDestroy`
|
|
function-type property, as per sqlite3_create_function_v2().
|
|
Its argument will be the WASM-pointer-type value of the `pApp`
|
|
property, and this function will throw if `pApp` is defined but
|
|
is not null, undefined, or a numeric (WASM pointer)
|
|
value. i.e. `pApp`, if set, must be value suitable for use as a
|
|
WASM pointer argument, noting that `null` or `undefined` will
|
|
translate to 0 for that purpose.
|
|
|
|
The options object may contain flags to modify how
|
|
the function is defined:
|
|
|
|
- `arity`: the number of arguments which SQL calls to this
|
|
function expect or require. The default value is `xFunc.length`
|
|
or `xStep.length` (i.e. the number of declared parameters it
|
|
has) **MINUS 1** (see below for why). As a special case, if the
|
|
`length` is 0, its arity is also 0 instead of -1. A negative
|
|
arity value means that the function is variadic and may accept
|
|
any number of arguments, up to sqlite3's compile-time
|
|
limits. sqlite3 will enforce the argument count if is zero or
|
|
greater. The callback always receives a pointer to an
|
|
`sqlite3_context` object as its first argument. Any arguments
|
|
after that are from SQL code. The leading context argument does
|
|
_not_ count towards the function's arity. See the docs for
|
|
sqlite3.capi.sqlite3_create_function_v2() for why that argument
|
|
is needed in the interface.
|
|
|
|
The following options-object properties correspond to flags
|
|
documented at:
|
|
|
|
https://sqlite.org/c3ref/create_function.html
|
|
|
|
- `deterministic` = sqlite3.capi.SQLITE_DETERMINISTIC
|
|
- `directOnly` = sqlite3.capi.SQLITE_DIRECTONLY
|
|
- `innocuous` = sqlite3.capi.SQLITE_INNOCUOUS
|
|
|
|
Sidebar: the ability to add new WASM-accessible functions to
|
|
the runtime requires that the WASM build is compiled with the
|
|
equivalent functionality as that provided by Emscripten's
|
|
`-sALLOW_TABLE_GROWTH` flag.
|
|
*/
|
|
createFunction: function f(name, xFunc, opt){
|
|
const isFunc = (f)=>(f instanceof Function);
|
|
switch(arguments.length){
|
|
case 1: /* (optionsObject) */
|
|
opt = name;
|
|
name = opt.name;
|
|
xFunc = opt.xFunc || 0;
|
|
break;
|
|
case 2: /* (name, callback|optionsObject) */
|
|
if(!isFunc(xFunc)){
|
|
opt = xFunc;
|
|
xFunc = opt.xFunc || 0;
|
|
}
|
|
break;
|
|
case 3: /* name, xFunc, opt */
|
|
break;
|
|
default: break;
|
|
}
|
|
if(!opt) opt = {};
|
|
if('string' !== typeof name){
|
|
toss3("Invalid arguments: missing function name.");
|
|
}
|
|
let xStep = opt.xStep || 0;
|
|
let xFinal = opt.xFinal || 0;
|
|
const xValue = opt.xValue || 0;
|
|
const xInverse = opt.xInverse || 0;
|
|
let isWindow = undefined;
|
|
if(isFunc(xFunc)){
|
|
isWindow = false;
|
|
if(isFunc(xStep) || isFunc(xFinal)){
|
|
toss3("Ambiguous arguments: scalar or aggregate?");
|
|
}
|
|
xStep = xFinal = null;
|
|
}else if(isFunc(xStep)){
|
|
if(!isFunc(xFinal)){
|
|
toss3("Missing xFinal() callback for aggregate or window UDF.");
|
|
}
|
|
xFunc = null;
|
|
}else if(isFunc(xFinal)){
|
|
toss3("Missing xStep() callback for aggregate or window UDF.");
|
|
}else{
|
|
toss3("Missing function-type properties.");
|
|
}
|
|
if(false === isWindow){
|
|
if(isFunc(xValue) || isFunc(xInverse)){
|
|
toss3("xValue and xInverse are not permitted for non-window UDFs.");
|
|
}
|
|
}else if(isFunc(xValue)){
|
|
if(!isFunc(xInverse)){
|
|
toss3("xInverse must be provided if xValue is.");
|
|
}
|
|
isWindow = true;
|
|
}else if(isFunc(xInverse)){
|
|
toss3("xValue must be provided if xInverse is.");
|
|
}
|
|
const pApp = opt.pApp;
|
|
if(undefined!==pApp &&
|
|
null!==pApp &&
|
|
(('number'!==typeof pApp) || !util.isInt32(pApp))){
|
|
toss3("Invalid value for pApp property. Must be a legal WASM pointer value.");
|
|
}
|
|
const xDestroy = opt.xDestroy || 0;
|
|
if(xDestroy && !isFunc(xDestroy)){
|
|
toss3("xDestroy property must be a function.");
|
|
}
|
|
let fFlags = 0 /*flags for sqlite3_create_function_v2()*/;
|
|
if(getOwnOption(opt, 'deterministic')) fFlags |= capi.SQLITE_DETERMINISTIC;
|
|
if(getOwnOption(opt, 'directOnly')) fFlags |= capi.SQLITE_DIRECTONLY;
|
|
if(getOwnOption(opt, 'innocuous')) fFlags |= capi.SQLITE_INNOCUOUS;
|
|
name = name.toLowerCase();
|
|
const xArity = xFunc || xStep;
|
|
const arity = getOwnOption(opt, 'arity');
|
|
const arityArg = ('number'===typeof arity
|
|
? arity
|
|
: (xArity.length ? xArity.length-1/*for pCtx arg*/ : 0));
|
|
let rc;
|
|
if( isWindow ){
|
|
rc = capi.sqlite3_create_window_function(
|
|
this.pointer, name, arityArg,
|
|
capi.SQLITE_UTF8 | fFlags, pApp || 0,
|
|
xStep, xFinal, xValue, xInverse, xDestroy);
|
|
}else{
|
|
rc = capi.sqlite3_create_function_v2(
|
|
this.pointer, name, arityArg,
|
|
capi.SQLITE_UTF8 | fFlags, pApp || 0,
|
|
xFunc, xStep, xFinal, xDestroy);
|
|
}
|
|
DB.checkRc(this, rc);
|
|
return this;
|
|
}/*createFunction()*/,
|
|
/**
|
|
Prepares the given SQL, step()s it one time, and returns
|
|
the value of the first result column. If it has no results,
|
|
undefined is returned.
|
|
|
|
If passed a second argument, it is treated like an argument
|
|
to Stmt.bind(), so may be any type supported by that
|
|
function. Passing the undefined value is the same as passing
|
|
no value, which is useful when...
|
|
|
|
If passed a 3rd argument, it is expected to be one of the
|
|
SQLITE_{typename} constants. Passing the undefined value is
|
|
the same as not passing a value.
|
|
|
|
Throws on error (e.g. malformed SQL).
|
|
*/
|
|
selectValue: function(sql,bind,asType){
|
|
return __selectFirstRow(this, sql, bind, 0, asType);
|
|
},
|
|
|
|
/**
|
|
Runs the given query and returns an array of the values from
|
|
the first result column of each row of the result set. The 2nd
|
|
argument is an optional value for use in a single-argument call
|
|
to Stmt.bind(). The 3rd argument may be any value suitable for
|
|
use as the 2nd argument to Stmt.get(). If a 3rd argument is
|
|
desired but no bind data are needed, pass `undefined` for the 2nd
|
|
argument.
|
|
|
|
If there are no result rows, an empty array is returned.
|
|
*/
|
|
selectValues: function(sql,bind,asType){
|
|
const stmt = this.prepare(sql), rc = [];
|
|
try {
|
|
stmt.bind(bind);
|
|
while(stmt.step()) rc.push(stmt.get(0,asType));
|
|
stmt.reset(/*for INSERT...RETURNING locking case*/);
|
|
}finally{
|
|
stmt.finalize();
|
|
}
|
|
return rc;
|
|
},
|
|
|
|
/**
|
|
Prepares the given SQL, step()s it one time, and returns an
|
|
array containing the values of the first result row. If it has
|
|
no results, `undefined` is returned.
|
|
|
|
If passed a second argument other than `undefined`, it is
|
|
treated like an argument to Stmt.bind(), so may be any type
|
|
supported by that function.
|
|
|
|
Throws on error (e.g. malformed SQL).
|
|
*/
|
|
selectArray: function(sql,bind){
|
|
return __selectFirstRow(this, sql, bind, []);
|
|
},
|
|
|
|
/**
|
|
Prepares the given SQL, step()s it one time, and returns an
|
|
object containing the key/value pairs of the first result
|
|
row. If it has no results, `undefined` is returned.
|
|
|
|
Note that the order of returned object's keys is not guaranteed
|
|
to be the same as the order of the fields in the query string.
|
|
|
|
If passed a second argument other than `undefined`, it is
|
|
treated like an argument to Stmt.bind(), so may be any type
|
|
supported by that function.
|
|
|
|
Throws on error (e.g. malformed SQL).
|
|
*/
|
|
selectObject: function(sql,bind){
|
|
return __selectFirstRow(this, sql, bind, {});
|
|
},
|
|
|
|
/**
|
|
Runs the given SQL and returns an array of all results, with
|
|
each row represented as an array, as per the 'array' `rowMode`
|
|
option to `exec()`. An empty result set resolves
|
|
to an empty array. The second argument, if any, is treated as
|
|
the 'bind' option to a call to exec().
|
|
*/
|
|
selectArrays: function(sql,bind){
|
|
return __selectAll(this, sql, bind, 'array');
|
|
},
|
|
|
|
/**
|
|
Works identically to selectArrays() except that each value
|
|
in the returned array is an object, as per the 'object' `rowMode`
|
|
option to `exec()`.
|
|
*/
|
|
selectObjects: function(sql,bind){
|
|
return __selectAll(this, sql, bind, 'object');
|
|
},
|
|
|
|
/**
|
|
Returns the number of currently-opened Stmt handles for this db
|
|
handle, or 0 if this DB instance is closed. Note that only
|
|
handles prepared via this.prepare() are counted, and not
|
|
handles prepared using capi.sqlite3_prepare_v3() (or
|
|
equivalent).
|
|
*/
|
|
openStatementCount: function(){
|
|
return this.pointer ? Object.keys(__stmtMap.get(this)).length : 0;
|
|
},
|
|
|
|
/**
|
|
Starts a transaction, calls the given callback, and then either
|
|
rolls back or commits the savepoint, depending on whether the
|
|
callback throws. The callback is passed this db object as its
|
|
only argument. On success, returns the result of the
|
|
callback. Throws on error.
|
|
|
|
Note that transactions may not be nested, so this will throw if
|
|
it is called recursively. For nested transactions, use the
|
|
savepoint() method or manually manage SAVEPOINTs using exec().
|
|
|
|
If called with 2 arguments, the first must be a keyword which
|
|
is legal immediately after a BEGIN statement, e.g. one of
|
|
"DEFERRED", "IMMEDIATE", or "EXCLUSIVE". Though the exact list
|
|
of supported keywords is not hard-coded here, in order to be
|
|
future-compatible, if the argument does not look like a single
|
|
keyword then an exception is triggered with a description of
|
|
the problem.
|
|
*/
|
|
transaction: function(/* [beginQualifier,] */callback){
|
|
let opener = 'BEGIN';
|
|
if(arguments.length>1){
|
|
if(/[^a-zA-Z]/.test(arguments[0])){
|
|
toss3(capi.SQLITE_MISUSE, "Invalid argument for BEGIN qualifier.");
|
|
}
|
|
opener += ' '+arguments[0];
|
|
callback = arguments[1];
|
|
}
|
|
affirmDbOpen(this).exec(opener);
|
|
try {
|
|
const rc = callback(this);
|
|
this.exec("COMMIT");
|
|
return rc;
|
|
}catch(e){
|
|
this.exec("ROLLBACK");
|
|
throw e;
|
|
}
|
|
},
|
|
|
|
/**
|
|
This works similarly to transaction() but uses sqlite3's SAVEPOINT
|
|
feature. This function starts a savepoint (with an unspecified name)
|
|
and calls the given callback function, passing it this db object.
|
|
If the callback returns, the savepoint is released (committed). If
|
|
the callback throws, the savepoint is rolled back. If it does not
|
|
throw, it returns the result of the callback.
|
|
*/
|
|
savepoint: function(callback){
|
|
affirmDbOpen(this).exec("SAVEPOINT oo1");
|
|
try {
|
|
const rc = callback(this);
|
|
this.exec("RELEASE oo1");
|
|
return rc;
|
|
}catch(e){
|
|
this.exec("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
|
|
throw e;
|
|
}
|
|
},
|
|
|
|
/**
|
|
A convenience form of DB.checkRc(this,resultCode). If it does
|
|
not throw, it returns this object.
|
|
*/
|
|
checkRc: function(resultCode){
|
|
return checkSqlite3Rc(this, resultCode);
|
|
},
|
|
|
|
getAutocommit: function(){
|
|
return capi.sqlite3_get_autocommit(this.pointer);
|
|
},
|
|
|
|
lastInsertRowid: function(){
|
|
return capi.sqlite3_last_insert_rowid(this.pointer);
|
|
}
|
|
}/*DB.prototype*/;
|
|
|
|
|
|
/** Throws if the given Stmt has been finalized, else stmt is
|
|
returned. */
|
|
const affirmStmtOpen = function(stmt){
|
|
if(!stmt.pointer) toss3("Stmt has been closed.");
|
|
return stmt;
|
|
};
|
|
|
|
/** Returns an opaque truthy value from the BindTypes
|
|
enum if v's type is a valid bindable type, else
|
|
returns a falsy value. As a special case, a value of
|
|
undefined is treated as a bind type of null. */
|
|
const isSupportedBindType = function(v){
|
|
let t = BindTypes[(null===v||undefined===v) ? 'null' : typeof v];
|
|
switch(t){
|
|
case BindTypes.boolean:
|
|
case BindTypes.null:
|
|
case BindTypes.number:
|
|
case BindTypes.string:
|
|
return t;
|
|
case BindTypes.bigint:
|
|
if(wasm.bigIntEnabled) return t;
|
|
/* else fall through */
|
|
default:
|
|
return util.isBindableTypedArray(v) ? BindTypes.blob : undefined;
|
|
}
|
|
};
|
|
|
|
/**
|
|
If isSupportedBindType(v) returns a truthy value, this
|
|
function returns that value, else it throws.
|
|
*/
|
|
const affirmSupportedBindType = function(v){
|
|
//sqlite3.config.log('affirmSupportedBindType',v);
|
|
return isSupportedBindType(v) || toss3("Unsupported bind() argument type:",typeof v);
|
|
};
|
|
|
|
/**
|
|
If key is a number and within range of stmt's bound parameter
|
|
count, key is returned.
|
|
|
|
If key is not a number then it is checked against named
|
|
parameters. If a match is found, its index is returned.
|
|
|
|
Else it throws.
|
|
*/
|
|
const affirmParamIndex = function(stmt,key){
|
|
const n = ('number'===typeof key)
|
|
? key : capi.sqlite3_bind_parameter_index(stmt.pointer, key);
|
|
if(0===n || !util.isInt32(n)){
|
|
toss3("Invalid bind() parameter name: "+key);
|
|
}
|
|
else if(n<1 || n>stmt.parameterCount) toss3("Bind index",key,"is out of range.");
|
|
return n;
|
|
};
|
|
|
|
/**
|
|
If stmt._lockedByExec is truthy, this throws an exception
|
|
complaining that the 2nd argument (an operation name,
|
|
e.g. "bind()") is not legal while the statement is "locked".
|
|
Locking happens before an exec()-like callback is passed a
|
|
statement, to ensure that the callback does not mutate or
|
|
finalize the statement. If it does not throw, it returns stmt.
|
|
*/
|
|
const affirmNotLockedByExec = function(stmt,currentOpName){
|
|
if(stmt._lockedByExec){
|
|
toss3("Operation is illegal when statement is locked:",currentOpName);
|
|
}
|
|
return stmt;
|
|
};
|
|
|
|
/**
|
|
Binds a single bound parameter value on the given stmt at the
|
|
given index (numeric or named) using the given bindType (see
|
|
the BindTypes enum) and value. Throws on error. Returns stmt on
|
|
success.
|
|
*/
|
|
const bindOne = function f(stmt,ndx,bindType,val){
|
|
affirmNotLockedByExec(affirmStmtOpen(stmt), 'bind()');
|
|
if(!f._){
|
|
f._tooBigInt = (v)=>toss3(
|
|
"BigInt value is too big to store without precision loss:", v
|
|
);
|
|
f._ = {
|
|
string: function(stmt, ndx, val, asBlob){
|
|
const [pStr, n] = wasm.allocCString(val, true);
|
|
const f = asBlob ? capi.sqlite3_bind_blob : capi.sqlite3_bind_text;
|
|
return f(stmt.pointer, ndx, pStr, n, capi.SQLITE_WASM_DEALLOC);
|
|
}
|
|
};
|
|
}/* static init */
|
|
affirmSupportedBindType(val);
|
|
ndx = affirmParamIndex(stmt,ndx);
|
|
let rc = 0;
|
|
switch((null===val || undefined===val) ? BindTypes.null : bindType){
|
|
case BindTypes.null:
|
|
rc = capi.sqlite3_bind_null(stmt.pointer, ndx);
|
|
break;
|
|
case BindTypes.string:
|
|
rc = f._.string(stmt, ndx, val, false);
|
|
break;
|
|
case BindTypes.number: {
|
|
let m;
|
|
if(util.isInt32(val)) m = capi.sqlite3_bind_int;
|
|
else if('bigint'===typeof val){
|
|
if(!util.bigIntFits64(val)){
|
|
f._tooBigInt(val);
|
|
}else if(wasm.bigIntEnabled){
|
|
m = capi.sqlite3_bind_int64;
|
|
}else if(util.bigIntFitsDouble(val)){
|
|
val = Number(val);
|
|
m = capi.sqlite3_bind_double;
|
|
}else{
|
|
f._tooBigInt(val);
|
|
}
|
|
}else{ // !int32, !bigint
|
|
val = Number(val);
|
|
if(wasm.bigIntEnabled && Number.isInteger(val)){
|
|
m = capi.sqlite3_bind_int64;
|
|
}else{
|
|
m = capi.sqlite3_bind_double;
|
|
}
|
|
}
|
|
rc = m(stmt.pointer, ndx, val);
|
|
break;
|
|
}
|
|
case BindTypes.boolean:
|
|
rc = capi.sqlite3_bind_int(stmt.pointer, ndx, val ? 1 : 0);
|
|
break;
|
|
case BindTypes.blob: {
|
|
if('string'===typeof val){
|
|
rc = f._.string(stmt, ndx, val, true);
|
|
break;
|
|
}else if(val instanceof ArrayBuffer){
|
|
val = new Uint8Array(val);
|
|
}else if(!util.isBindableTypedArray(val)){
|
|
toss3("Binding a value as a blob requires",
|
|
"that it be a string, Uint8Array, Int8Array, or ArrayBuffer.");
|
|
}
|
|
const pBlob = wasm.alloc(val.byteLength || 1);
|
|
wasm.heap8().set(val.byteLength ? val : [0], pBlob)
|
|
rc = capi.sqlite3_bind_blob(stmt.pointer, ndx, pBlob, val.byteLength,
|
|
capi.SQLITE_WASM_DEALLOC);
|
|
break;
|
|
}
|
|
default:
|
|
sqlite3.config.warn("Unsupported bind() argument type:",val);
|
|
toss3("Unsupported bind() argument type: "+(typeof val));
|
|
}
|
|
if(rc) DB.checkRc(stmt.db.pointer, rc);
|
|
stmt._mayGet = false;
|
|
return stmt;
|
|
};
|
|
|
|
Stmt.prototype = {
|
|
/**
|
|
"Finalizes" this statement. This is a no-op if the statement
|
|
has already been finalized. Returns the result of
|
|
sqlite3_finalize() (0 on success, non-0 on error), or the
|
|
undefined value if the statement has already been
|
|
finalized. Regardless of success or failure, most methods in
|
|
this class will throw if called after this is.
|
|
|
|
This method always throws if called when it is illegal to do
|
|
so. Namely, when triggered via a per-row callback handler of a
|
|
DB.exec() call.
|
|
*/
|
|
finalize: function(){
|
|
if(this.pointer){
|
|
affirmNotLockedByExec(this,'finalize()');
|
|
const rc = capi.sqlite3_finalize(this.pointer);
|
|
delete __stmtMap.get(this.db)[this.pointer];
|
|
__ptrMap.delete(this);
|
|
delete this._mayGet;
|
|
delete this.parameterCount;
|
|
delete this._lockedByExec;
|
|
delete this.db;
|
|
return rc;
|
|
}
|
|
},
|
|
/**
|
|
Clears all bound values. Returns this object. Throws if this
|
|
statement has been finalized or if modification of the
|
|
statement is currently illegal (e.g. in the per-row callback of
|
|
a DB.exec() call).
|
|
*/
|
|
clearBindings: function(){
|
|
affirmNotLockedByExec(affirmStmtOpen(this), 'clearBindings()')
|
|
capi.sqlite3_clear_bindings(this.pointer);
|
|
this._mayGet = false;
|
|
return this;
|
|
},
|
|
/**
|
|
Resets this statement so that it may be step()ed again from the
|
|
beginning. Returns this object. Throws if this statement has
|
|
been finalized, if it may not legally be reset because it is
|
|
currently being used from a DB.exec() callback, or if the
|
|
underlying call to sqlite3_reset() returns non-0.
|
|
|
|
If passed a truthy argument then this.clearBindings() is
|
|
also called, otherwise any existing bindings, along with
|
|
any memory allocated for them, are retained.
|
|
|
|
In versions 3.42.0 and earlier, this function did not throw if
|
|
sqlite3_reset() returns non-0, but it was discovered that
|
|
throwing (or significant extra client-side code) is necessary
|
|
in order to avoid certain silent failure scenarios, as
|
|
discussed at:
|
|
|
|
https://sqlite.org/forum/forumpost/36f7a2e7494897df
|
|
*/
|
|
reset: function(alsoClearBinds){
|
|
affirmNotLockedByExec(this,'reset()');
|
|
if(alsoClearBinds) this.clearBindings();
|
|
const rc = capi.sqlite3_reset(affirmStmtOpen(this).pointer);
|
|
this._mayGet = false;
|
|
checkSqlite3Rc(this.db, rc);
|
|
return this;
|
|
},
|
|
/**
|
|
Binds one or more values to its bindable parameters. It
|
|
accepts 1 or 2 arguments:
|
|
|
|
If passed a single argument, it must be either an array, an
|
|
object, or a value of a bindable type (see below).
|
|
|
|
If passed 2 arguments, the first one is the 1-based bind
|
|
index or bindable parameter name and the second one must be
|
|
a value of a bindable type.
|
|
|
|
Bindable value types:
|
|
|
|
- null is bound as NULL.
|
|
|
|
- undefined as a standalone value is a no-op intended to
|
|
simplify certain client-side use cases: passing undefined as
|
|
a value to this function will not actually bind anything and
|
|
this function will skip confirmation that binding is even
|
|
legal. (Those semantics simplify certain client-side uses.)
|
|
Conversely, a value of undefined as an array or object
|
|
property when binding an array/object (see below) is treated
|
|
the same as null.
|
|
|
|
- Numbers are bound as either doubles or integers: doubles if
|
|
they are larger than 32 bits, else double or int32, depending
|
|
on whether they have a fractional part. Booleans are bound as
|
|
integer 0 or 1. It is not expected the distinction of binding
|
|
doubles which have no fractional parts is integers is
|
|
significant for the majority of clients due to sqlite3's data
|
|
typing model. If [BigInt] support is enabled then this
|
|
routine will bind BigInt values as 64-bit integers if they'll
|
|
fit in 64 bits. If that support disabled, it will store the
|
|
BigInt as an int32 or a double if it can do so without loss
|
|
of precision. If the BigInt is _too BigInt_ then it will
|
|
throw.
|
|
|
|
- Strings are bound as strings (use bindAsBlob() to force
|
|
blob binding).
|
|
|
|
- Uint8Array, Int8Array, and ArrayBuffer instances are bound as
|
|
blobs.
|
|
|
|
If passed an array, each element of the array is bound at
|
|
the parameter index equal to the array index plus 1
|
|
(because arrays are 0-based but binding is 1-based).
|
|
|
|
If passed an object, each object key is treated as a
|
|
bindable parameter name. The object keys _must_ match any
|
|
bindable parameter names, including any `$`, `@`, or `:`
|
|
prefix. Because `$` is a legal identifier chararacter in
|
|
JavaScript, that is the suggested prefix for bindable
|
|
parameters: `stmt.bind({$a: 1, $b: 2})`.
|
|
|
|
It returns this object on success and throws on
|
|
error. Errors include:
|
|
|
|
- Any bind index is out of range, a named bind parameter
|
|
does not match, or this statement has no bindable
|
|
parameters.
|
|
|
|
- Any value to bind is of an unsupported type.
|
|
|
|
- Passed no arguments or more than two.
|
|
|
|
- The statement has been finalized.
|
|
*/
|
|
bind: function(/*[ndx,] arg*/){
|
|
affirmStmtOpen(this);
|
|
let ndx, arg;
|
|
switch(arguments.length){
|
|
case 1: ndx = 1; arg = arguments[0]; break;
|
|
case 2: ndx = arguments[0]; arg = arguments[1]; break;
|
|
default: toss3("Invalid bind() arguments.");
|
|
}
|
|
if(undefined===arg){
|
|
/* It might seem intuitive to bind undefined as NULL
|
|
but this approach simplifies certain client-side
|
|
uses when passing on arguments between 2+ levels of
|
|
functions. */
|
|
return this;
|
|
}else if(!this.parameterCount){
|
|
toss3("This statement has no bindable parameters.");
|
|
}
|
|
this._mayGet = false;
|
|
if(null===arg){
|
|
/* bind NULL */
|
|
return bindOne(this, ndx, BindTypes.null, arg);
|
|
}
|
|
else if(Array.isArray(arg)){
|
|
/* bind each entry by index */
|
|
if(1!==arguments.length){
|
|
toss3("When binding an array, an index argument is not permitted.");
|
|
}
|
|
arg.forEach((v,i)=>bindOne(this, i+1, affirmSupportedBindType(v), v));
|
|
return this;
|
|
}else if(arg instanceof ArrayBuffer){
|
|
arg = new Uint8Array(arg);
|
|
}
|
|
if('object'===typeof arg/*null was checked above*/
|
|
&& !util.isBindableTypedArray(arg)){
|
|
/* Treat each property of arg as a named bound parameter. */
|
|
if(1!==arguments.length){
|
|
toss3("When binding an object, an index argument is not permitted.");
|
|
}
|
|
Object.keys(arg)
|
|
.forEach(k=>bindOne(this, k,
|
|
affirmSupportedBindType(arg[k]),
|
|
arg[k]));
|
|
return this;
|
|
}else{
|
|
return bindOne(this, ndx, affirmSupportedBindType(arg), arg);
|
|
}
|
|
toss3("Should not reach this point.");
|
|
},
|
|
/**
|
|
Special case of bind() which binds the given value using the
|
|
BLOB binding mechanism instead of the default selected one for
|
|
the value. The ndx may be a numbered or named bind index. The
|
|
value must be of type string, null/undefined (both get treated
|
|
as null), or a TypedArray of a type supported by the bind()
|
|
API. This API cannot bind numbers as blobs.
|
|
|
|
If passed a single argument, a bind index of 1 is assumed and
|
|
the first argument is the value.
|
|
*/
|
|
bindAsBlob: function(ndx,arg){
|
|
affirmStmtOpen(this);
|
|
if(1===arguments.length){
|
|
arg = ndx;
|
|
ndx = 1;
|
|
}
|
|
const t = affirmSupportedBindType(arg);
|
|
if(BindTypes.string !== t && BindTypes.blob !== t
|
|
&& BindTypes.null !== t){
|
|
toss3("Invalid value type for bindAsBlob()");
|
|
}
|
|
return bindOne(this, ndx, BindTypes.blob, arg);
|
|
},
|
|
/**
|
|
Steps the statement one time. If the result indicates that a
|
|
row of data is available, a truthy value is returned.
|
|
If no row of data is available, a falsy
|
|
value is returned. Throws on error.
|
|
*/
|
|
step: function(){
|
|
affirmNotLockedByExec(this, 'step()');
|
|
const rc = capi.sqlite3_step(affirmStmtOpen(this).pointer);
|
|
switch(rc){
|
|
case capi.SQLITE_DONE: return this._mayGet = false;
|
|
case capi.SQLITE_ROW: return this._mayGet = true;
|
|
default:
|
|
this._mayGet = false;
|
|
sqlite3.config.warn("sqlite3_step() rc=",rc,
|
|
capi.sqlite3_js_rc_str(rc),
|
|
"SQL =", capi.sqlite3_sql(this.pointer));
|
|
DB.checkRc(this.db.pointer, rc);
|
|
}
|
|
},
|
|
/**
|
|
Functions exactly like step() except that...
|
|
|
|
1) On success, it calls this.reset() and returns this object.
|
|
2) On error, it throws and does not call reset().
|
|
|
|
This is intended to simplify constructs like:
|
|
|
|
```
|
|
for(...) {
|
|
stmt.bind(...).stepReset();
|
|
}
|
|
```
|
|
|
|
Note that the reset() call makes it illegal to call this.get()
|
|
after the step.
|
|
*/
|
|
stepReset: function(){
|
|
this.step();
|
|
return this.reset();
|
|
},
|
|
/**
|
|
Functions like step() except that it calls finalize() on this
|
|
statement immediately after stepping, even if the step() call
|
|
throws.
|
|
|
|
On success, it returns true if the step indicated that a row of
|
|
data was available, else it returns false.
|
|
|
|
This is intended to simplify use cases such as:
|
|
|
|
```
|
|
aDb.prepare("insert into foo(a) values(?)").bind(123).stepFinalize();
|
|
```
|
|
*/
|
|
stepFinalize: function(){
|
|
try{
|
|
const rc = this.step();
|
|
this.reset(/*for INSERT...RETURNING locking case*/);
|
|
return rc;
|
|
}finally{
|
|
try{this.finalize()}
|
|
catch(e){/*ignored*/}
|
|
}
|
|
},
|
|
/**
|
|
Fetches the value from the given 0-based column index of
|
|
the current data row, throwing if index is out of range.
|
|
|
|
Requires that step() has just returned a truthy value, else
|
|
an exception is thrown.
|
|
|
|
By default it will determine the data type of the result
|
|
automatically. If passed a second arugment, it must be one
|
|
of the enumeration values for sqlite3 types, which are
|
|
defined as members of the sqlite3 module: SQLITE_INTEGER,
|
|
SQLITE_FLOAT, SQLITE_TEXT, SQLITE_BLOB. Any other value,
|
|
except for undefined, will trigger an exception. Passing
|
|
undefined is the same as not passing a value. It is legal
|
|
to, e.g., fetch an integer value as a string, in which case
|
|
sqlite3 will convert the value to a string.
|
|
|
|
If ndx is an array, this function behaves a differently: it
|
|
assigns the indexes of the array, from 0 to the number of
|
|
result columns, to the values of the corresponding column,
|
|
and returns that array.
|
|
|
|
If ndx is a plain object, this function behaves even
|
|
differentlier: it assigns the properties of the object to
|
|
the values of their corresponding result columns.
|
|
|
|
Blobs are returned as Uint8Array instances.
|
|
|
|
Potential TODO: add type ID SQLITE_JSON, which fetches the
|
|
result as a string and passes it (if it's not null) to
|
|
JSON.parse(), returning the result of that. Until then,
|
|
getJSON() can be used for that.
|
|
*/
|
|
get: function(ndx,asType){
|
|
if(!affirmStmtOpen(this)._mayGet){
|
|
toss3("Stmt.step() has not (recently) returned true.");
|
|
}
|
|
if(Array.isArray(ndx)){
|
|
let i = 0;
|
|
const n = this.columnCount;
|
|
while(i<n){
|
|
ndx[i] = this.get(i++);
|
|
}
|
|
return ndx;
|
|
}else if(ndx && 'object'===typeof ndx){
|
|
let i = 0;
|
|
const n = this.columnCount;
|
|
while(i<n){
|
|
ndx[capi.sqlite3_column_name(this.pointer,i)] = this.get(i++);
|
|
}
|
|
return ndx;
|
|
}
|
|
affirmColIndex(this, ndx);
|
|
switch(undefined===asType
|
|
? capi.sqlite3_column_type(this.pointer, ndx)
|
|
: asType){
|
|
case capi.SQLITE_NULL: return null;
|
|
case capi.SQLITE_INTEGER:{
|
|
if(wasm.bigIntEnabled){
|
|
const rc = capi.sqlite3_column_int64(this.pointer, ndx);
|
|
if(rc>=Number.MIN_SAFE_INTEGER && rc<=Number.MAX_SAFE_INTEGER){
|
|
/* Coerce "normal" number ranges to normal number values,
|
|
and only return BigInt-type values for numbers out of this
|
|
range. */
|
|
return Number(rc).valueOf();
|
|
}
|
|
return rc;
|
|
}else{
|
|
const rc = capi.sqlite3_column_double(this.pointer, ndx);
|
|
if(rc>Number.MAX_SAFE_INTEGER || rc<Number.MIN_SAFE_INTEGER){
|
|
/* Throwing here is arguable but, since we're explicitly
|
|
extracting an SQLITE_INTEGER-type value, it seems fair to throw
|
|
if the extracted number is out of range for that type.
|
|
This policy may be laxened to simply pass on the number and
|
|
hope for the best, as the C API would do. */
|
|
toss3("Integer is out of range for JS integer range: "+rc);
|
|
}
|
|
//sqlite3.config.log("get integer rc=",rc,isInt32(rc));
|
|
return util.isInt32(rc) ? (rc | 0) : rc;
|
|
}
|
|
}
|
|
case capi.SQLITE_FLOAT:
|
|
return capi.sqlite3_column_double(this.pointer, ndx);
|
|
case capi.SQLITE_TEXT:
|
|
return capi.sqlite3_column_text(this.pointer, ndx);
|
|
case capi.SQLITE_BLOB: {
|
|
const n = capi.sqlite3_column_bytes(this.pointer, ndx),
|
|
ptr = capi.sqlite3_column_blob(this.pointer, ndx),
|
|
rc = new Uint8Array(n);
|
|
//heap = n ? wasm.heap8() : false;
|
|
if(n) rc.set(wasm.heap8u().slice(ptr, ptr+n), 0);
|
|
//for(let i = 0; i < n; ++i) rc[i] = heap[ptr + i];
|
|
if(n && this.db._blobXfer instanceof Array){
|
|
/* This is an optimization soley for the
|
|
Worker-based API. These values will be
|
|
transfered to the main thread directly
|
|
instead of being copied. */
|
|
this.db._blobXfer.push(rc.buffer);
|
|
}
|
|
return rc;
|
|
}
|
|
default: toss3("Don't know how to translate",
|
|
"type of result column #"+ndx+".");
|
|
}
|
|
toss3("Not reached.");
|
|
},
|
|
/** Equivalent to get(ndx) but coerces the result to an
|
|
integer. */
|
|
getInt: function(ndx){return this.get(ndx,capi.SQLITE_INTEGER)},
|
|
/** Equivalent to get(ndx) but coerces the result to a
|
|
float. */
|
|
getFloat: function(ndx){return this.get(ndx,capi.SQLITE_FLOAT)},
|
|
/** Equivalent to get(ndx) but coerces the result to a
|
|
string. */
|
|
getString: function(ndx){return this.get(ndx,capi.SQLITE_TEXT)},
|
|
/** Equivalent to get(ndx) but coerces the result to a
|
|
Uint8Array. */
|
|
getBlob: function(ndx){return this.get(ndx,capi.SQLITE_BLOB)},
|
|
/**
|
|
A convenience wrapper around get() which fetches the value
|
|
as a string and then, if it is not null, passes it to
|
|
JSON.parse(), returning that result. Throws if parsing
|
|
fails. If the result is null, null is returned. An empty
|
|
string, on the other hand, will trigger an exception.
|
|
*/
|
|
getJSON: function(ndx){
|
|
const s = this.get(ndx, capi.SQLITE_STRING);
|
|
return null===s ? s : JSON.parse(s);
|
|
},
|
|
// Design note: the only reason most of these getters have a 'get'
|
|
// prefix is for consistency with getVALUE_TYPE(). The latter
|
|
// arguably really need that prefix for API readability and the
|
|
// rest arguably don't, but consistency is a powerful thing.
|
|
/**
|
|
Returns the result column name of the given index, or
|
|
throws if index is out of bounds or this statement has been
|
|
finalized. This can be used without having run step()
|
|
first.
|
|
*/
|
|
getColumnName: function(ndx){
|
|
return capi.sqlite3_column_name(
|
|
affirmColIndex(affirmStmtOpen(this),ndx).pointer, ndx
|
|
);
|
|
},
|
|
/**
|
|
If this statement potentially has result columns, this function
|
|
returns an array of all such names. If passed an array, it is
|
|
used as the target and all names are appended to it. Returns
|
|
the target array. Throws if this statement cannot have result
|
|
columns. This object's columnCount property holds the number of
|
|
columns.
|
|
*/
|
|
getColumnNames: function(tgt=[]){
|
|
affirmColIndex(affirmStmtOpen(this),0);
|
|
const n = this.columnCount;
|
|
for(let i = 0; i < n; ++i){
|
|
tgt.push(capi.sqlite3_column_name(this.pointer, i));
|
|
}
|
|
return tgt;
|
|
},
|
|
/**
|
|
If this statement has named bindable parameters and the
|
|
given name matches one, its 1-based bind index is
|
|
returned. If no match is found, 0 is returned. If it has no
|
|
bindable parameters, the undefined value is returned.
|
|
*/
|
|
getParamIndex: function(name){
|
|
return (affirmStmtOpen(this).parameterCount
|
|
? capi.sqlite3_bind_parameter_index(this.pointer, name)
|
|
: undefined);
|
|
}
|
|
}/*Stmt.prototype*/;
|
|
|
|
{/* Add the `pointer` property to DB and Stmt. */
|
|
const prop = {
|
|
enumerable: true,
|
|
get: function(){return __ptrMap.get(this)},
|
|
set: ()=>toss3("The pointer property is read-only.")
|
|
}
|
|
Object.defineProperty(Stmt.prototype, 'pointer', prop);
|
|
Object.defineProperty(DB.prototype, 'pointer', prop);
|
|
}
|
|
/**
|
|
Stmt.columnCount is an interceptor for sqlite3_column_count().
|
|
|
|
This requires an unfortunate performance hit compared to caching
|
|
columnCount when the Stmt is created/prepared (as was done in
|
|
SQLite <=3.42.0), but is necessary in order to handle certain
|
|
corner cases, as described in
|
|
https://sqlite.org/forum/forumpost/7774b773937cbe0a.
|
|
*/
|
|
Object.defineProperty(Stmt.prototype, 'columnCount', {
|
|
enumerable: false,
|
|
get: function(){return capi.sqlite3_column_count(this.pointer)},
|
|
set: ()=>toss3("The columnCount property is read-only.")
|
|
});
|
|
|
|
/** The OO API's public namespace. */
|
|
sqlite3.oo1 = {
|
|
DB,
|
|
Stmt
|
|
}/*oo1 object*/;
|
|
|
|
if(util.isUIThread()){
|
|
/**
|
|
Functionally equivalent to DB(storageName,'c','kvvfs') except
|
|
that it throws if the given storage name is not one of 'local'
|
|
or 'session'.
|
|
*/
|
|
sqlite3.oo1.JsStorageDb = function(storageName='session'){
|
|
if('session'!==storageName && 'local'!==storageName){
|
|
toss3("JsStorageDb db name must be one of 'session' or 'local'.");
|
|
}
|
|
dbCtorHelper.call(this, {
|
|
filename: storageName,
|
|
flags: 'c',
|
|
vfs: "kvvfs"
|
|
});
|
|
};
|
|
const jdb = sqlite3.oo1.JsStorageDb;
|
|
jdb.prototype = Object.create(DB.prototype);
|
|
/** Equivalent to sqlite3_js_kvvfs_clear(). */
|
|
jdb.clearStorage = capi.sqlite3_js_kvvfs_clear;
|
|
/**
|
|
Clears this database instance's storage or throws if this
|
|
instance has been closed. Returns the number of
|
|
database blocks which were cleaned up.
|
|
*/
|
|
jdb.prototype.clearStorage = function(){
|
|
return jdb.clearStorage(affirmDbOpen(this).filename);
|
|
};
|
|
/** Equivalent to sqlite3_js_kvvfs_size(). */
|
|
jdb.storageSize = capi.sqlite3_js_kvvfs_size;
|
|
/**
|
|
Returns the _approximate_ number of bytes this database takes
|
|
up in its storage or throws if this instance has been closed.
|
|
*/
|
|
jdb.prototype.storageSize = function(){
|
|
return jdb.storageSize(affirmDbOpen(this).filename);
|
|
};
|
|
}/*main-window-only bits*/
|
|
|
|
});
|
|
//#else
|
|
/* Built with the omit-oo1 flag. */
|
|
//#endif ifnot omit-oo1
|