mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 1,487 Branches 166 Tags 416 MiB
1ea0443c2d
Commit Graph

503 Commits

Author SHA1 Message Date
dan
1ea0443c2d Add new sqlite3_prepare_v3() flag SQLITE_PREPARE_NO_VTAB, for preparing 
statements that are not allowed to use any virtual tables. Use this to prevent
circular references in triggers on virtual table shadow tables from causing
resource leaks.

FossilOrigin-Name: 25666e3d03950caf753295cdb55df162e07dbcf6840b05875c6e0b127c469ecb
 2018-12-21 19:29:11 +00:00
drh
afdc9e23fc In FTS3, avoid calling memcpy() with a NULL source pointer, even if the 
transfer amount is zero bytes.

FossilOrigin-Name: 1abb83d29a06308c96bea379311b390240347c5f81824749348d18ad75840c96
 2018-12-21 18:51:27 +00:00
dan
e1e28ec35c Remove an assert() that could fail on a corrupt db from fts3_write.c. 
FossilOrigin-Name: 4cdcda408a4edcd2845584ddef64f0efdd2b4cc030afbc05fc2b8b555c69d3f6
 2018-12-21 11:53:43 +00:00
drh
3c2db5def6 Fix harmless compiler warnings. 
FossilOrigin-Name: 27221c69901d2b4546167639c4a3c8f54b2e18820f1346870fa26b7c919027db
 2018-12-14 18:11:02 +00:00
drh
f8c2fea195 Remove the unused sqlite3Fts5UnicodeNCat() function. 
FossilOrigin-Name: 7149dacf1d440a19f62808b4591c3fa8da202b2ec742d5490a63f2ec005ff9e7
 2018-12-03 17:40:46 +00:00
dan
e89feee5c3 Add the "remove_diacritics=2" option to the unicode61 tokenizer in both FTS5 
and FTS3/4.

FossilOrigin-Name: 06177f3f114b5d804b84c27ac843740282e2176fdf0f7a999feda0e1b624adec
 2018-12-03 16:14:49 +00:00
dan
bcdef69482 Add an "#ifndef SQLITE_DISABLE_FTS4_DEFERRED" block around function 
fts3EvalDeferredPhrase() in fts3 in order to silence a compiler warning.

FossilOrigin-Name: 6f4b0d0494446d46ac22b17650a25b025995cc545cac8fbc4776cf9dd388bcd8
 2018-11-27 09:57:10 +00:00
drh
fc25721c9e Only allow shadow table to be written from within a recursive SQL call. 
Omit the SQLITE_PREPARE_SHADOW flag.  Some tests are failing because the
tests depend on being able to write to shadow tables.

FossilOrigin-Name: d890c6582524677666e6f5b5817331dec332ade16b2f744cbb8a3c7dd9b63e21
 2018-11-06 14:03:07 +00:00
drh
84c501bac1 Initial code to make shadow tables read-only to ordinary SQL. The now 
xShadowName method is added to the sqlite3_module object and is used
to identify potential shadow tables.  The SQLITE_PREPARE_SHADOW argument
to sqlite3_prepare_v3() is defined.  It is designed to permit writing to
shadow tables, but is currently an unused placeholder.

FossilOrigin-Name: 31942b3dd3f66eb0d9977bf1cadc2f2d7be7967cce2b55784be0b939dfef1985
 2018-11-05 23:01:45 +00:00
dan
29d77dc450 Add extra defenses against strategically corrupt databases to fts3/4. 
FossilOrigin-Name: d44318f59044162e229a444582692e9788f17b5c404b4eb702f4c2114b22fefe
 2018-11-03 16:51:30 +00:00
dan
d2f65014bb Fix a broken assert() in fts3.c. 
FossilOrigin-Name: 564fa75195c5179d0bc86431aaff06136fc65ec63aa9839cd1114b1fbfac928b
 2018-09-10 16:38:25 +00:00
