mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,106 Commits 1,487 Branches 166 Tags 416 MiB
81be0d26bb
Commit Graph

27106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stephan
6a0f297da9 Unconditionally force use of SQLITE_ENABLE_API_ARMOR in the WASM and JNI builds. Their corresponding test suites still work. 
FossilOrigin-Name: c11394b50d0687b6d6abad9c80d5cd3cdce77e9b9c278f40601c460f463744a1
 2023-10-11 20:37:42 +00:00
drh
ac4aea5102 Fix the use of an uninitialized value that occurs when doing a json_insert() 
of a string value that contains embedded U+0000 characters.

FossilOrigin-Name: d3c0cbb90966316be9cd25e3edb501da42731e8a83c13227b90ce17d3975a2c3
 2023-10-11 17:24:31 +00:00
stephan
582d65cce3 Add (prepare, step, reset, finalize) parts of the JNI level-2 stmt wrapper and associated tests. 
FossilOrigin-Name: a7082f186f2b9b6666bbc65f2eadeb74d91fa0a681e3b2468b261ffd322bd249
 2023-10-11 13:52:05 +00:00
drh
58c7b770de Simplification to sqlite3ApiExit(). Generates identical machine code, but 
easier for humans to read.

FossilOrigin-Name: 793bbfa5af9721bc3a61e8e5eda46dfce2f5ff3f223a7564c9e1b09f11e53cb3
 2023-10-11 13:34:18 +00:00
drh
853fb5e723 Fix a bug in the mkautoconfamal.sh script, introduced by check-in [3308fdda4b81c110] 
so that the "snapshot-tarball" and "amalgamation-tarball" makefile targets
work again when run from outside of the source tree.

FossilOrigin-Name: 65ccf5fef812d43aed9e00af36c90e1a499d197e30148753790445e25ee1324c
 2023-10-10 15:33:05 +00:00
stephan
0b29d37ef9 Start adding tests for the second JNI layer. 
FossilOrigin-Name: 0177f4dfe8a5c03c1d5dd279c6babe5a87b596c2351373f845b89fc6abf7947b
 2023-10-10 12:16:04 +00:00
drh
aaf1341dcd Use snprintf() in place of sprintf() in a debugging function in the CLI. 
FossilOrigin-Name: 5e5e4d2b4958c329578d1e5af4ed25c1b774f0ed2d15fa6747d7d7fbbba4fa46
 2023-10-09 22:45:10 +00:00
dan
6c96bf2c3f Avoid calling sqlite3_randomness and taking the PRNG mutex when writing a journal header in "journal_mode=memory" mode. 
FossilOrigin-Name: c84e4483cb44f827416d8caafa22f076b2f31b2024fe8c5b5bcb0c9955149d11
 2023-10-09 17:54:34 +00:00
drh
01a5a19919 Add a TCL script that does various verification checks on the source tree 
to make sure that generated code has been updated correctly.

FossilOrigin-Name: 1f1a358af77f4386f98010eeae8487e6d39548a6dfe58c2664552490e7661122
 2023-10-09 14:56:15 +00:00
drh
7e60f6dbf1 Fix a compiler warning caused by the previous check-in. 
FossilOrigin-Name: 7e8768bf8b4002b1c287f2bc95262548e2ae81b437936154f2bb1ea1f739a904
 2023-10-09 14:47:25 +00:00
drh
50da20d5b1 Turn on SEH by default when building using MSVC. 
FossilOrigin-Name: f57e8275cf1ab3ad8027044cda0893282d1c403a5aa9fabbb1c7de280597b5cd
 2023-10-09 14:05:21 +00:00
drh
faef28e6bd Fix a potential UAF caused by JSON parser cache spill. 
[forum:/forumpost/b25edc1d46|Forum post b25edc1d46].

FossilOrigin-Name: a163fecca90cab9d1b7bf8ebac78d498775eed7b6d81e7920e3401633c3a4b60
 2023-10-09 12:46:53 +00:00
stephan
66dacae4c3 Flesh out the error state captured by SqliteException.java. Doc additions. 
FossilOrigin-Name: 5c5397ff15543f4b3620244d9e57e15708eafcab1d42c9f87b4a60f0c01e8858
 2023-10-09 12:45:28 +00:00
