mirror of
https://github.com/tursodatabase/libsql.git
synced 2025-05-18 05:57:01 +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>
2056 lines
64 KiB
C
2056 lines
64 KiB
C
/*
|
|
** 2015-04-06
|
|
**
|
|
** 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 is a utility program that computes the differences in content
|
|
** between two SQLite databases.
|
|
**
|
|
** To compile, simply link against SQLite. (Windows builds must also link
|
|
** against ext/consio/console_io.c.)
|
|
**
|
|
** See the showHelp() routine below for a brief description of how to
|
|
** run the utility.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include "sqlite3.h"
|
|
|
|
/* Output function substitutions that cause UTF8 characters to be rendered
|
|
** correctly on Windows:
|
|
**
|
|
** fprintf() -> Wfprintf()
|
|
**
|
|
*/
|
|
#if defined(_WIN32)
|
|
# include "console_io.h"
|
|
# define Wfprintf fPrintfUtf8
|
|
#else
|
|
# define Wfprintf fprintf
|
|
#endif
|
|
|
|
/*
|
|
** All global variables are gathered into the "g" singleton.
|
|
*/
|
|
struct GlobalVars {
|
|
const char *zArgv0; /* Name of program */
|
|
int bSchemaOnly; /* Only show schema differences */
|
|
int bSchemaPK; /* Use the schema-defined PK, not the true PK */
|
|
int bHandleVtab; /* Handle fts3, fts4, fts5 and rtree vtabs */
|
|
unsigned fDebug; /* Debug flags */
|
|
int bSchemaCompare; /* Doing single-table sqlite_schema compare */
|
|
sqlite3 *db; /* The database connection */
|
|
} g;
|
|
|
|
/*
|
|
** Allowed values for g.fDebug
|
|
*/
|
|
#define DEBUG_COLUMN_NAMES 0x000001
|
|
#define DEBUG_DIFF_SQL 0x000002
|
|
|
|
/*
|
|
** Clear and free an sqlite3_str object
|
|
*/
|
|
static void strFree(sqlite3_str *pStr){
|
|
sqlite3_free(sqlite3_str_finish(pStr));
|
|
}
|
|
|
|
/*
|
|
** Print an error resulting from faulting command-line arguments and
|
|
** abort the program.
|
|
*/
|
|
static void cmdlineError(const char *zFormat, ...){
|
|
sqlite3_str *pOut = sqlite3_str_new(0);
|
|
va_list ap;
|
|
va_start(ap, zFormat);
|
|
sqlite3_str_vappendf(pOut, zFormat, ap);
|
|
va_end(ap);
|
|
Wfprintf(stderr, "%s: %s\n", g.zArgv0, sqlite3_str_value(pOut));
|
|
strFree(pOut);
|
|
Wfprintf(stderr, "\"%s --help\" for more help\n", g.zArgv0);
|
|
exit(1);
|
|
}
|
|
|
|
/*
|
|
** Print an error message for an error that occurs at runtime, then
|
|
** abort the program.
|
|
*/
|
|
static void runtimeError(const char *zFormat, ...){
|
|
sqlite3_str *pOut = sqlite3_str_new(0);
|
|
va_list ap;
|
|
va_start(ap, zFormat);
|
|
sqlite3_str_vappendf(pOut, zFormat, ap);
|
|
va_end(ap);
|
|
Wfprintf(stderr, "%s: %s\n", g.zArgv0, sqlite3_str_value(pOut));
|
|
strFree(pOut);
|
|
exit(1);
|
|
}
|
|
|
|
|
|
/* Safely quote an SQL identifier. Use the minimum amount of transformation
|
|
** necessary to allow the string to be used with %s.
|
|
**
|
|
** Space to hold the returned string is obtained from sqlite3_malloc(). The
|
|
** caller is responsible for ensuring this space is freed when no longer
|
|
** needed.
|
|
*/
|
|
static char *safeId(const char *zId){
|
|
int i, x;
|
|
char c;
|
|
if( zId[0]==0 ) return sqlite3_mprintf("\"\"");
|
|
for(i=x=0; (c = zId[i])!=0; i++){
|
|
if( !isalpha(c) && c!='_' ){
|
|
if( i>0 && isdigit(c) ){
|
|
x++;
|
|
}else{
|
|
return sqlite3_mprintf("\"%w\"", zId);
|
|
}
|
|
}
|
|
}
|
|
if( x || !sqlite3_keyword_check(zId,i) ){
|
|
return sqlite3_mprintf("%s", zId);
|
|
}
|
|
return sqlite3_mprintf("\"%w\"", zId);
|
|
}
|
|
|
|
/*
|
|
** Prepare a new SQL statement. Print an error and abort if anything
|
|
** goes wrong.
|
|
*/
|
|
static sqlite3_stmt *db_vprepare(const char *zFormat, va_list ap){
|
|
char *zSql;
|
|
int rc;
|
|
sqlite3_stmt *pStmt;
|
|
|
|
zSql = sqlite3_vmprintf(zFormat, ap);
|
|
if( zSql==0 ) runtimeError("out of memory");
|
|
rc = sqlite3_prepare_v2(g.db, zSql, -1, &pStmt, 0);
|
|
if( rc ){
|
|
runtimeError("SQL statement error: %s\n\"%s\"", sqlite3_errmsg(g.db),
|
|
zSql);
|
|
}
|
|
sqlite3_free(zSql);
|
|
return pStmt;
|
|
}
|
|
static sqlite3_stmt *db_prepare(const char *zFormat, ...){
|
|
va_list ap;
|
|
sqlite3_stmt *pStmt;
|
|
va_start(ap, zFormat);
|
|
pStmt = db_vprepare(zFormat, ap);
|
|
va_end(ap);
|
|
return pStmt;
|
|
}
|
|
|
|
/*
|
|
** Free a list of strings
|
|
*/
|
|
static void namelistFree(char **az){
|
|
if( az ){
|
|
int i;
|
|
for(i=0; az[i]; i++) sqlite3_free(az[i]);
|
|
sqlite3_free(az);
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Return a list of column names [a] for the table zDb.zTab. Space to
|
|
** hold the list is obtained from sqlite3_malloc() and should released
|
|
** using namelistFree() when no longer needed.
|
|
**
|
|
** Primary key columns are listed first, followed by data columns.
|
|
** The number of columns in the primary key is returned in *pnPkey.
|
|
**
|
|
** Normally [a], the "primary key" in the previous sentence is the true
|
|
** primary key - the rowid or INTEGER PRIMARY KEY for ordinary tables
|
|
** or the declared PRIMARY KEY for WITHOUT ROWID tables. However, if
|
|
** the g.bSchemaPK flag is set, then the schema-defined PRIMARY KEY is
|
|
** used in all cases. In that case, entries that have NULL values in
|
|
** any of their primary key fields will be excluded from the analysis.
|
|
**
|
|
** If the primary key for a table is the rowid but rowid is inaccessible,
|
|
** then this routine returns a NULL pointer.
|
|
**
|
|
** [a. If the lone, named table is "sqlite_schema", "rootpage" column is
|
|
** omitted and the "type" and "name" columns are made to be the PK.]
|
|
**
|
|
** Examples:
|
|
** CREATE TABLE t1(a INT UNIQUE, b INTEGER, c TEXT, PRIMARY KEY(c));
|
|
** *pnPKey = 1;
|
|
** az = { "rowid", "a", "b", "c", 0 } // Normal case
|
|
** az = { "c", "a", "b", 0 } // g.bSchemaPK==1
|
|
**
|
|
** CREATE TABLE t2(a INT UNIQUE, b INTEGER, c TEXT, PRIMARY KEY(b));
|
|
** *pnPKey = 1;
|
|
** az = { "b", "a", "c", 0 }
|
|
**
|
|
** CREATE TABLE t3(x,y,z,PRIMARY KEY(y,z));
|
|
** *pnPKey = 1 // Normal case
|
|
** az = { "rowid", "x", "y", "z", 0 } // Normal case
|
|
** *pnPKey = 2 // g.bSchemaPK==1
|
|
** az = { "y", "x", "z", 0 } // g.bSchemaPK==1
|
|
**
|
|
** CREATE TABLE t4(x,y,z,PRIMARY KEY(y,z)) WITHOUT ROWID;
|
|
** *pnPKey = 2
|
|
** az = { "y", "z", "x", 0 }
|
|
**
|
|
** CREATE TABLE t5(rowid,_rowid_,oid);
|
|
** az = 0 // The rowid is not accessible
|
|
*/
|
|
static char **columnNames(
|
|
const char *zDb, /* Database ("main" or "aux") to query */
|
|
const char *zTab, /* Name of table to return details of */
|
|
int *pnPKey, /* OUT: Number of PK columns */
|
|
int *pbRowid /* OUT: True if PK is an implicit rowid */
|
|
){
|
|
char **az = 0; /* List of column names to be returned */
|
|
int naz = 0; /* Number of entries in az[] */
|
|
sqlite3_stmt *pStmt; /* SQL statement being run */
|
|
char *zPkIdxName = 0; /* Name of the PRIMARY KEY index */
|
|
int truePk = 0; /* PRAGMA table_info indentifies the PK to use */
|
|
int nPK = 0; /* Number of PRIMARY KEY columns */
|
|
int i, j; /* Loop counters */
|
|
|
|
if( g.bSchemaPK==0 ){
|
|
/* Normal case: Figure out what the true primary key is for the table.
|
|
** * For WITHOUT ROWID tables, the true primary key is the same as
|
|
** the schema PRIMARY KEY, which is guaranteed to be present.
|
|
** * For rowid tables with an INTEGER PRIMARY KEY, the true primary
|
|
** key is the INTEGER PRIMARY KEY.
|
|
** * For all other rowid tables, the rowid is the true primary key.
|
|
*/
|
|
pStmt = db_prepare("PRAGMA %s.index_list=%Q", zDb, zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
if( sqlite3_stricmp((const char*)sqlite3_column_text(pStmt,3),"pk")==0 ){
|
|
zPkIdxName = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
|
|
break;
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
if( zPkIdxName ){
|
|
int nKey = 0;
|
|
int nCol = 0;
|
|
truePk = 0;
|
|
pStmt = db_prepare("PRAGMA %s.index_xinfo=%Q", zDb, zPkIdxName);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
nCol++;
|
|
if( sqlite3_column_int(pStmt,5) ){ nKey++; continue; }
|
|
if( sqlite3_column_int(pStmt,1)>=0 ) truePk = 1;
|
|
}
|
|
if( nCol==nKey ) truePk = 1;
|
|
if( truePk ){
|
|
nPK = nKey;
|
|
}else{
|
|
nPK = 1;
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
sqlite3_free(zPkIdxName);
|
|
}else{
|
|
truePk = 1;
|
|
nPK = 1;
|
|
}
|
|
pStmt = db_prepare("PRAGMA %s.table_info=%Q", zDb, zTab);
|
|
}else{
|
|
/* The g.bSchemaPK==1 case: Use whatever primary key is declared
|
|
** in the schema. The "rowid" will still be used as the primary key
|
|
** if the table definition does not contain a PRIMARY KEY.
|
|
*/
|
|
nPK = 0;
|
|
pStmt = db_prepare("PRAGMA %s.table_info=%Q", zDb, zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
if( sqlite3_column_int(pStmt,5)>0 ) nPK++;
|
|
}
|
|
sqlite3_reset(pStmt);
|
|
if( nPK==0 ) nPK = 1;
|
|
truePk = 1;
|
|
}
|
|
if( g.bSchemaCompare ){
|
|
assert( sqlite3_stricmp(zTab,"sqlite_schema")==0
|
|
|| sqlite3_stricmp(zTab,"sqlite_master")==0 );
|
|
/* For sqlite_schema, will use type and name as the PK. */
|
|
nPK = 2;
|
|
truePk = 0;
|
|
}
|
|
*pnPKey = nPK;
|
|
naz = nPK;
|
|
az = sqlite3_malloc( sizeof(char*)*(nPK+1) );
|
|
if( az==0 ) runtimeError("out of memory");
|
|
memset(az, 0, sizeof(char*)*(nPK+1));
|
|
if( g.bSchemaCompare ){
|
|
az[0] = sqlite3_mprintf("%s", "type");
|
|
az[1] = sqlite3_mprintf("%s", "name");
|
|
}
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
char * sid = safeId((char*)sqlite3_column_text(pStmt,1));
|
|
int iPKey;
|
|
if( truePk && (iPKey = sqlite3_column_int(pStmt,5))>0 ){
|
|
az[iPKey-1] = sid;
|
|
}else{
|
|
if( !g.bSchemaCompare
|
|
|| !(strcmp(sid,"rootpage")==0
|
|
||strcmp(sid,"name")==0
|
|
||strcmp(sid,"type")==0)){
|
|
az = sqlite3_realloc(az, sizeof(char*)*(naz+2) );
|
|
if( az==0 ) runtimeError("out of memory");
|
|
az[naz++] = sid;
|
|
}
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
if( az ) az[naz] = 0;
|
|
|
|
/* If it is non-NULL, set *pbRowid to indicate whether or not the PK of
|
|
** this table is an implicit rowid (*pbRowid==1) or not (*pbRowid==0). */
|
|
if( pbRowid ) *pbRowid = (az[0]==0);
|
|
|
|
/* If this table has an implicit rowid for a PK, figure out how to refer
|
|
** to it. There are usually three options - "rowid", "_rowid_" and "oid".
|
|
** Any of these will work, unless the table has an explicit column of the
|
|
** same name or the sqlite_schema tables are to be compared. In the latter
|
|
** case, pretend that the "true" primary key is the name column, which
|
|
** avoids extraneous diffs against the schemas due to rowid variance. */
|
|
if( az[0]==0 ){
|
|
const char *azRowid[] = { "rowid", "_rowid_", "oid" };
|
|
for(i=0; i<sizeof(azRowid)/sizeof(azRowid[0]); i++){
|
|
for(j=1; j<naz; j++){
|
|
if( sqlite3_stricmp(az[j], azRowid[i])==0 ) break;
|
|
}
|
|
if( j>=naz ){
|
|
az[0] = sqlite3_mprintf("%s", azRowid[i]);
|
|
break;
|
|
}
|
|
}
|
|
if( az[0]==0 ){
|
|
for(i=1; i<naz; i++) sqlite3_free(az[i]);
|
|
sqlite3_free(az);
|
|
az = 0;
|
|
}
|
|
}
|
|
return az;
|
|
}
|
|
|
|
/*
|
|
** Print the sqlite3_value X as an SQL literal.
|
|
*/
|
|
static void printQuoted(FILE *out, sqlite3_value *X){
|
|
switch( sqlite3_value_type(X) ){
|
|
case SQLITE_FLOAT: {
|
|
double r1;
|
|
char zBuf[50];
|
|
r1 = sqlite3_value_double(X);
|
|
sqlite3_snprintf(sizeof(zBuf), zBuf, "%!.15g", r1);
|
|
fprintf(out, "%s", zBuf);
|
|
break;
|
|
}
|
|
case SQLITE_INTEGER: {
|
|
fprintf(out, "%lld", sqlite3_value_int64(X));
|
|
break;
|
|
}
|
|
case SQLITE_BLOB: {
|
|
const unsigned char *zBlob = sqlite3_value_blob(X);
|
|
int nBlob = sqlite3_value_bytes(X);
|
|
if( zBlob ){
|
|
int i;
|
|
fprintf(out, "x'");
|
|
for(i=0; i<nBlob; i++){
|
|
fprintf(out, "%02x", zBlob[i]);
|
|
}
|
|
fprintf(out, "'");
|
|
}else{
|
|
/* Could be an OOM, could be a zero-byte blob */
|
|
fprintf(out, "X''");
|
|
}
|
|
break;
|
|
}
|
|
case SQLITE_TEXT: {
|
|
const unsigned char *zArg = sqlite3_value_text(X);
|
|
|
|
if( zArg==0 ){
|
|
fprintf(out, "NULL");
|
|
}else{
|
|
int inctl = 0;
|
|
int i, j;
|
|
fprintf(out, "'");
|
|
for(i=j=0; zArg[i]; i++){
|
|
char c = zArg[i];
|
|
int ctl = iscntrl(c);
|
|
if( ctl>inctl ){
|
|
inctl = ctl;
|
|
fprintf(out, "%.*s'||X'%02x", i-j, &zArg[j], c);
|
|
j = i+1;
|
|
}else if( ctl ){
|
|
fprintf(out, "%02x", c);
|
|
j = i+1;
|
|
}else{
|
|
if( inctl ){
|
|
inctl = 0;
|
|
fprintf(out, "'\n||'");
|
|
}
|
|
if( c=='\'' ){
|
|
fprintf(out, "%.*s'", i-j+1, &zArg[j]);
|
|
j = i+1;
|
|
}
|
|
}
|
|
}
|
|
fprintf(out, "%s'", &zArg[j]);
|
|
}
|
|
break;
|
|
}
|
|
case SQLITE_NULL: {
|
|
fprintf(out, "NULL");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Output SQL that will recreate the aux.zTab table.
|
|
*/
|
|
static void dump_table(const char *zTab, FILE *out){
|
|
char *zId = safeId(zTab); /* Name of the table */
|
|
char **az = 0; /* List of columns */
|
|
int nPk; /* Number of true primary key columns */
|
|
int nCol; /* Number of data columns */
|
|
int i; /* Loop counter */
|
|
sqlite3_stmt *pStmt; /* SQL statement */
|
|
const char *zSep; /* Separator string */
|
|
sqlite3_str *pIns; /* Beginning of the INSERT statement */
|
|
|
|
pStmt = db_prepare("SELECT sql FROM aux.sqlite_schema WHERE name=%Q", zTab);
|
|
if( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
fprintf(out, "%s;\n", sqlite3_column_text(pStmt,0));
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
if( !g.bSchemaOnly ){
|
|
az = columnNames("aux", zTab, &nPk, 0);
|
|
pIns = sqlite3_str_new(0);
|
|
if( az==0 ){
|
|
pStmt = db_prepare("SELECT * FROM aux.%s", zId);
|
|
sqlite3_str_appendf(pIns,"INSERT INTO %s VALUES", zId);
|
|
}else{
|
|
sqlite3_str *pSql = sqlite3_str_new(0);
|
|
zSep = "SELECT";
|
|
for(i=0; az[i]; i++){
|
|
sqlite3_str_appendf(pSql, "%s %s", zSep, az[i]);
|
|
zSep = ",";
|
|
}
|
|
sqlite3_str_appendf(pSql," FROM aux.%s", zId);
|
|
zSep = " ORDER BY";
|
|
for(i=1; i<=nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s %d", zSep, i);
|
|
zSep = ",";
|
|
}
|
|
pStmt = db_prepare("%s", sqlite3_str_value(pSql));
|
|
strFree(pSql);
|
|
sqlite3_str_appendf(pIns, "INSERT INTO %s", zId);
|
|
zSep = "(";
|
|
for(i=0; az[i]; i++){
|
|
sqlite3_str_appendf(pIns, "%s%s", zSep, az[i]);
|
|
zSep = ",";
|
|
}
|
|
sqlite3_str_appendf(pIns,") VALUES");
|
|
namelistFree(az);
|
|
}
|
|
nCol = sqlite3_column_count(pStmt);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
Wfprintf(out, "%s",sqlite3_str_value(pIns));
|
|
zSep = "(";
|
|
for(i=0; i<nCol; i++){
|
|
Wfprintf(out, "%s",zSep);
|
|
printQuoted(out, sqlite3_column_value(pStmt,i));
|
|
zSep = ",";
|
|
}
|
|
Wfprintf(out, ");\n");
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
strFree(pIns);
|
|
} /* endif !g.bSchemaOnly */
|
|
pStmt = db_prepare("SELECT sql FROM aux.sqlite_schema"
|
|
" WHERE type='index' AND tbl_name=%Q AND sql IS NOT NULL",
|
|
zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
Wfprintf(out, "%s;\n", sqlite3_column_text(pStmt,0));
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
sqlite3_free(zId);
|
|
}
|
|
|
|
|
|
/*
|
|
** Compute all differences for a single table, except if the
|
|
** table name is sqlite_schema, ignore the rootpage column.
|
|
*/
|
|
static void diff_one_table(const char *zTab, FILE *out){
|
|
char *zId = safeId(zTab); /* Name of table (translated for us in SQL) */
|
|
char **az = 0; /* Columns in main */
|
|
char **az2 = 0; /* Columns in aux */
|
|
int nPk; /* Primary key columns in main */
|
|
int nPk2; /* Primary key columns in aux */
|
|
int n = 0; /* Number of columns in main */
|
|
int n2; /* Number of columns in aux */
|
|
int nQ; /* Number of output columns in the diff query */
|
|
int i; /* Loop counter */
|
|
const char *zSep; /* Separator string */
|
|
sqlite3_str *pSql; /* Comparison query */
|
|
sqlite3_stmt *pStmt; /* Query statement to do the diff */
|
|
const char *zLead = /* Becomes line-comment for sqlite_schema */
|
|
(g.bSchemaCompare)? "-- " : "";
|
|
|
|
pSql = sqlite3_str_new(0);
|
|
if( g.fDebug==DEBUG_COLUMN_NAMES ){
|
|
/* Simply run columnNames() on all tables of the origin
|
|
** database and show the results. This is used for testing
|
|
** and debugging of the columnNames() function.
|
|
*/
|
|
az = columnNames("aux",zTab, &nPk, 0);
|
|
if( az==0 ){
|
|
Wfprintf(stdout, "Rowid not accessible for %s\n", zId);
|
|
}else{
|
|
Wfprintf(stdout, "%s:", zId);
|
|
for(i=0; az[i]; i++){
|
|
Wfprintf(stdout, " %s", az[i]);
|
|
if( i+1==nPk ) Wfprintf(stdout, " *");
|
|
}
|
|
Wfprintf(stdout, "\n");
|
|
}
|
|
goto end_diff_one_table;
|
|
}
|
|
|
|
if( sqlite3_table_column_metadata(g.db,"aux",zTab,0,0,0,0,0,0) ){
|
|
if( !sqlite3_table_column_metadata(g.db,"main",zTab,0,0,0,0,0,0) ){
|
|
/* Table missing from second database. */
|
|
if( g.bSchemaCompare )
|
|
Wfprintf(out, "-- 2nd DB has no %s table\n", zTab);
|
|
else
|
|
Wfprintf(out, "DROP TABLE %s;\n", zId);
|
|
}
|
|
goto end_diff_one_table;
|
|
}
|
|
|
|
if( sqlite3_table_column_metadata(g.db,"main",zTab,0,0,0,0,0,0) ){
|
|
/* Table missing from source */
|
|
if( g.bSchemaCompare ){
|
|
Wfprintf(out, "-- 1st DB has no %s table\n", zTab);
|
|
}else{
|
|
dump_table(zTab, out);
|
|
}
|
|
goto end_diff_one_table;
|
|
}
|
|
|
|
az = columnNames("main", zTab, &nPk, 0);
|
|
az2 = columnNames("aux", zTab, &nPk2, 0);
|
|
if( az && az2 ){
|
|
for(n=0; az[n] && az2[n]; n++){
|
|
if( sqlite3_stricmp(az[n],az2[n])!=0 ) break;
|
|
}
|
|
}
|
|
if( az==0
|
|
|| az2==0
|
|
|| nPk!=nPk2
|
|
|| az[n]
|
|
){
|
|
/* Schema mismatch */
|
|
Wfprintf(out, "%sDROP TABLE %s; -- due to schema mismatch\n", zLead, zId);
|
|
dump_table(zTab, out);
|
|
goto end_diff_one_table;
|
|
}
|
|
|
|
/* Build the comparison query */
|
|
for(n2=n; az2[n2]; n2++){
|
|
char *zNTab = safeId(az2[n2]);
|
|
Wfprintf(out, "ALTER TABLE %s ADD COLUMN %s;\n", zId, zNTab);
|
|
sqlite3_free(zNTab);
|
|
}
|
|
nQ = nPk2+1+2*(n2-nPk2);
|
|
if( n2>nPk2 ){
|
|
zSep = "SELECT ";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%sB.%s", zSep, az[i]);
|
|
zSep = ", ";
|
|
}
|
|
sqlite3_str_appendf(pSql, ", 1 /* changed row */");
|
|
while( az[i] ){
|
|
sqlite3_str_appendf(pSql, ", A.%s IS NOT B.%s, B.%s",
|
|
az[i], az2[i], az2[i]);
|
|
i++;
|
|
}
|
|
while( az2[i] ){
|
|
sqlite3_str_appendf(pSql, ", B.%s IS NOT NULL, B.%s",
|
|
az2[i], az2[i]);
|
|
i++;
|
|
}
|
|
sqlite3_str_appendf(pSql, "\n FROM main.%s A, aux.%s B\n", zId, zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
zSep = "\n AND (";
|
|
while( az[i] ){
|
|
sqlite3_str_appendf(pSql, "%sA.%s IS NOT B.%s%s\n",
|
|
zSep, az[i], az2[i], az2[i+1]==0 ? ")" : "");
|
|
zSep = " OR ";
|
|
i++;
|
|
}
|
|
while( az2[i] ){
|
|
sqlite3_str_appendf(pSql, "%sB.%s IS NOT NULL%s\n",
|
|
zSep, az2[i], az2[i+1]==0 ? ")" : "");
|
|
zSep = " OR ";
|
|
i++;
|
|
}
|
|
sqlite3_str_appendf(pSql, " UNION ALL\n");
|
|
}
|
|
zSep = "SELECT ";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%sA.%s", zSep, az[i]);
|
|
zSep = ", ";
|
|
}
|
|
sqlite3_str_appendf(pSql, ", 2 /* deleted row */");
|
|
while( az2[i] ){
|
|
sqlite3_str_appendf(pSql, ", NULL, NULL");
|
|
i++;
|
|
}
|
|
sqlite3_str_appendf(pSql, "\n FROM main.%s A\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM aux.%s B\n", zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n");
|
|
zSep = " UNION ALL\nSELECT ";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%sB.%s", zSep, az[i]);
|
|
zSep = ", ";
|
|
}
|
|
sqlite3_str_appendf(pSql, ", 3 /* inserted row */");
|
|
while( az2[i] ){
|
|
sqlite3_str_appendf(pSql, ", 1, B.%s", az2[i]);
|
|
i++;
|
|
}
|
|
sqlite3_str_appendf(pSql, "\n FROM aux.%s B\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM main.%s A\n", zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n ORDER BY");
|
|
zSep = " ";
|
|
for(i=1; i<=nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s%d", zSep, i);
|
|
zSep = ", ";
|
|
}
|
|
sqlite3_str_appendf(pSql, ";\n");
|
|
|
|
if( g.fDebug & DEBUG_DIFF_SQL ){
|
|
printf("SQL for %s:\n%s\n", zId, sqlite3_str_value(pSql));
|
|
goto end_diff_one_table;
|
|
}
|
|
|
|
/* Drop indexes that are missing in the destination */
|
|
pStmt = db_prepare(
|
|
"SELECT name FROM main.sqlite_schema"
|
|
" WHERE type='index' AND tbl_name=%Q"
|
|
" AND sql IS NOT NULL"
|
|
" AND sql NOT IN (SELECT sql FROM aux.sqlite_schema"
|
|
" WHERE type='index' AND tbl_name=%Q"
|
|
" AND sql IS NOT NULL)",
|
|
zTab, zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
char *z = safeId((const char*)sqlite3_column_text(pStmt,0));
|
|
fprintf(out, "DROP INDEX %s;\n", z);
|
|
sqlite3_free(z);
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
|
|
/* Run the query and output differences */
|
|
if( !g.bSchemaOnly ){
|
|
pStmt = db_prepare("%s", sqlite3_str_value(pSql));
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
int iType = sqlite3_column_int(pStmt, nPk);
|
|
if( iType==1 || iType==2 ){
|
|
if( iType==1 ){ /* Change the content of a row */
|
|
fprintf(out, "%sUPDATE %s", zLead, zId);
|
|
zSep = " SET";
|
|
for(i=nPk+1; i<nQ; i+=2){
|
|
if( sqlite3_column_int(pStmt,i)==0 ) continue;
|
|
fprintf(out, "%s %s=", zSep, az2[(i+nPk-1)/2]);
|
|
zSep = ",";
|
|
printQuoted(out, sqlite3_column_value(pStmt,i+1));
|
|
}
|
|
}else{ /* Delete a row */
|
|
fprintf(out, "%sDELETE FROM %s", zLead, zId);
|
|
}
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
fprintf(out, "%s %s=", zSep, az2[i]);
|
|
printQuoted(out, sqlite3_column_value(pStmt,i));
|
|
zSep = " AND";
|
|
}
|
|
fprintf(out, ";\n");
|
|
}else{ /* Insert a row */
|
|
fprintf(out, "%sINSERT INTO %s(%s", zLead, zId, az2[0]);
|
|
for(i=1; az2[i]; i++) fprintf(out, ",%s", az2[i]);
|
|
fprintf(out, ") VALUES");
|
|
zSep = "(";
|
|
for(i=0; i<nPk2; i++){
|
|
fprintf(out, "%s", zSep);
|
|
zSep = ",";
|
|
printQuoted(out, sqlite3_column_value(pStmt,i));
|
|
}
|
|
for(i=nPk2+2; i<nQ; i+=2){
|
|
fprintf(out, ",");
|
|
printQuoted(out, sqlite3_column_value(pStmt,i));
|
|
}
|
|
fprintf(out, ");\n");
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
} /* endif !g.bSchemaOnly */
|
|
|
|
/* Create indexes that are missing in the source */
|
|
pStmt = db_prepare(
|
|
"SELECT sql FROM aux.sqlite_schema"
|
|
" WHERE type='index' AND tbl_name=%Q"
|
|
" AND sql IS NOT NULL"
|
|
" AND sql NOT IN (SELECT sql FROM main.sqlite_schema"
|
|
" WHERE type='index' AND tbl_name=%Q"
|
|
" AND sql IS NOT NULL)",
|
|
zTab, zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
fprintf(out, "%s;\n", sqlite3_column_text(pStmt,0));
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
|
|
end_diff_one_table:
|
|
strFree(pSql);
|
|
sqlite3_free(zId);
|
|
namelistFree(az);
|
|
namelistFree(az2);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
** Check that table zTab exists and has the same schema in both the "main"
|
|
** and "aux" databases currently opened by the global db handle. If they
|
|
** do not, output an error message on stderr and exit(1). Otherwise, if
|
|
** the schemas do match, return control to the caller.
|
|
*/
|
|
static void checkSchemasMatch(const char *zTab){
|
|
sqlite3_stmt *pStmt = db_prepare(
|
|
"SELECT A.sql=B.sql FROM main.sqlite_schema A, aux.sqlite_schema B"
|
|
" WHERE A.name=%Q AND B.name=%Q", zTab, zTab
|
|
);
|
|
if( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
if( sqlite3_column_int(pStmt,0)==0 ){
|
|
runtimeError("schema changes for table %s", safeId(zTab));
|
|
}
|
|
}else{
|
|
runtimeError("table %s missing from one or both databases", safeId(zTab));
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
}
|
|
|
|
/**************************************************************************
|
|
** The following code is copied from fossil. It is used to generate the
|
|
** fossil delta blobs sometimes used in RBU update records.
|
|
*/
|
|
|
|
typedef unsigned short u16;
|
|
typedef unsigned int u32;
|
|
typedef unsigned char u8;
|
|
|
|
/*
|
|
** The width of a hash window in bytes. The algorithm only works if this
|
|
** is a power of 2.
|
|
*/
|
|
#define NHASH 16
|
|
|
|
/*
|
|
** The current state of the rolling hash.
|
|
**
|
|
** z[] holds the values that have been hashed. z[] is a circular buffer.
|
|
** z[i] is the first entry and z[(i+NHASH-1)%NHASH] is the last entry of
|
|
** the window.
|
|
**
|
|
** Hash.a is the sum of all elements of hash.z[]. Hash.b is a weighted
|
|
** sum. Hash.b is z[i]*NHASH + z[i+1]*(NHASH-1) + ... + z[i+NHASH-1]*1.
|
|
** (Each index for z[] should be module NHASH, of course. The %NHASH operator
|
|
** is omitted in the prior expression for brevity.)
|
|
*/
|
|
typedef struct hash hash;
|
|
struct hash {
|
|
u16 a, b; /* Hash values */
|
|
u16 i; /* Start of the hash window */
|
|
char z[NHASH]; /* The values that have been hashed */
|
|
};
|
|
|
|
/*
|
|
** Initialize the rolling hash using the first NHASH characters of z[]
|
|
*/
|
|
static void hash_init(hash *pHash, const char *z){
|
|
u16 a, b, i;
|
|
a = b = 0;
|
|
for(i=0; i<NHASH; i++){
|
|
a += z[i];
|
|
b += (NHASH-i)*z[i];
|
|
pHash->z[i] = z[i];
|
|
}
|
|
pHash->a = a & 0xffff;
|
|
pHash->b = b & 0xffff;
|
|
pHash->i = 0;
|
|
}
|
|
|
|
/*
|
|
** Advance the rolling hash by a single character "c"
|
|
*/
|
|
static void hash_next(hash *pHash, int c){
|
|
u16 old = pHash->z[pHash->i];
|
|
pHash->z[pHash->i] = (char)c;
|
|
pHash->i = (pHash->i+1)&(NHASH-1);
|
|
pHash->a = pHash->a - old + (char)c;
|
|
pHash->b = pHash->b - NHASH*old + pHash->a;
|
|
}
|
|
|
|
/*
|
|
** Return a 32-bit hash value
|
|
*/
|
|
static u32 hash_32bit(hash *pHash){
|
|
return (pHash->a & 0xffff) | (((u32)(pHash->b & 0xffff))<<16);
|
|
}
|
|
|
|
/*
|
|
** Write an base-64 integer into the given buffer.
|
|
*/
|
|
static void putInt(unsigned int v, char **pz){
|
|
static const char zDigits[] =
|
|
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~";
|
|
/* 123456789 123456789 123456789 123456789 123456789 123456789 123 */
|
|
int i, j;
|
|
char zBuf[20];
|
|
if( v==0 ){
|
|
*(*pz)++ = '0';
|
|
return;
|
|
}
|
|
for(i=0; v>0; i++, v>>=6){
|
|
zBuf[i] = zDigits[v&0x3f];
|
|
}
|
|
for(j=i-1; j>=0; j--){
|
|
*(*pz)++ = zBuf[j];
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Return the number digits in the base-64 representation of a positive integer
|
|
*/
|
|
static int digit_count(int v){
|
|
unsigned int i, x;
|
|
for(i=1, x=64; (unsigned int)v>=x; i++, x <<= 6){}
|
|
return i;
|
|
}
|
|
|
|
/*
|
|
** Compute a 32-bit checksum on the N-byte buffer. Return the result.
|
|
*/
|
|
static unsigned int checksum(const char *zIn, size_t N){
|
|
const unsigned char *z = (const unsigned char *)zIn;
|
|
unsigned sum0 = 0;
|
|
unsigned sum1 = 0;
|
|
unsigned sum2 = 0;
|
|
unsigned sum3 = 0;
|
|
while(N >= 16){
|
|
sum0 += ((unsigned)z[0] + z[4] + z[8] + z[12]);
|
|
sum1 += ((unsigned)z[1] + z[5] + z[9] + z[13]);
|
|
sum2 += ((unsigned)z[2] + z[6] + z[10]+ z[14]);
|
|
sum3 += ((unsigned)z[3] + z[7] + z[11]+ z[15]);
|
|
z += 16;
|
|
N -= 16;
|
|
}
|
|
while(N >= 4){
|
|
sum0 += z[0];
|
|
sum1 += z[1];
|
|
sum2 += z[2];
|
|
sum3 += z[3];
|
|
z += 4;
|
|
N -= 4;
|
|
}
|
|
sum3 += (sum2 << 8) + (sum1 << 16) + (sum0 << 24);
|
|
switch(N){
|
|
case 3: sum3 += (z[2] << 8);
|
|
case 2: sum3 += (z[1] << 16);
|
|
case 1: sum3 += (z[0] << 24);
|
|
default: ;
|
|
}
|
|
return sum3;
|
|
}
|
|
|
|
/*
|
|
** Create a new delta.
|
|
**
|
|
** The delta is written into a preallocated buffer, zDelta, which
|
|
** should be at least 60 bytes longer than the target file, zOut.
|
|
** The delta string will be NUL-terminated, but it might also contain
|
|
** embedded NUL characters if either the zSrc or zOut files are
|
|
** binary. This function returns the length of the delta string
|
|
** in bytes, excluding the final NUL terminator character.
|
|
**
|
|
** Output Format:
|
|
**
|
|
** The delta begins with a base64 number followed by a newline. This
|
|
** number is the number of bytes in the TARGET file. Thus, given a
|
|
** delta file z, a program can compute the size of the output file
|
|
** simply by reading the first line and decoding the base-64 number
|
|
** found there. The delta_output_size() routine does exactly this.
|
|
**
|
|
** After the initial size number, the delta consists of a series of
|
|
** literal text segments and commands to copy from the SOURCE file.
|
|
** A copy command looks like this:
|
|
**
|
|
** NNN@MMM,
|
|
**
|
|
** where NNN is the number of bytes to be copied and MMM is the offset
|
|
** into the source file of the first byte (both base-64). If NNN is 0
|
|
** it means copy the rest of the input file. Literal text is like this:
|
|
**
|
|
** NNN:TTTTT
|
|
**
|
|
** where NNN is the number of bytes of text (base-64) and TTTTT is the text.
|
|
**
|
|
** The last term is of the form
|
|
**
|
|
** NNN;
|
|
**
|
|
** In this case, NNN is a 32-bit bigendian checksum of the output file
|
|
** that can be used to verify that the delta applied correctly. All
|
|
** numbers are in base-64.
|
|
**
|
|
** Pure text files generate a pure text delta. Binary files generate a
|
|
** delta that may contain some binary data.
|
|
**
|
|
** Algorithm:
|
|
**
|
|
** The encoder first builds a hash table to help it find matching
|
|
** patterns in the source file. 16-byte chunks of the source file
|
|
** sampled at evenly spaced intervals are used to populate the hash
|
|
** table.
|
|
**
|
|
** Next we begin scanning the target file using a sliding 16-byte
|
|
** window. The hash of the 16-byte window in the target is used to
|
|
** search for a matching section in the source file. When a match
|
|
** is found, a copy command is added to the delta. An effort is
|
|
** made to extend the matching section to regions that come before
|
|
** and after the 16-byte hash window. A copy command is only issued
|
|
** if the result would use less space that just quoting the text
|
|
** literally. Literal text is added to the delta for sections that
|
|
** do not match or which can not be encoded efficiently using copy
|
|
** commands.
|
|
*/
|
|
static int rbuDeltaCreate(
|
|
const char *zSrc, /* The source or pattern file */
|
|
unsigned int lenSrc, /* Length of the source file */
|
|
const char *zOut, /* The target file */
|
|
unsigned int lenOut, /* Length of the target file */
|
|
char *zDelta /* Write the delta into this buffer */
|
|
){
|
|
unsigned int i, base;
|
|
char *zOrigDelta = zDelta;
|
|
hash h;
|
|
int nHash; /* Number of hash table entries */
|
|
int *landmark; /* Primary hash table */
|
|
int *collide; /* Collision chain */
|
|
int lastRead = -1; /* Last byte of zSrc read by a COPY command */
|
|
|
|
/* Add the target file size to the beginning of the delta
|
|
*/
|
|
putInt(lenOut, &zDelta);
|
|
*(zDelta++) = '\n';
|
|
|
|
/* If the source file is very small, it means that we have no
|
|
** chance of ever doing a copy command. Just output a single
|
|
** literal segment for the entire target and exit.
|
|
*/
|
|
if( lenSrc<=NHASH ){
|
|
putInt(lenOut, &zDelta);
|
|
*(zDelta++) = ':';
|
|
memcpy(zDelta, zOut, lenOut);
|
|
zDelta += lenOut;
|
|
putInt(checksum(zOut, lenOut), &zDelta);
|
|
*(zDelta++) = ';';
|
|
return (int)(zDelta - zOrigDelta);
|
|
}
|
|
|
|
/* Compute the hash table used to locate matching sections in the
|
|
** source file.
|
|
*/
|
|
nHash = lenSrc/NHASH;
|
|
collide = sqlite3_malloc( nHash*2*sizeof(int) );
|
|
landmark = &collide[nHash];
|
|
memset(landmark, -1, nHash*sizeof(int));
|
|
memset(collide, -1, nHash*sizeof(int));
|
|
for(i=0; i<lenSrc-NHASH; i+=NHASH){
|
|
int hv;
|
|
hash_init(&h, &zSrc[i]);
|
|
hv = hash_32bit(&h) % nHash;
|
|
collide[i/NHASH] = landmark[hv];
|
|
landmark[hv] = i/NHASH;
|
|
}
|
|
|
|
/* Begin scanning the target file and generating copy commands and
|
|
** literal sections of the delta.
|
|
*/
|
|
base = 0; /* We have already generated everything before zOut[base] */
|
|
while( base+NHASH<lenOut ){
|
|
int iSrc, iBlock;
|
|
int bestCnt, bestOfst=0, bestLitsz=0;
|
|
hash_init(&h, &zOut[base]);
|
|
i = 0; /* Trying to match a landmark against zOut[base+i] */
|
|
bestCnt = 0;
|
|
while( 1 ){
|
|
int hv;
|
|
int limit = 250;
|
|
|
|
hv = hash_32bit(&h) % nHash;
|
|
iBlock = landmark[hv];
|
|
while( iBlock>=0 && (limit--)>0 ){
|
|
/*
|
|
** The hash window has identified a potential match against
|
|
** landmark block iBlock. But we need to investigate further.
|
|
**
|
|
** Look for a region in zOut that matches zSrc. Anchor the search
|
|
** at zSrc[iSrc] and zOut[base+i]. Do not include anything prior to
|
|
** zOut[base] or after zOut[outLen] nor anything after zSrc[srcLen].
|
|
**
|
|
** Set cnt equal to the length of the match and set ofst so that
|
|
** zSrc[ofst] is the first element of the match. litsz is the number
|
|
** of characters between zOut[base] and the beginning of the match.
|
|
** sz will be the overhead (in bytes) needed to encode the copy
|
|
** command. Only generate copy command if the overhead of the
|
|
** copy command is less than the amount of literal text to be copied.
|
|
*/
|
|
int cnt, ofst, litsz;
|
|
int j, k, x, y;
|
|
int sz;
|
|
|
|
/* Beginning at iSrc, match forwards as far as we can. j counts
|
|
** the number of characters that match */
|
|
iSrc = iBlock*NHASH;
|
|
for(
|
|
j=0, x=iSrc, y=base+i;
|
|
(unsigned int)x<lenSrc && (unsigned int)y<lenOut;
|
|
j++, x++, y++
|
|
){
|
|
if( zSrc[x]!=zOut[y] ) break;
|
|
}
|
|
j--;
|
|
|
|
/* Beginning at iSrc-1, match backwards as far as we can. k counts
|
|
** the number of characters that match */
|
|
for(k=1; k<iSrc && (unsigned int)k<=i; k++){
|
|
if( zSrc[iSrc-k]!=zOut[base+i-k] ) break;
|
|
}
|
|
k--;
|
|
|
|
/* Compute the offset and size of the matching region */
|
|
ofst = iSrc-k;
|
|
cnt = j+k+1;
|
|
litsz = i-k; /* Number of bytes of literal text before the copy */
|
|
/* sz will hold the number of bytes needed to encode the "insert"
|
|
** command and the copy command, not counting the "insert" text */
|
|
sz = digit_count(i-k)+digit_count(cnt)+digit_count(ofst)+3;
|
|
if( cnt>=sz && cnt>bestCnt ){
|
|
/* Remember this match only if it is the best so far and it
|
|
** does not increase the file size */
|
|
bestCnt = cnt;
|
|
bestOfst = iSrc-k;
|
|
bestLitsz = litsz;
|
|
}
|
|
|
|
/* Check the next matching block */
|
|
iBlock = collide[iBlock];
|
|
}
|
|
|
|
/* We have a copy command that does not cause the delta to be larger
|
|
** than a literal insert. So add the copy command to the delta.
|
|
*/
|
|
if( bestCnt>0 ){
|
|
if( bestLitsz>0 ){
|
|
/* Add an insert command before the copy */
|
|
putInt(bestLitsz,&zDelta);
|
|
*(zDelta++) = ':';
|
|
memcpy(zDelta, &zOut[base], bestLitsz);
|
|
zDelta += bestLitsz;
|
|
base += bestLitsz;
|
|
}
|
|
base += bestCnt;
|
|
putInt(bestCnt, &zDelta);
|
|
*(zDelta++) = '@';
|
|
putInt(bestOfst, &zDelta);
|
|
*(zDelta++) = ',';
|
|
if( bestOfst + bestCnt -1 > lastRead ){
|
|
lastRead = bestOfst + bestCnt - 1;
|
|
}
|
|
bestCnt = 0;
|
|
break;
|
|
}
|
|
|
|
/* If we reach this point, it means no match is found so far */
|
|
if( base+i+NHASH>=lenOut ){
|
|
/* We have reached the end of the file and have not found any
|
|
** matches. Do an "insert" for everything that does not match */
|
|
putInt(lenOut-base, &zDelta);
|
|
*(zDelta++) = ':';
|
|
memcpy(zDelta, &zOut[base], lenOut-base);
|
|
zDelta += lenOut-base;
|
|
base = lenOut;
|
|
break;
|
|
}
|
|
|
|
/* Advance the hash by one character. Keep looking for a match */
|
|
hash_next(&h, zOut[base+i+NHASH]);
|
|
i++;
|
|
}
|
|
}
|
|
/* Output a final "insert" record to get all the text at the end of
|
|
** the file that does not match anything in the source file.
|
|
*/
|
|
if( base<lenOut ){
|
|
putInt(lenOut-base, &zDelta);
|
|
*(zDelta++) = ':';
|
|
memcpy(zDelta, &zOut[base], lenOut-base);
|
|
zDelta += lenOut-base;
|
|
}
|
|
/* Output the final checksum record. */
|
|
putInt(checksum(zOut, lenOut), &zDelta);
|
|
*(zDelta++) = ';';
|
|
sqlite3_free(collide);
|
|
return (int)(zDelta - zOrigDelta);
|
|
}
|
|
|
|
/*
|
|
** End of code copied from fossil.
|
|
**************************************************************************/
|
|
|
|
static void strPrintfArray(
|
|
sqlite3_str *pStr, /* String object to append to */
|
|
const char *zSep, /* Separator string */
|
|
const char *zFmt, /* Format for each entry */
|
|
char **az, int n /* Array of strings & its size (or -1) */
|
|
){
|
|
int i;
|
|
for(i=0; az[i] && (i<n || n<0); i++){
|
|
if( i!=0 ) sqlite3_str_appendf(pStr, "%s", zSep);
|
|
sqlite3_str_appendf(pStr, zFmt, az[i], az[i], az[i]);
|
|
}
|
|
}
|
|
|
|
static void getRbudiffQuery(
|
|
const char *zTab,
|
|
char **azCol,
|
|
int nPK,
|
|
int bOtaRowid,
|
|
sqlite3_str *pSql
|
|
){
|
|
int i;
|
|
|
|
/* First the newly inserted rows: **/
|
|
sqlite3_str_appendf(pSql, "SELECT ");
|
|
strPrintfArray(pSql, ", ", "%s", azCol, -1);
|
|
sqlite3_str_appendf(pSql, ", 0, "); /* Set ota_control to 0 for an insert */
|
|
strPrintfArray(pSql, ", ", "NULL", azCol, -1);
|
|
sqlite3_str_appendf(pSql, " FROM aux.%Q AS n WHERE NOT EXISTS (\n", zTab);
|
|
sqlite3_str_appendf(pSql, " SELECT 1 FROM ", zTab);
|
|
sqlite3_str_appendf(pSql, " main.%Q AS o WHERE ", zTab);
|
|
strPrintfArray(pSql, " AND ", "(n.%Q = o.%Q)", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, "\n) AND ");
|
|
strPrintfArray(pSql, " AND ", "(n.%Q IS NOT NULL)", azCol, nPK);
|
|
|
|
/* Deleted rows: */
|
|
sqlite3_str_appendf(pSql, "\nUNION ALL\nSELECT ");
|
|
strPrintfArray(pSql, ", ", "%s", azCol, nPK);
|
|
if( azCol[nPK] ){
|
|
sqlite3_str_appendf(pSql, ", ");
|
|
strPrintfArray(pSql, ", ", "NULL", &azCol[nPK], -1);
|
|
}
|
|
sqlite3_str_appendf(pSql, ", 1, "); /* Set ota_control to 1 for a delete */
|
|
strPrintfArray(pSql, ", ", "NULL", azCol, -1);
|
|
sqlite3_str_appendf(pSql, " FROM main.%Q AS n WHERE NOT EXISTS (\n", zTab);
|
|
sqlite3_str_appendf(pSql, " SELECT 1 FROM ", zTab);
|
|
sqlite3_str_appendf(pSql, " aux.%Q AS o WHERE ", zTab);
|
|
strPrintfArray(pSql, " AND ", "(n.%Q = o.%Q)", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, "\n) AND ");
|
|
strPrintfArray(pSql, " AND ", "(n.%Q IS NOT NULL)", azCol, nPK);
|
|
|
|
/* Updated rows. If all table columns are part of the primary key, there
|
|
** can be no updates. In this case this part of the compound SELECT can
|
|
** be omitted altogether. */
|
|
if( azCol[nPK] ){
|
|
sqlite3_str_appendf(pSql, "\nUNION ALL\nSELECT ");
|
|
strPrintfArray(pSql, ", ", "n.%s", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, ",\n");
|
|
strPrintfArray(pSql, " ,\n",
|
|
" CASE WHEN n.%s IS o.%s THEN NULL ELSE n.%s END", &azCol[nPK], -1
|
|
);
|
|
|
|
if( bOtaRowid==0 ){
|
|
sqlite3_str_appendf(pSql, ", '");
|
|
strPrintfArray(pSql, "", ".", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, "' ||\n");
|
|
}else{
|
|
sqlite3_str_appendf(pSql, ",\n");
|
|
}
|
|
strPrintfArray(pSql, " ||\n",
|
|
" CASE WHEN n.%s IS o.%s THEN '.' ELSE 'x' END", &azCol[nPK], -1
|
|
);
|
|
sqlite3_str_appendf(pSql, "\nAS ota_control, ");
|
|
strPrintfArray(pSql, ", ", "NULL", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, ",\n");
|
|
strPrintfArray(pSql, " ,\n",
|
|
" CASE WHEN n.%s IS o.%s THEN NULL ELSE o.%s END", &azCol[nPK], -1
|
|
);
|
|
|
|
sqlite3_str_appendf(pSql, "\nFROM main.%Q AS o, aux.%Q AS n\nWHERE ",
|
|
zTab, zTab);
|
|
strPrintfArray(pSql, " AND ", "(n.%Q = o.%Q)", azCol, nPK);
|
|
sqlite3_str_appendf(pSql, " AND ota_control LIKE '%%x%%'");
|
|
}
|
|
|
|
/* Now add an ORDER BY clause to sort everything by PK. */
|
|
sqlite3_str_appendf(pSql, "\nORDER BY ");
|
|
for(i=1; i<=nPK; i++) sqlite3_str_appendf(pSql, "%s%d", ((i>1)?", ":""), i);
|
|
}
|
|
|
|
static void rbudiff_one_table(const char *zTab, FILE *out){
|
|
int bOtaRowid; /* True to use an ota_rowid column */
|
|
int nPK; /* Number of primary key columns in table */
|
|
char **azCol; /* NULL terminated array of col names */
|
|
int i;
|
|
int nCol;
|
|
sqlite3_str *pCt; /* The "CREATE TABLE data_xxx" statement */
|
|
sqlite3_str *pSql; /* Query to find differences */
|
|
sqlite3_str *pInsert; /* First part of output INSERT statement */
|
|
sqlite3_stmt *pStmt = 0;
|
|
int nRow = 0; /* Total rows in data_xxx table */
|
|
|
|
/* --rbu mode must use real primary keys. */
|
|
g.bSchemaPK = 1;
|
|
pCt = sqlite3_str_new(0);
|
|
pSql = sqlite3_str_new(0);
|
|
pInsert = sqlite3_str_new(0);
|
|
|
|
/* Check that the schemas of the two tables match. Exit early otherwise. */
|
|
checkSchemasMatch(zTab);
|
|
|
|
/* Grab the column names and PK details for the table(s). If no usable PK
|
|
** columns are found, bail out early. */
|
|
azCol = columnNames("main", zTab, &nPK, &bOtaRowid);
|
|
if( azCol==0 ){
|
|
runtimeError("table %s has no usable PK columns", zTab);
|
|
}
|
|
for(nCol=0; azCol[nCol]; nCol++);
|
|
|
|
/* Build and output the CREATE TABLE statement for the data_xxx table */
|
|
sqlite3_str_appendf(pCt, "CREATE TABLE IF NOT EXISTS 'data_%q'(", zTab);
|
|
if( bOtaRowid ) sqlite3_str_appendf(pCt, "rbu_rowid, ");
|
|
strPrintfArray(pCt, ", ", "%s", &azCol[bOtaRowid], -1);
|
|
sqlite3_str_appendf(pCt, ", rbu_control);");
|
|
|
|
/* Get the SQL for the query to retrieve data from the two databases */
|
|
getRbudiffQuery(zTab, azCol, nPK, bOtaRowid, pSql);
|
|
|
|
/* Build the first part of the INSERT statement output for each row
|
|
** in the data_xxx table. */
|
|
sqlite3_str_appendf(pInsert, "INSERT INTO 'data_%q' (", zTab);
|
|
if( bOtaRowid ) sqlite3_str_appendf(pInsert, "rbu_rowid, ");
|
|
strPrintfArray(pInsert, ", ", "%s", &azCol[bOtaRowid], -1);
|
|
sqlite3_str_appendf(pInsert, ", rbu_control) VALUES(");
|
|
|
|
pStmt = db_prepare("%s", sqlite3_str_value(pSql));
|
|
|
|
while( sqlite3_step(pStmt)==SQLITE_ROW ){
|
|
|
|
/* If this is the first row output, print out the CREATE TABLE
|
|
** statement first. And reset pCt so that it will not be
|
|
** printed again. */
|
|
if( sqlite3_str_length(pCt) ){
|
|
fprintf(out, "%s\n", sqlite3_str_value(pCt));
|
|
sqlite3_str_reset(pCt);
|
|
}
|
|
|
|
/* Output the first part of the INSERT statement */
|
|
fprintf(out, "%s", sqlite3_str_value(pInsert));
|
|
nRow++;
|
|
|
|
if( sqlite3_column_type(pStmt, nCol)==SQLITE_INTEGER ){
|
|
for(i=0; i<=nCol; i++){
|
|
if( i>0 ) fprintf(out, ", ");
|
|
printQuoted(out, sqlite3_column_value(pStmt, i));
|
|
}
|
|
}else{
|
|
char *zOtaControl;
|
|
int nOtaControl = sqlite3_column_bytes(pStmt, nCol);
|
|
|
|
zOtaControl = (char*)sqlite3_malloc(nOtaControl+1);
|
|
memcpy(zOtaControl, sqlite3_column_text(pStmt, nCol), nOtaControl+1);
|
|
|
|
for(i=0; i<nCol; i++){
|
|
int bDone = 0;
|
|
if( i>=nPK
|
|
&& sqlite3_column_type(pStmt, i)==SQLITE_BLOB
|
|
&& sqlite3_column_type(pStmt, nCol+1+i)==SQLITE_BLOB
|
|
){
|
|
const char *aSrc = sqlite3_column_blob(pStmt, nCol+1+i);
|
|
int nSrc = sqlite3_column_bytes(pStmt, nCol+1+i);
|
|
const char *aFinal = sqlite3_column_blob(pStmt, i);
|
|
int nFinal = sqlite3_column_bytes(pStmt, i);
|
|
char *aDelta;
|
|
int nDelta;
|
|
|
|
aDelta = sqlite3_malloc(nFinal + 60);
|
|
nDelta = rbuDeltaCreate(aSrc, nSrc, aFinal, nFinal, aDelta);
|
|
if( nDelta<nFinal ){
|
|
int j;
|
|
fprintf(out, "x'");
|
|
for(j=0; j<nDelta; j++) fprintf(out, "%02x", (u8)aDelta[j]);
|
|
fprintf(out, "'");
|
|
zOtaControl[i-bOtaRowid] = 'f';
|
|
bDone = 1;
|
|
}
|
|
sqlite3_free(aDelta);
|
|
}
|
|
|
|
if( bDone==0 ){
|
|
printQuoted(out, sqlite3_column_value(pStmt, i));
|
|
}
|
|
fprintf(out, ", ");
|
|
}
|
|
fprintf(out, "'%s'", zOtaControl);
|
|
sqlite3_free(zOtaControl);
|
|
}
|
|
|
|
/* And the closing bracket of the insert statement */
|
|
fprintf(out, ");\n");
|
|
}
|
|
|
|
sqlite3_finalize(pStmt);
|
|
if( nRow>0 ){
|
|
sqlite3_str *pCnt = sqlite3_str_new(0);
|
|
sqlite3_str_appendf(pCnt,
|
|
"INSERT INTO rbu_count VALUES('data_%q', %d);", zTab, nRow);
|
|
fprintf(out, "%s\n", sqlite3_str_value(pCnt));
|
|
strFree(pCnt);
|
|
}
|
|
|
|
strFree(pCt);
|
|
strFree(pSql);
|
|
strFree(pInsert);
|
|
}
|
|
|
|
/*
|
|
** Display a summary of differences between two versions of the same
|
|
** table table.
|
|
**
|
|
** * Number of rows changed
|
|
** * Number of rows added
|
|
** * Number of rows deleted
|
|
** * Number of identical rows
|
|
*/
|
|
static void summarize_one_table(const char *zTab, FILE *out){
|
|
char *zId = safeId(zTab); /* Name of table (translated for us in SQL) */
|
|
char **az = 0; /* Columns in main */
|
|
char **az2 = 0; /* Columns in aux */
|
|
int nPk; /* Primary key columns in main */
|
|
int nPk2; /* Primary key columns in aux */
|
|
int n = 0; /* Number of columns in main */
|
|
int n2; /* Number of columns in aux */
|
|
int i; /* Loop counter */
|
|
const char *zSep; /* Separator string */
|
|
sqlite3_str *pSql; /* Comparison query */
|
|
sqlite3_stmt *pStmt; /* Query statement to do the diff */
|
|
sqlite3_int64 nUpdate; /* Number of updated rows */
|
|
sqlite3_int64 nUnchanged; /* Number of unmodified rows */
|
|
sqlite3_int64 nDelete; /* Number of deleted rows */
|
|
sqlite3_int64 nInsert; /* Number of inserted rows */
|
|
|
|
pSql = sqlite3_str_new(0);
|
|
if( sqlite3_table_column_metadata(g.db,"aux",zTab,0,0,0,0,0,0) ){
|
|
if( !sqlite3_table_column_metadata(g.db,"main",zTab,0,0,0,0,0,0) ){
|
|
/* Table missing from second database. */
|
|
Wfprintf(out, "%s: missing from second database\n", zTab);
|
|
}
|
|
goto end_summarize_one_table;
|
|
}
|
|
|
|
if( sqlite3_table_column_metadata(g.db,"main",zTab,0,0,0,0,0,0) ){
|
|
/* Table missing from source */
|
|
Wfprintf(out, "%s: missing from first database\n", zTab);
|
|
goto end_summarize_one_table;
|
|
}
|
|
|
|
az = columnNames("main", zTab, &nPk, 0);
|
|
az2 = columnNames("aux", zTab, &nPk2, 0);
|
|
if( az && az2 ){
|
|
for(n=0; az[n]; n++){
|
|
if( sqlite3_stricmp(az[n],az2[n])!=0 ) break;
|
|
}
|
|
}
|
|
if( az==0
|
|
|| az2==0
|
|
|| nPk!=nPk2
|
|
|| az[n]
|
|
){
|
|
/* Schema mismatch */
|
|
Wfprintf(out, "%s: incompatible schema\n", zTab);
|
|
goto end_summarize_one_table;
|
|
}
|
|
|
|
/* Build the comparison query */
|
|
for(n2=n; az[n2]; n2++){}
|
|
sqlite3_str_appendf(pSql, "SELECT 1, count(*)");
|
|
if( n2==nPk2 ){
|
|
sqlite3_str_appendf(pSql, ", 0\n");
|
|
}else{
|
|
zSep = ", sum(";
|
|
for(i=nPk; az[i]; i++){
|
|
sqlite3_str_appendf(pSql, "%sA.%s IS NOT B.%s", zSep, az[i], az[i]);
|
|
zSep = " OR ";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n");
|
|
}
|
|
sqlite3_str_appendf(pSql, " FROM main.%s A, aux.%s B\n", zId, zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, " UNION ALL\n");
|
|
sqlite3_str_appendf(pSql, "SELECT 2, count(*), 0\n");
|
|
sqlite3_str_appendf(pSql, " FROM main.%s A\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM aux.%s B ", zId);
|
|
zSep = "WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n");
|
|
sqlite3_str_appendf(pSql, " UNION ALL\n");
|
|
sqlite3_str_appendf(pSql, "SELECT 3, count(*), 0\n");
|
|
sqlite3_str_appendf(pSql, " FROM aux.%s B\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM main.%s A ", zId);
|
|
zSep = "WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s", zSep, az[i], az[i]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n ORDER BY 1;\n");
|
|
|
|
if( (g.fDebug & DEBUG_DIFF_SQL)!=0 ){
|
|
Wfprintf(stdout, "SQL for %s:\n%s\n", zId, sqlite3_str_value(pSql));
|
|
goto end_summarize_one_table;
|
|
}
|
|
|
|
/* Run the query and output difference summary */
|
|
pStmt = db_prepare("%s", sqlite3_str_value(pSql));
|
|
nUpdate = 0;
|
|
nInsert = 0;
|
|
nDelete = 0;
|
|
nUnchanged = 0;
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
switch( sqlite3_column_int(pStmt,0) ){
|
|
case 1:
|
|
nUpdate = sqlite3_column_int64(pStmt,2);
|
|
nUnchanged = sqlite3_column_int64(pStmt,1) - nUpdate;
|
|
break;
|
|
case 2:
|
|
nDelete = sqlite3_column_int64(pStmt,1);
|
|
break;
|
|
case 3:
|
|
nInsert = sqlite3_column_int64(pStmt,1);
|
|
break;
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
Wfprintf(out,
|
|
"%s: %lld changes, %lld inserts, %lld deletes, %lld unchanged\n",
|
|
zTab, nUpdate, nInsert, nDelete, nUnchanged);
|
|
|
|
end_summarize_one_table:
|
|
strFree(pSql);
|
|
sqlite3_free(zId);
|
|
namelistFree(az);
|
|
namelistFree(az2);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
** Write a 64-bit signed integer as a varint onto out
|
|
*/
|
|
static void putsVarint(FILE *out, sqlite3_uint64 v){
|
|
int i, n;
|
|
unsigned char p[12];
|
|
if( v & (((sqlite3_uint64)0xff000000)<<32) ){
|
|
p[8] = (unsigned char)v;
|
|
v >>= 8;
|
|
for(i=7; i>=0; i--){
|
|
p[i] = (unsigned char)((v & 0x7f) | 0x80);
|
|
v >>= 7;
|
|
}
|
|
fwrite(p, 8, 1, out);
|
|
}else{
|
|
n = 9;
|
|
do{
|
|
p[n--] = (unsigned char)((v & 0x7f) | 0x80);
|
|
v >>= 7;
|
|
}while( v!=0 );
|
|
p[9] &= 0x7f;
|
|
fwrite(p+n+1, 9-n, 1, out);
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Write an SQLite value onto out.
|
|
*/
|
|
static void putValue(FILE *out, sqlite3_stmt *pStmt, int k){
|
|
int iDType = sqlite3_column_type(pStmt, k);
|
|
sqlite3_int64 iX;
|
|
double rX;
|
|
sqlite3_uint64 uX;
|
|
int j;
|
|
|
|
putc(iDType, out);
|
|
switch( iDType ){
|
|
case SQLITE_INTEGER:
|
|
iX = sqlite3_column_int64(pStmt, k);
|
|
memcpy(&uX, &iX, 8);
|
|
for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
|
|
break;
|
|
case SQLITE_FLOAT:
|
|
rX = sqlite3_column_double(pStmt, k);
|
|
memcpy(&uX, &rX, 8);
|
|
for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
|
|
break;
|
|
case SQLITE_TEXT:
|
|
iX = sqlite3_column_bytes(pStmt, k);
|
|
putsVarint(out, (sqlite3_uint64)iX);
|
|
fwrite(sqlite3_column_text(pStmt, k),1,(size_t)iX,out);
|
|
break;
|
|
case SQLITE_BLOB:
|
|
iX = sqlite3_column_bytes(pStmt, k);
|
|
putsVarint(out, (sqlite3_uint64)iX);
|
|
fwrite(sqlite3_column_blob(pStmt, k),1,(size_t)iX,out);
|
|
break;
|
|
case SQLITE_NULL:
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Generate a CHANGESET for all differences from main.zTab to aux.zTab.
|
|
*/
|
|
static void changeset_one_table(const char *zTab, FILE *out){
|
|
sqlite3_stmt *pStmt; /* SQL statment */
|
|
char *zId = safeId(zTab); /* Escaped name of the table */
|
|
char **azCol = 0; /* List of escaped column names */
|
|
int nCol = 0; /* Number of columns */
|
|
int *aiFlg = 0; /* 0 if column is not part of PK */
|
|
int *aiPk = 0; /* Column numbers for each PK column */
|
|
int nPk = 0; /* Number of PRIMARY KEY columns */
|
|
sqlite3_str *pSql; /* SQL for the diff query */
|
|
int i, k; /* Loop counters */
|
|
const char *zSep; /* List separator */
|
|
|
|
/* Check that the schemas of the two tables match. Exit early otherwise. */
|
|
checkSchemasMatch(zTab);
|
|
pSql = sqlite3_str_new(0);
|
|
|
|
pStmt = db_prepare("PRAGMA main.table_info=%Q", zTab);
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
nCol++;
|
|
azCol = sqlite3_realloc(azCol, sizeof(char*)*nCol);
|
|
if( azCol==0 ) runtimeError("out of memory");
|
|
aiFlg = sqlite3_realloc(aiFlg, sizeof(int)*nCol);
|
|
if( aiFlg==0 ) runtimeError("out of memory");
|
|
azCol[nCol-1] = safeId((const char*)sqlite3_column_text(pStmt,1));
|
|
aiFlg[nCol-1] = i = sqlite3_column_int(pStmt,5);
|
|
if( i>0 ){
|
|
if( i>nPk ){
|
|
nPk = i;
|
|
aiPk = sqlite3_realloc(aiPk, sizeof(int)*nPk);
|
|
if( aiPk==0 ) runtimeError("out of memory");
|
|
}
|
|
aiPk[i-1] = nCol-1;
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
if( nPk==0 ) goto end_changeset_one_table;
|
|
if( nCol>nPk ){
|
|
sqlite3_str_appendf(pSql, "SELECT %d", SQLITE_UPDATE);
|
|
for(i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
sqlite3_str_appendf(pSql, ",\n A.%s", azCol[i]);
|
|
}else{
|
|
sqlite3_str_appendf(pSql, ",\n A.%s IS NOT B.%s, A.%s, B.%s",
|
|
azCol[i], azCol[i], azCol[i], azCol[i]);
|
|
}
|
|
}
|
|
sqlite3_str_appendf(pSql,"\n FROM main.%s A, aux.%s B\n", zId, zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s",
|
|
zSep, azCol[aiPk[i]], azCol[aiPk[i]]);
|
|
zSep = " AND";
|
|
}
|
|
zSep = "\n AND (";
|
|
for(i=0; i<nCol; i++){
|
|
if( aiFlg[i] ) continue;
|
|
sqlite3_str_appendf(pSql, "%sA.%s IS NOT B.%s", zSep, azCol[i], azCol[i]);
|
|
zSep = " OR\n ";
|
|
}
|
|
sqlite3_str_appendf(pSql,")\n UNION ALL\n");
|
|
}
|
|
sqlite3_str_appendf(pSql, "SELECT %d", SQLITE_DELETE);
|
|
for(i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
sqlite3_str_appendf(pSql, ",\n A.%s", azCol[i]);
|
|
}else{
|
|
sqlite3_str_appendf(pSql, ",\n 1, A.%s, NULL", azCol[i]);
|
|
}
|
|
}
|
|
sqlite3_str_appendf(pSql, "\n FROM main.%s A\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM aux.%s B\n", zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s",
|
|
zSep, azCol[aiPk[i]], azCol[aiPk[i]]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n UNION ALL\n");
|
|
sqlite3_str_appendf(pSql, "SELECT %d", SQLITE_INSERT);
|
|
for(i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
sqlite3_str_appendf(pSql, ",\n B.%s", azCol[i]);
|
|
}else{
|
|
sqlite3_str_appendf(pSql, ",\n 1, NULL, B.%s", azCol[i]);
|
|
}
|
|
}
|
|
sqlite3_str_appendf(pSql, "\n FROM aux.%s B\n", zId);
|
|
sqlite3_str_appendf(pSql, " WHERE NOT EXISTS(SELECT 1 FROM main.%s A\n", zId);
|
|
zSep = " WHERE";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s A.%s=B.%s",
|
|
zSep, azCol[aiPk[i]], azCol[aiPk[i]]);
|
|
zSep = " AND";
|
|
}
|
|
sqlite3_str_appendf(pSql, ")\n");
|
|
sqlite3_str_appendf(pSql, " ORDER BY");
|
|
zSep = " ";
|
|
for(i=0; i<nPk; i++){
|
|
sqlite3_str_appendf(pSql, "%s %d", zSep, aiPk[i]+2);
|
|
zSep = ",";
|
|
}
|
|
sqlite3_str_appendf(pSql, ";\n");
|
|
|
|
if( g.fDebug & DEBUG_DIFF_SQL ){
|
|
Wfprintf(stdout, "SQL for %s:\n%s\n", zId, sqlite3_str_value(pSql));
|
|
goto end_changeset_one_table;
|
|
}
|
|
|
|
putc('T', out);
|
|
putsVarint(out, (sqlite3_uint64)nCol);
|
|
for(i=0; i<nCol; i++) putc(aiFlg[i], out);
|
|
fwrite(zTab, 1, strlen(zTab), out);
|
|
putc(0, out);
|
|
|
|
pStmt = db_prepare("%s", sqlite3_str_value(pSql));
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
int iType = sqlite3_column_int(pStmt,0);
|
|
putc(iType, out);
|
|
putc(0, out);
|
|
switch( sqlite3_column_int(pStmt,0) ){
|
|
case SQLITE_UPDATE: {
|
|
for(k=1, i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
putValue(out, pStmt, k);
|
|
k++;
|
|
}else if( sqlite3_column_int(pStmt,k) ){
|
|
putValue(out, pStmt, k+1);
|
|
k += 3;
|
|
}else{
|
|
putc(0, out);
|
|
k += 3;
|
|
}
|
|
}
|
|
for(k=1, i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
putc(0, out);
|
|
k++;
|
|
}else if( sqlite3_column_int(pStmt,k) ){
|
|
putValue(out, pStmt, k+2);
|
|
k += 3;
|
|
}else{
|
|
putc(0, out);
|
|
k += 3;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
case SQLITE_INSERT: {
|
|
for(k=1, i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
putValue(out, pStmt, k);
|
|
k++;
|
|
}else{
|
|
putValue(out, pStmt, k+2);
|
|
k += 3;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
case SQLITE_DELETE: {
|
|
for(k=1, i=0; i<nCol; i++){
|
|
if( aiFlg[i] ){
|
|
putValue(out, pStmt, k);
|
|
k++;
|
|
}else{
|
|
putValue(out, pStmt, k+1);
|
|
k += 3;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
|
|
end_changeset_one_table:
|
|
while( nCol>0 ) sqlite3_free(azCol[--nCol]);
|
|
sqlite3_free(azCol);
|
|
sqlite3_free(aiPk);
|
|
sqlite3_free(zId);
|
|
sqlite3_free(aiFlg);
|
|
strFree(pSql);
|
|
}
|
|
|
|
/*
|
|
** Return true if the ascii character passed as the only argument is a
|
|
** whitespace character. Otherwise return false.
|
|
*/
|
|
static int is_whitespace(char x){
|
|
return (x==' ' || x=='\t' || x=='\n' || x=='\r');
|
|
}
|
|
|
|
/*
|
|
** Extract the next SQL keyword or quoted string from buffer zIn and copy it
|
|
** (or a prefix of it if it will not fit) into buffer zBuf, size nBuf bytes.
|
|
** Return a pointer to the character within zIn immediately following
|
|
** the token or quoted string just extracted.
|
|
*/
|
|
static const char *gobble_token(const char *zIn, char *zBuf, int nBuf){
|
|
const char *p = zIn;
|
|
char *pOut = zBuf;
|
|
char *pEnd = &pOut[nBuf-1];
|
|
char q = 0; /* quote character, if any */
|
|
|
|
if( p==0 ) return 0;
|
|
while( is_whitespace(*p) ) p++;
|
|
switch( *p ){
|
|
case '"': q = '"'; break;
|
|
case '\'': q = '\''; break;
|
|
case '`': q = '`'; break;
|
|
case '[': q = ']'; break;
|
|
}
|
|
|
|
if( q ){
|
|
p++;
|
|
while( *p && pOut<pEnd ){
|
|
if( *p==q ){
|
|
p++;
|
|
if( *p!=q ) break;
|
|
}
|
|
if( pOut<pEnd ) *pOut++ = *p;
|
|
p++;
|
|
}
|
|
}else{
|
|
while( *p && !is_whitespace(*p) && *p!='(' ){
|
|
if( pOut<pEnd ) *pOut++ = *p;
|
|
p++;
|
|
}
|
|
}
|
|
|
|
*pOut = '\0';
|
|
return p;
|
|
}
|
|
|
|
/*
|
|
** This function is the implementation of SQL scalar function "module_name":
|
|
**
|
|
** module_name(SQL)
|
|
**
|
|
** The only argument should be an SQL statement of the type that may appear
|
|
** in the sqlite_schema table. If the statement is a "CREATE VIRTUAL TABLE"
|
|
** statement, then the value returned is the name of the module that it
|
|
** uses. Otherwise, if the statement is not a CVT, NULL is returned.
|
|
*/
|
|
static void module_name_func(
|
|
sqlite3_context *pCtx,
|
|
int nVal, sqlite3_value **apVal
|
|
){
|
|
const char *zSql;
|
|
char zToken[32];
|
|
|
|
assert( nVal==1 );
|
|
zSql = (const char*)sqlite3_value_text(apVal[0]);
|
|
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
if( zSql==0 || sqlite3_stricmp(zToken, "create") ) return;
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
if( zSql==0 || sqlite3_stricmp(zToken, "virtual") ) return;
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
if( zSql==0 || sqlite3_stricmp(zToken, "table") ) return;
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
if( zSql==0 ) return;
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
if( zSql==0 || sqlite3_stricmp(zToken, "using") ) return;
|
|
zSql = gobble_token(zSql, zToken, sizeof(zToken));
|
|
|
|
sqlite3_result_text(pCtx, zToken, -1, SQLITE_TRANSIENT);
|
|
}
|
|
|
|
/*
|
|
** Return the text of an SQL statement that itself returns the list of
|
|
** tables to process within the database.
|
|
*/
|
|
const char *all_tables_sql(){
|
|
if( g.bHandleVtab ){
|
|
int rc;
|
|
|
|
rc = sqlite3_exec(g.db,
|
|
"CREATE TEMP TABLE tblmap(module COLLATE nocase, postfix);"
|
|
"INSERT INTO temp.tblmap VALUES"
|
|
"('fts3', '_content'), ('fts3', '_segments'), ('fts3', '_segdir'),"
|
|
|
|
"('fts4', '_content'), ('fts4', '_segments'), ('fts4', '_segdir'),"
|
|
"('fts4', '_docsize'), ('fts4', '_stat'),"
|
|
|
|
"('fts5', '_data'), ('fts5', '_idx'), ('fts5', '_content'),"
|
|
"('fts5', '_docsize'), ('fts5', '_config'),"
|
|
|
|
"('rtree', '_node'), ('rtree', '_rowid'), ('rtree', '_parent');"
|
|
, 0, 0, 0
|
|
);
|
|
assert( rc==SQLITE_OK );
|
|
|
|
rc = sqlite3_create_function(
|
|
g.db, "module_name", 1, SQLITE_UTF8, 0, module_name_func, 0, 0
|
|
);
|
|
assert( rc==SQLITE_OK );
|
|
|
|
return
|
|
"SELECT name FROM main.sqlite_schema\n"
|
|
" WHERE type='table' AND (\n"
|
|
" module_name(sql) IS NULL OR \n"
|
|
" module_name(sql) IN (SELECT module FROM temp.tblmap)\n"
|
|
" ) AND name NOT IN (\n"
|
|
" SELECT a.name || b.postfix \n"
|
|
"FROM main.sqlite_schema AS a, temp.tblmap AS b \n"
|
|
"WHERE module_name(a.sql) = b.module\n"
|
|
" )\n"
|
|
"UNION \n"
|
|
"SELECT name FROM aux.sqlite_schema\n"
|
|
" WHERE type='table' AND (\n"
|
|
" module_name(sql) IS NULL OR \n"
|
|
" module_name(sql) IN (SELECT module FROM temp.tblmap)\n"
|
|
" ) AND name NOT IN (\n"
|
|
" SELECT a.name || b.postfix \n"
|
|
"FROM aux.sqlite_schema AS a, temp.tblmap AS b \n"
|
|
"WHERE module_name(a.sql) = b.module\n"
|
|
" )\n"
|
|
" ORDER BY name";
|
|
}else{
|
|
return
|
|
"SELECT name FROM main.sqlite_schema\n"
|
|
" WHERE type='table' AND sql NOT LIKE 'CREATE VIRTUAL%%'\n"
|
|
" UNION\n"
|
|
"SELECT name FROM aux.sqlite_schema\n"
|
|
" WHERE type='table' AND sql NOT LIKE 'CREATE VIRTUAL%%'\n"
|
|
" ORDER BY name";
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Print sketchy documentation for this utility program
|
|
*/
|
|
static void showHelp(void){
|
|
Wfprintf(stdout, "Usage: %s [options] DB1 DB2\n", g.zArgv0);
|
|
Wfprintf(stdout,
|
|
"Output SQL text that would transform DB1 into DB2.\n"
|
|
"Options:\n"
|
|
" --changeset FILE Write a CHANGESET into FILE\n"
|
|
" -L|--lib LIBRARY Load an SQLite extension library\n"
|
|
" --primarykey Use schema-defined PRIMARY KEYs\n"
|
|
" --rbu Output SQL to create/populate RBU table(s)\n"
|
|
" --schema Show only differences in the schema\n"
|
|
" --summary Show only a summary of the differences\n"
|
|
" --table TAB Show only differences in table TAB\n"
|
|
" --transaction Show SQL output inside a transaction\n"
|
|
" --vtab Handle fts3, fts4, fts5 and rtree tables\n"
|
|
"See https://sqlite.org/sqldiff.html for detailed explanation.\n"
|
|
);
|
|
}
|
|
|
|
int main(int argc, char **argv){
|
|
const char *zDb1 = 0;
|
|
const char *zDb2 = 0;
|
|
int i;
|
|
int rc;
|
|
char *zErrMsg = 0;
|
|
char *zSql;
|
|
sqlite3_stmt *pStmt;
|
|
char *zTab = 0;
|
|
FILE *out = stdout;
|
|
void (*xDiff)(const char*,FILE*) = diff_one_table;
|
|
#ifndef SQLITE_OMIT_LOAD_EXTENSION
|
|
int nExt = 0;
|
|
char **azExt = 0;
|
|
#endif
|
|
int useTransaction = 0;
|
|
int neverUseTransaction = 0;
|
|
|
|
g.zArgv0 = argv[0];
|
|
sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
|
|
for(i=1; i<argc; i++){
|
|
const char *z = argv[i];
|
|
if( z[0]=='-' ){
|
|
z++;
|
|
if( z[0]=='-' ) z++;
|
|
if( strcmp(z,"changeset")==0 ){
|
|
if( i==argc-1 ) cmdlineError("missing argument to %s", argv[i]);
|
|
out = fopen(argv[++i], "wb");
|
|
if( out==0 ) cmdlineError("cannot open: %s", argv[i]);
|
|
xDiff = changeset_one_table;
|
|
neverUseTransaction = 1;
|
|
}else
|
|
if( strcmp(z,"debug")==0 ){
|
|
if( i==argc-1 ) cmdlineError("missing argument to %s", argv[i]);
|
|
g.fDebug = strtol(argv[++i], 0, 0);
|
|
}else
|
|
if( strcmp(z,"help")==0 ){
|
|
showHelp();
|
|
return 0;
|
|
}else
|
|
#ifndef SQLITE_OMIT_LOAD_EXTENSION
|
|
if( strcmp(z,"lib")==0 || strcmp(z,"L")==0 ){
|
|
if( i==argc-1 ) cmdlineError("missing argument to %s", argv[i]);
|
|
azExt = realloc(azExt, sizeof(azExt[0])*(nExt+1));
|
|
if( azExt==0 ) cmdlineError("out of memory");
|
|
azExt[nExt++] = argv[++i];
|
|
}else
|
|
#endif
|
|
if( strcmp(z,"primarykey")==0 ){
|
|
g.bSchemaPK = 1;
|
|
}else
|
|
if( strcmp(z,"rbu")==0 ){
|
|
xDiff = rbudiff_one_table;
|
|
}else
|
|
if( strcmp(z,"schema")==0 ){
|
|
g.bSchemaOnly = 1;
|
|
}else
|
|
if( strcmp(z,"summary")==0 ){
|
|
xDiff = summarize_one_table;
|
|
}else
|
|
if( strcmp(z,"table")==0 ){
|
|
if( i==argc-1 ) cmdlineError("missing argument to %s", argv[i]);
|
|
zTab = argv[++i];
|
|
g.bSchemaCompare =
|
|
sqlite3_stricmp(zTab, "sqlite_schema")==0
|
|
|| sqlite3_stricmp(zTab, "sqlite_master")==0;
|
|
}else
|
|
if( strcmp(z,"transaction")==0 ){
|
|
useTransaction = 1;
|
|
}else
|
|
if( strcmp(z,"vtab")==0 ){
|
|
g.bHandleVtab = 1;
|
|
}else
|
|
{
|
|
cmdlineError("unknown option: %s", argv[i]);
|
|
}
|
|
}else if( zDb1==0 ){
|
|
zDb1 = argv[i];
|
|
}else if( zDb2==0 ){
|
|
zDb2 = argv[i];
|
|
}else{
|
|
cmdlineError("unknown argument: %s", argv[i]);
|
|
}
|
|
}
|
|
if( zDb2==0 ){
|
|
cmdlineError("two database arguments required");
|
|
}
|
|
if( g.bSchemaOnly && g.bSchemaCompare ){
|
|
cmdlineError("The --schema option is useless with --table %s .", zTab);
|
|
}
|
|
rc = sqlite3_open(zDb1, &g.db);
|
|
if( rc ){
|
|
cmdlineError("cannot open database file \"%s\"", zDb1);
|
|
}
|
|
rc = sqlite3_exec(g.db, "SELECT * FROM sqlite_schema", 0, 0, &zErrMsg);
|
|
if( rc || zErrMsg ){
|
|
cmdlineError("\"%s\" does not appear to be a valid SQLite database", zDb1);
|
|
}
|
|
#ifndef SQLITE_OMIT_LOAD_EXTENSION
|
|
sqlite3_enable_load_extension(g.db, 1);
|
|
for(i=0; i<nExt; i++){
|
|
rc = sqlite3_load_extension(g.db, azExt[i], 0, &zErrMsg);
|
|
if( rc || zErrMsg ){
|
|
cmdlineError("error loading %s: %s", azExt[i], zErrMsg);
|
|
}
|
|
}
|
|
free(azExt);
|
|
#endif
|
|
zSql = sqlite3_mprintf("ATTACH %Q as aux;", zDb2);
|
|
rc = sqlite3_exec(g.db, zSql, 0, 0, &zErrMsg);
|
|
sqlite3_free(zSql);
|
|
zSql = 0;
|
|
if( rc || zErrMsg ){
|
|
cmdlineError("cannot attach database \"%s\"", zDb2);
|
|
}
|
|
rc = sqlite3_exec(g.db, "SELECT * FROM aux.sqlite_schema", 0, 0, &zErrMsg);
|
|
if( rc || zErrMsg ){
|
|
cmdlineError("\"%s\" does not appear to be a valid SQLite database", zDb2);
|
|
}
|
|
|
|
if( neverUseTransaction ) useTransaction = 0;
|
|
if( useTransaction ) Wfprintf(out, "BEGIN TRANSACTION;\n");
|
|
if( xDiff==rbudiff_one_table ){
|
|
Wfprintf(out, "CREATE TABLE IF NOT EXISTS rbu_count"
|
|
"(tbl TEXT PRIMARY KEY COLLATE NOCASE, cnt INTEGER) "
|
|
"WITHOUT ROWID;\n"
|
|
);
|
|
}
|
|
if( zTab ){
|
|
xDiff(zTab, out);
|
|
}else{
|
|
/* Handle tables one by one */
|
|
pStmt = db_prepare("%s", all_tables_sql() );
|
|
while( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
xDiff((const char*)sqlite3_column_text(pStmt,0), out);
|
|
}
|
|
sqlite3_finalize(pStmt);
|
|
}
|
|
if( useTransaction ) Wfprintf(stdout,"COMMIT;\n");
|
|
|
|
/* TBD: Handle trigger differences */
|
|
/* TBD: Handle view differences */
|
|
sqlite3_close(g.db);
|
|
return 0;
|
|
}
|