dan
b80bb6ce88 Add the "categories" option to the unicode61 tokenizer in fts5. 
FossilOrigin-Name: 80d2b9e635e3100f90cffdcffa5b5038da6fbbfccc9f5777c59a4ae760d4cb62
 2018-07-13 19:52:43 +00:00
drh
6bfd973ce6 Fix compiler warnings in FTS3. 
FossilOrigin-Name: de508e831a43f02c3b354a24ea34798da03c163bae5521c852c9ddd252723739
 2018-04-28 04:10:55 +00:00
dan
03db962ab5 Update test script fts3expr4.test so that it always creates fts3 tokenizers in 
the "en_US" locality.

FossilOrigin-Name: 576a8f69ae25883f752e58953624e9f7126db998bebaa1f07f7c2ec47aaecabe
 2018-04-27 18:05:01 +00:00
drh
d446e79545 Remove an unused variable from FTS4. 
FossilOrigin-Name: 27ea783b281606196ad1e7e6e6dcbd80c75d4bafcf3e58756a71c213320e4db2
 2018-02-13 16:30:19 +00:00
dan
e84c498be1 Ensure that multiple updates of the same FTS4 row (i.e. the row with the same 
rowid) within a single transaction are written to separate segments. Fix for
[d6ec09ec].

FossilOrigin-Name: d2a81a3752a8298ee65fddcf32dee2147ba6467f770315a41966b3533977aa64
 2018-02-13 16:21:32 +00:00
dan
eab0e10304 In extensions rtree, fts3 and fts5, ensure that when dynamic buffers are bound 
to persistent SQL statements using SQLITE_STATIC, the binding is replaced with
an SQL NULL before the buffer is freed. Otherwise, a user may obtain a pointer
to the persistent statement using sqlite3_next_stmt() and attempt to access
the freed buffer using sqlite3_expanded_sql() or similar.

FossilOrigin-Name: 2a5f813bc61f9e780f2ccbda425611f65ad523b6d486a1e5e2b9d5e9f1d260a2
 2018-02-07 18:02:50 +00:00
drh
22930062d5 Add a destructor argument to sqlite3_bind_pointer() 
and sqlite3_result_pointer().

FossilOrigin-Name: 3d9e841f6011480ebb8a6d860da72af7fa545983e08835ddef2cac96e5f5cd4b
 2017-07-27 03:48:02 +00:00
drh
ae3ec3f920 Add an experimental "pointer type" parameter to sqlite3_bind_pointer(), 
sqlite3_result_pointer(), and sqlite3_value_pointer().  The pointer type is
a string that must compare equal using strcmp() or else the pointer comes
through as a NULL.

FossilOrigin-Name: 211cce04e97d2e325a6ea3e99738fc71115d673dc13daeffb03ac3140deb11de
 2017-07-17 00:40:19 +00:00
drh
d43748aa98 Update the FTS3 extension to use sqlite3_result_pointer() and 
sqlite3_value_pointer() for passing FTS3 cursor objects from the table
into functions such as snippet().

FossilOrigin-Name: 0fa2e170e5e078d155c98b212ade36bd8424502ae07f2d82ebf77a76f57586ba
 2017-07-13 17:48:14 +00:00
dan
adea0d1c39 Have fts3 virtual table cursors free internal resources when they reach EOF, 
instead of waiting until the xClose method is called.

FossilOrigin-Name: b6b14ab6c8f9758a64e5fd29203f8fa610b5c4ef917de9be51ae55e072fad4ed
 2017-07-05 18:48:07 +00:00
drh
2c2f392dca Add interfaces sqlite3_prepare_v3() and sqlite3_prepare16_v3() with the 
extra prepFlags argument.  Add the SQLITE_PREPARE_PERSISTENT option as one
bit in that argument.

FossilOrigin-Name: 4a25c5883380fe5990d8180adb58c3bdc7a3d081bc4c69cd4de3cd57074fb251
 2017-06-01 00:54:35 +00:00