drh
4a11142072 Fix harmless compiler warning in the test module for sessions. 
FossilOrigin-Name: 3d5ec99397c183cfb8c5d31e1967e0df8a4d6edbea92bbdf728571e3a6a36d68
 2023-10-09 12:39:59 +00:00
stephan
c8f829cdac Add JNI Sqlite and SqliteException classes. Add Tester2.java as the main test app for the high-level API. 
FossilOrigin-Name: 6acf52be7abce8dcf434c5ebf0d5e88859b033e6418077846247ecf00ccf9381
 2023-10-09 11:46:32 +00:00
stephan
fd013682d6 Minor JNI doc and public/private cleanups. 
FossilOrigin-Name: c49d36ece283274963ce2e5a4db1e8f586dffa22e47f4adb93c625f918c3fd5d
 2023-10-09 10:44:10 +00:00
stephan
68585ea342 Rename SQLite3Jni to CApi to (A) reduce name prefix collisions with incoming classes and (B) align with its counterpart in the JS build. Remove the Canonical annotation because (A) the new code separation will inherently make that distinction and (B) the line between truly canonical and semi-canonical (e.g. differing in signature overloads) is blurry enough that consistent use of that annocation is becoming an unnecessary burden. 
FossilOrigin-Name: ca216b4486aff7d206ebfc3a5e84d48919c282425d4313396bc19313ffca8a0e
 2023-10-09 10:30:54 +00:00
dan
3b381b4afc Fix a problem with sqlite3changegroup_schema() and patchsets. 
FossilOrigin-Name: c4ab4200dc2538e1132d87d70fd309b26b0da8a918fede1cb09b567ea40ec889
 2023-10-07 17:29:10 +00:00
dan
4bdcfc6666 Add the sqlite3changegroup_schema() API. To allow changegroup objects to upgrade the schema of a changeset/patchset under some circumstances. 
FossilOrigin-Name: 03f9e50b15c9c2fb4636dee24c1491c45322578b9fed08c6f4360be07c5c3830
 2023-10-07 16:32:02 +00:00
dan
18efe17553 Fix a problem with the changes on this branch and tables that use an implicit primary key. 
FossilOrigin-Name: 1f9d10235ff32e72074be695049567135b02e681068ce117b66adc14a6214449
 2023-10-07 16:07:02 +00:00
drh
8f0634549c Add a test case to prevent a regression of the leak fixed in the previous 
trunk check-in.

FossilOrigin-Name: f99ff655d09763c4a22d065041644ece793d84c82c644931e89ccf50c4f4564a
 2023-10-07 08:15:47 +00:00
drh
43e232dc47 Fix a resource leak: sqlite3_blob_reopen() was failing to invoke the 
xDel() distructor on a register when it sets that register to the new
rowid.  This was never a problem prior to the large-column cache of
[771fe35074b50b8d] as that destructor was always a no-op.
dbsqlfuzz cd96368deaece480fb94d42427dde053737a650e.

FossilOrigin-Name: 545edd5ecf20a7feb99dc5ce6f338fa1f172c2e17b240cbede497f0729dbd3d7
 2023-10-07 08:00:54 +00:00
dan
83e43dc757 Add missing source code comments and fix other issues with the new code on this branch. 
FossilOrigin-Name: df39fbe9ab87937beb77af353cd55602290b185e222e0a92a3ebf9a9a0b9e2e7
 2023-10-06 20:39:42 +00:00
dan
9fc208aada Update this branch with latest changes from the trunk. 
FossilOrigin-Name: 897e926a5eaa0eab7e09e5003e4c15c974897be298a18ae85345962dc3f410a1
 2023-10-06 19:46:19 +00:00
dan
53e91a5e22 Add tests for the sqlite3changegroup_schema() API. 
FossilOrigin-Name: 5dab481c101b1523b1cfde92678cbc654ea26d946bf29da372d71c1f89cbaf46
 2023-10-06 19:01:43 +00:00
drh
00eee7a786 Remove an unused parameter from the recomputeColumnsNotIndexed() routine in 
order to squash a harmless compiler warning.

FossilOrigin-Name: 9bf4bfd68080367b58594e0d44b110b3ee9766420f648537fd7bc638dacefb72
 2023-10-06 12:55:53 +00:00
drh
1935887a68 Ensure that all fields of static sqlite3_module objects are explicitly 
initialized, in order to hush-up nuisance compiler warnings.

FossilOrigin-Name: f3b3d712d6e58b1cb8fdebd2b6b3125080b6b3ac8c7c849a8cc1e5e778d62fe7
 2023-10-06 12:51:05 +00:00
drh
03f7e42538 Remove and unused static variable from shell.c.in in order to silence a 
harmless compiler warning.

FossilOrigin-Name: 477577120b897bf15edc2a85e220d5c64a1d5a245354939269f6753d8140ac95
 2023-10-06 12:22:14 +00:00
drh
568643fd15 Increase the size of some variables associated with the PMA sorter in order 
to avoid any possibility of a signed integer overflow.
[https://bugs.chromium.org/p/chromium/issues/detail?id=1489025|Chromium fuzzer issue 1489025].

FossilOrigin-Name: dc3be3af471d90dd810c1e2cc59e83cf6a57f01971b1258ea0da402e4d577ef2
 2023-10-06 12:15:01 +00:00
dan
16381d062a Add the sqlite3changegroup_schema() API. To allow changegroups to handle differences in schema created by ALTER TABLE ADD COLUMN. 
FossilOrigin-Name: 309deee2dd8dd07623fce79f6bb62d5279d140dd0be3b34bc42af20b0507726b
 2023-10-05 19:09:23 +00:00
drh
5d9446d100 Improved detection of corrupt databases in balance_nonroot(). 
dbsqlfuzz d1cf013c50a620b68c2a5bd240d29afd65e5f58e.

FossilOrigin-Name: a2464bbb825b5976ef974a2e6c17ea150f5e6fcd0dd0f144b9f9c1c22a9c9c82
 2023-10-05 11:06:10 +00:00
stephan
a357bdbfc4 Do not squelch exceptions from SAHPool VFS importDb() - rethrow them. Problem reported in [forum:c80fc578809b80a3|forum post c80fc578809b80a3]. 
FossilOrigin-Name: 325bcdea4a436e514d83095d3893caf07a714b718e1b643507179b101c108e3b
 2023-10-05 11:04:49 +00:00
drh
3a3912f21c Remove a stray blank line from the beginning of btree.c. No functional 
code changes.

FossilOrigin-Name: c89983dcfc208faa86b31717144c069572598e9770228264d69a044a84bde277
 2023-10-05 10:35:51 +00:00
dan
6d8e91be9d Allow a session object to generate a changeset, even if columns were added to one of the tables using ALTER TABLE ADD COLUMN while the changeset was being collected. 
FossilOrigin-Name: a3f435eccf3a2aa11cb7420e94af5efcdfa04e9c169c5aaf61fa5cdcb165ceef
 2023-10-04 21:15:24 +00:00
drh
10e751937c The Makefile distinguishes between tcl8.4 and tcl8.5. Some makefile targets 
require tcl8.5, but others (ex: "sqlite3.c", "shell.c", and "sqlite3") require
only tcl8.4.

FossilOrigin-Name: 770308db9776b8c0a70b8807463e89a9eddfe5552e25e67324cd303dc974f50e
 2023-10-04 12:49:08 +00:00
drh
57996f53e4 Modify the main makefile so that it fails with an error if the tclsh found 
by ./configure is not tclsh 8.5 or later.
[forum:/forumpost/4380363682708ece|Forum post 4380363682708ece].

FossilOrigin-Name: 1765f3b5a00a8ca20a7b9e18ac7f9d7de0679470b234b83aea83aa5b4d4d34e6
 2023-10-04 11:52:44 +00:00
stephan
4f65a3cec9 JNI: when fetching text-or-blob/length pairs, fetch the text-or-blob first, then the length, as the API docs suggest. 
FossilOrigin-Name: e4f9d3946fa570bccea2de17c5536901bdabd46cfe25678fdd37ba0e2bfd99b1
 2023-10-02 17:12:16 +00:00
drh
51e3f7a1c3 Fix the length of the string in the new concat() and concat_ws() functions. 
FossilOrigin-Name: 325243226520376f4a142864ae3fb98866f25bff4dc50a6b648ef98428a7169f
 2023-10-02 17:06:28 +00:00
drh
43d71eb892 Remove an ALWAYS() from a branch that can in fact be false following an OOM 
fault.

FossilOrigin-Name: 3a1feb1c469d3dd50e2558581199b16bfd59b9d5bcb0de5f1a8f0ec30a17b4d1
 2023-10-02 15:56:37 +00:00
stephan
041fb16631 Pointer-casting-related fixes for JNI on 32-bit ARM (pi4 armv7l). 
FossilOrigin-Name: 54441039ae3ebe39e42f008f77ce1be117cbda6daeed8b01739ad42a3c1f0754
 2023-10-02 14:44:28 +00:00
stephan
dc13d74140 Add JNI binding for sqlite3_normalized_sql(). 
FossilOrigin-Name: 2532e5662a2bbb3e6b4c4be3fad035734b684bdf59b178cb64b444ca6d8b956b
 2023-10-01 12:15:38 +00:00
stephan
ec15e551f9 Make JNI binding of sqlite3_value_frombind() return boolean instead of int and add tests for it. 
FossilOrigin-Name: 906e2ed3e9647f5c2355e9fea2beee141767cae7016da9fa1fe88283726b9369
 2023-10-01 11:53:40 +00:00
stephan
f046b82324 Fix JNI binding to compile without SQLITE_ENABLE_PREUPDATE_HOOK. Add build option to disable all optional ENABLE flags. 
FossilOrigin-Name: c04022b7407f77eaf0175e831ebcd6bbdc0af1cef0d42c5c11102aa8484f24ca
 2023-09-30 17:08:29 +00:00
stephan
d1878bed86 Make all SQLite3Jni methods which take a void-pointer-as-long-int argument explicitly package-private, as they're always for internal use only even if SQLite3Jni is eventually made public. 
FossilOrigin-Name: 5e387275f69ab2d3159b4b67b8cbfc6270410b61e5ac1f988616e8d051f6572e
 2023-09-30 16:19:57 +00:00
stephan
41c6232e54 JNI: rename sqlite3_errmsg16() to sqlite3_errmsg(), as the 16 suffix is superfluous there. 
FossilOrigin-Name: df25b21689de84b7b8c940df39461d3d88f592f0ba2dddcfcbb0bebcea6ee7da
 2023-09-30 14:48:21 +00:00
stephan
0018ef15a3 Expose sqlite3_stmt_busy() to JNI. 
FossilOrigin-Name: 5733aa5fe341d50b84baebd8803a86e381bb95959a8bc733b8fff6fd4e732867
 2023-09-30 14:34:55 +00:00
stephan
8f43696c8a Correct an undefined-value deref in the JS bindings, triggered by passing invalid args and then tripping over an undefined value while trying to report that. Reported in [forum:dd42df144651d779|forum post dd42df144651d779]. 
FossilOrigin-Name: fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
 2023-09-30 13:13:23 +00:00
stephan
9ac7e2d0fc Make (almost) all SQLite3Jni.sqlite3_... members public but make the SQLite3Jni class package-private, which has the same foot-protection effect but makes it much simpler to patch SQLite3Jni to publicize the interface later. Remove some of the extraneous foot-shooting protection from indidivual functions, in lieu moving it to the still-pending higher-level interfaces. 
FossilOrigin-Name: 082b86683e77b2d4a30e1515552f52511324ef97c43b622b4dab7975ae9fbd7d
 2023-09-30 10:59:18 +00:00
stephan
008b62f1ae Merge in and close jni-ptr-passing branch. The remaining pointer-passing adaptation can be done incrementally without affecting the interface. 
FossilOrigin-Name: 7927c42410ba0d5fc8e6e08caaa5cbaaeb359869f17d1afaa082f1aa47fdb2fc
 2023-09-30 10:37:36 +00:00
stephan
d1ce2755f0 Make all native JNI sqlite3_...() bindings package-private as a foot-shooting protective measure (higher-level pre-native-call argument validation is largely pending). Move SQLTester.java and TesterFts5.java into the org.sqlite.jni package so that they can access the being-tested methods. 
FossilOrigin-Name: ec82f7251acab7df40755ef5f456f36fe49b59e63a20be59bd610fc4280ba8cd
 2023-09-30 10:31:56 +00:00