drh
e780764b4e Fix the fts3EvalAverageDocsize() routine so that it returns errors from 
sqlite3_reset() rather than always returning SQLITE_OK.

FossilOrigin-Name: 430f539cbb3f806fb89191e0b759a5f8b49d9e5b6c95fe9a4b55a1aa0875762a
 2017-05-02 18:00:31 +00:00
dan
dc62daca86 Further improvements to coverage of fts3 module. 
FossilOrigin-Name: 6b21d0fdebdccfaf63590d9ca9a279c22b8baec07c1a669b9f617f25bd857384
 2017-04-19 13:25:45 +00:00
dan
a059e99ca8 Further modifications and test cases to improve test coverage of fts3. 
FossilOrigin-Name: ea8a0d2ce0cb1ca3f4f18c72fb780d1c26792799acc87e6726f9eaccf2f178bf
 2017-04-19 07:33:52 +00:00
dan
0027e98b85 Use sqlite3_table_column_metadata() instead of a SELECT statement to check for 
the existence of a %_stat table in fts3. This leads to smaller and easier to
test code.

FossilOrigin-Name: dc2a48020a3c856a8b4cfa2309c290f0508b991e92cc0e4de680d19aae7872fc
 2017-04-18 13:50:00 +00:00
dan
bda00fbdb7 Refactor the fts3ColumnMethod() function so that all branches can be covered. 
FossilOrigin-Name: e47fdb493bd76d85f6f05771ee7a0b3ee31b1eb05839a60d2bdb47149ac692d8
 2017-04-18 05:49:23 +00:00
dan
624edacf6a Further improvements to test coverage in fts3. 
FossilOrigin-Name: 352413eed469802665e7d2c17b7fe6e3a0b0b2209ce45bdc85fd4243cec50ea6
 2017-04-17 16:07:25 +00:00
dan
ddf4747053 Improve coverage of code in fts3. 
FossilOrigin-Name: 1a08a836fa919524216a16faf5212eebc9ad788c9e15463b68b0576dfccd4387
 2017-04-17 13:38:09 +00:00
dan
119fc11eb0 Add short script ext/fts3/tool/fts3cov.sh. To help measure test-coverage of 
fts3 source code.

FossilOrigin-Name: ee9588e873ffebcaa177957950cbb14924e154c391ed7f687116065064ff11b0
 2017-03-21 17:19:31 +00:00
dan
74869e5e52 Avoid passing NULL as the second argument to memcpy() in fts3. 
FossilOrigin-Name: 49b93d972de9649abfd6235b65dda1c9d468956671e50704afde6181ffa56dea
 2017-03-20 19:35:30 +00:00
dan
920c83f18f Fix some problems in fts3 found by address-sanitizer. 
FossilOrigin-Name: 16a8e84fa7f67a467f824bdd7f72cbd6a6e95dab8cc7aa1e0e751720b98f3e31
 2017-03-20 18:53:32 +00:00
dan
9c58b63c18 Add an sqlite3_set_last_insert_rowid() method. Use it to work around fts4 and 
fts5 modifying the last-insert-rowid unintuitively from within commit
processing.

FossilOrigin-Name: fe41bb5632a5d438acfd682809f1bd12315b970a
 2017-02-27 14:52:48 +00:00
dan
18fdde21b8 Avoid preparing a SELECT statement each time an UPDATE or DELETE 
by docid is executed against an fts3 table.

FossilOrigin-Name: 9962c10a5c6672bd82b2bf640d878fcdac0b815a
 2017-02-08 19:10:47 +00:00
mistachkin
2e52532217 Fix harmless compiler warnings seen with MSVC. 
FossilOrigin-Name: 997f765bc6706769ae15f3e719354473e02bd78b
 2017-02-01 22:43:08 +00:00
mistachkin
7617e4a8a4 Make sure the SQLITE_TCLAPI macro is always defined. 
FossilOrigin-Name: f2f1323cc4d2ad2d6794dbfae8d50b747213e85d
 2016-07-28 17:11:20 +00:00
mistachkin
52b1dbb5fc Allow the 'testfixture.exe' target to be compiled with the __stdcall calling convention. 
FossilOrigin-Name: e8be3dfeabaa31b3490793cf8230faae1204be15
 2016-07-28 14:37:04 +00:00
mistachkin
77fac879d2 More harmless compiler warning fixes. 
FossilOrigin-Name: ab69527c1608da0b668f3b49e967661dd99cc3d4
 2016-04-12 20:05:06 +00:00
mistachkin
02267cc213 Compilation fix for a C99-ism in the 'fts3view' tool. 
FossilOrigin-Name: bedb88a4b9c808ea781ae69058399a1a3a3d15fa
 2016-04-12 19:30:31 +00:00
dan
57ebc84a6e Fix a problem in fts3/4 that was causing it to discard data cached in-memory if an 'optimize' command is run when there is no data on disk. The usual way this would happen is if the very first transaction that writes to the fts3/4 table also includes an 'optimize' command. 
FossilOrigin-Name: 79338b991bf01e81d336790ca87a0fa747da4ff3
 2016-03-09 18:17:42 +00:00
dan
c7dbce0f2a Update fts3/4 so that the 'merge=X,Y' command merges at least, instead of exactly, Y segments from a single level. This matches the documentation. 'merge=X,0' is, as it was in 3.11, an error. 
FossilOrigin-Name: 64b3cb29159491cbfab7e01844b54408541ece5e
 2016-03-08 15:37:48 +00:00
dan
108b7953ed Update fts3/4 so that the 'merge=X,0' command merges X pages from all segments of the first level in the fts index that contains 2 or more segments. 
FossilOrigin-Name: cddf69dbc46f10ee7e87538dd850e086386b544c
 2016-03-07 20:14:27 +00:00
drh
d42908fb0e Provide the new SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER option to 
sqlite3_db_config() that can be used to activate the two-argument version
of fts3_tokenizer() for a specific database connection at run-time.

FossilOrigin-Name: 374b5108087a2eae03676c0f3469b37a272145bf
 2016-02-26 15:38:24 +00:00
drh
e1ee002891 Fix a couple of harmless warnings generated by clang. 
FossilOrigin-Name: a1a3ff1f53145c5a9fbf29398cf4a453729e71f0
 2016-02-19 15:17:53 +00:00
dan
53ff9c2972 Fix a potential buffer overread provoked by invalid utf-8 in fts5. 
FossilOrigin-Name: a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
 2016-02-12 18:48:09 +00:00
drh
4553f6ea91 Automatically disable FTS3 and FTS4 when building with SQLITE_OMIT_VIRTUALTABLE. 
FossilOrigin-Name: 0beb32d20d8dd698138cdb2de6b6056de176754d
 2016-02-11 22:41:04 +00:00
drh
83d7920e55 Fix a compiler warning when compiling without SQLITE_ENABLE_FTS3_TOKENIZER. 
FossilOrigin-Name: 6926f28cd56bf61f7c92877baa54024bee7cbab5
 2016-02-08 20:06:52 +00:00
dan
e064c4066c Disable the two-argument form of the fts3_tokenizer() SQL function unless the library is built with -DSQLITE_ENABLE_FTS3_TOKENIZER. 
FossilOrigin-Name: e0eb217aca7e4aadf9c44ed20822b78139f7c83c
 2016-02-08 19:40:17 +00:00
mistachkin
8ccdef6be4 Fix some more harmless compiler warnings. 
FossilOrigin-Name: 18f531e1cf3c8bb986d912c9c5e3f5698360c93e
 2015-12-16 22:06:52 +00:00
dan
f24bebe37a Update fts3 so that expressions to the left and right of a NOT operator are balanced. This prevents relatively small expressions (a dozen terms or so) that are children of NOT operators from triggering the "expression tree is too large" error. 
FossilOrigin-Name: d6b66cd7b89fbd964f798d160a34caac0ba7347a
 2015-10-05 15:39:45 +00:00