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

69 Commits

Author SHA1 Message Date
dan
25fb50674f Fix problems with joining two or more fts5_vocab tables that access the same 
underlying fts5 table.

FossilOrigin-Name: 49956395e14b61f6bf839e59ae7dd95eb32ebf32f3d16388844de6621b9c2d98
 2019-01-17 17:39:15 +00:00
dan
2d4e720579 Have fts5 reject attempts to insert a non-integer, non-null value into a rowid 
column with SQLITE_MISMATCH.

FossilOrigin-Name: 4a9483f81e9ca1aa41d6ca33cb3171370418ccc71fdee9741bbf6f694bf4fbaa
 2019-01-15 15:18:58 +00:00
dan
f8a488bb6b Fix a problem causing a crash if an fts5vocab table was created to query an 
fts3/4 FTS index.

FossilOrigin-Name: 9cd64ce453e4435d80117b8610c22a0a4b53cd6e84b39815e70e684f6b0295c8
 2019-01-14 15:35:15 +00:00
drh
2d77d80a65 Use 64-bit math to compute the sizes of memory allocations in extensions. 
FossilOrigin-Name: ca67f2ec0e294384c397db438605df1b47aae5f348a8de94f97286997625d169
 2019-01-08 20:02:48 +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
5921f2b9e7 Fix some test script errors. And an incorrect assert() in fts5. 
FossilOrigin-Name: f804336f083d8d26314bb1ba34cec427675065a67cbe2bf00bb42e40752aeb33
 2018-09-05 17:45:17 +00:00
dan
366607865b Ensure that FTS5 queries of the form "WHERE rowid BETWEEN ? AND ? AND tbl 
MATCH ? ORDER BY rank" do rowid filtering before sorting.

FossilOrigin-Name: f1138a38bd23f201a35621a71e82c5718abddb42ab82938e9516ab9d43e4df16
 2018-09-03 17:11:11 +00:00
dan
67ecf1f5c2 Fix the fts5 xBestIndex method so that it is not confused by "IS", "!=", 
"REGEXP", "GLOB" or "LIKE" operators.

FossilOrigin-Name: a0ca4ddbbf179b8f0a5f30c127f2f8c92b6d45a08be3e1ef2194e44ebcc28120
 2018-04-09 14:26:44 +00:00
drh
72495b44e0 Improved the interface to the fts5() extension mechanism for enhanced 
security.

FossilOrigin-Name: bc78235f547977f1a821342ca8f3e03103a0eb351f8b3115ac10b43dd9c7044d
 2017-07-17 15:38:57 +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
dan
929b695111 Allow a user column name to be used on the LHS of a MATCH operator in FTS5. 
FossilOrigin-Name: 6f54ffd151b0eca6f9ef57ac54802584a839cfc7373f10c100fc18c855edcc0a
 2017-04-13 09:45:21 +00:00
dan
be0bc8bb4d Have fts5 close any open blob-handle when a new savepoint is opened. This 
ensures that fts5 does not prevent DROP TABLE statements (which always open a
savepoint) from succeeding.

FossilOrigin-Name: a921ada89050ce1d162fd1b0056939573635e2cec7ac0c2a99ae924b3ae593f7
 2017-04-08 09:12:20 +00:00
dan
0df5024e83 Fix an FTS5 problem (segfault or incorrect query results) with "... MATCH 'x OR y' ORDER BY rank" queries when either token 'x' or 'y' is completely absent from the dataset. 
FossilOrigin-Name: 64ca1a835a89fd211078d2cd8f9b649e89be528d
 2016-05-30 08:28:21 +00:00
dan
f55fb6615b Have fts5 cache the decoded structure of fts5 indexes in memory. Use "PRAGMA data_version" to detect stale caches. 
FossilOrigin-Name: 33ef2210ef19e55c8d460bfe9d3dc146034c8acc
 2016-03-16 19:48:10 +00:00
dan
4dbc65b29a Add an incremental optimize capability to fts5. Make the 'merge' command independent of the 'automerge' settings. 
FossilOrigin-Name: 556671444c03e3afca072d0f5e9bea2657de6fd3
 2016-03-09 20:54:14 +00:00
dan
5e29f38d2c Remove the "#ifdef SQLITE_TEST" condition from fts5_test_mi.c. Update fts5_main.c so that if SQLITE_FTS5_TEST_MI is defined when it is built the fts5_test_mi.c entry point is automatically called. This makes it easier to build versions of fts5 that include the matchinfo() demo by default. 
FossilOrigin-Name: 87e6e225aea3a4d10476d16eab4a6403a4a128c9
 2016-02-17 14:48:26 +00:00
dan
22e8356368 Handle parser stack overflow when parsing fts5 query expressions. Fix some compiler warnings in fts5 code. 
FossilOrigin-Name: bc3f7900d5a06829d123814a5ac7b951bcfc1560
 2016-02-11 17:01:32 +00:00
dan
b80b8f482c Further streamlining of fts5 prefix query code. 
FossilOrigin-Name: ca91bd8ac70a5b3fef127364f73ec675e58bb92c
 2016-02-05 19:18:02 +00:00
dan
df015945e3 Improve performance of fts5 queries. 
FossilOrigin-Name: 2334e88244afe6387208be5d527aba9b5ddf4e4c
 2016-02-01 20:12:41 +00:00
dan
e9eb1593f5 Fix an fts5 problem with using both xPhraseFirst() and xPhraseFirstColumn() within a single statement in detail=col mode. 
FossilOrigin-Name: 72d53699bf0dcdb9d2a22e229989d7435f061399
 2016-01-23 18:51:59 +00:00
dan
8631402e6a Add further tests for fts5. Fix some problems with detail=col mode and auxiliary functions. 
FossilOrigin-Name: de77d6026e8035c505a704e7b8cfe5af6579d35f
 2016-01-16 18:58:51 +00:00
dan
25247435be Rationalize some code in fts5_storage.c. Add tests to cover recently added branches in fts5. 
FossilOrigin-Name: 3b72df405ac9b3a71144f45317d32e25f0084c4b
 2016-01-15 19:54:47 +00:00
dan
f705e9deab Fix compiler warnings in fts5. 
FossilOrigin-Name: 5a343cc0336bba056df4449e6cd2e3fb9e75a105
 2016-01-14 14:15:54 +00:00
dan
4d14398a61 Merge latest trunk changes into this branch. 
FossilOrigin-Name: e7dcd013516723941c2fb78ecdc96806d49d310b
 2016-01-06 19:35:52 +00:00
dan
10e1535dee Rationalize and extend some fts5 test code. Fix bugs revealed by the same. 
FossilOrigin-Name: fd217fdb396cf22278a496de0e9dec7902ba8b1f
 2016-01-05 21:04:35 +00:00
dan
211bd3a20a Fix an OOM handling problem in fts5 detail=none and detail=col modes. Also a bug in the xInst() API when used with detail=col and column filtering expressions. Update the matchinfo() test function so that 'b' is fast with detail=col tables. 
FossilOrigin-Name: ee38f9dff5e9239c541515cd8a1aa3d81fdc0ae9
 2016-01-04 19:12:00 +00:00
dan
fe0c3cfee1 Changes to run many fts5 tests with detail=none and detail=col tables as well as the default detail=full. Also fixes for the bugs uncovered by running said tests. 
FossilOrigin-Name: 6322a1d984e7946735bace8a069ef24b31754b3b
 2016-01-02 19:01:56 +00:00
dan
9a3a5275cd Add the xPhraseFirstColumn() and xPhraseNextColumn() API functions to fts5. For iterating through the set of columns that contain intances of a phrase. 
FossilOrigin-Name: 8c30605bcd0a78a5015948171145bc6f640b8358
 2015-12-29 19:35:03 +00:00
dan
9f44deed93 Change the name of the offsets=0 option to "detail=column". Have the xInst, xPhraseFirst and other API functions work by parsing the original text for detail=column tables. 
FossilOrigin-Name: 228b4d10e38f7d70e1b008c3c9b4a1ae3e32e30d
 2015-12-28 19:55:00 +00:00
dan
3e6a141130 Fix some harmless gcc compiler warnings. Mostly in fts5, but also two in the core code. 
FossilOrigin-Name: 5d44d4a6cf5c6b983cbd846d9bc34251df8f4bc5
 2015-12-23 16:42:27 +00:00
dan
8f9ced636f Updates so that fts5 API functions xInst, xPhraseFirst and xPhraseNext work with the offsets=0 option. 
FossilOrigin-Name: 69bffc1632c8a8f3bfe5bf92607e64fed982e48c
 2015-12-22 18:54:16 +00:00
mistachkin
b9becaa268 Fix even more harmless compiler warnings. 
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
 2015-12-16 23:30:30 +00:00
drh
43509768e1 Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: 09752e51a18ac1b4c9642965e6ee1b6a32de00df
 2015-11-10 12:31:25 +00:00
dan
dbbda39453 Have fts5 load its configuration from the xConnect() method is invoked. This ensures that the very first query run uses the correct value of the 'rank' option. 
FossilOrigin-Name: 33e6606f5e497e81119ec491cf2370f60bddafc0
 2015-11-06 12:50:57 +00:00
dan
36c33aa633 Have contentless and external content fts5 tables ignore "OR REPLACE" conflict handling. 
FossilOrigin-Name: a85c2a4758c27e8d5d0395751eb3cfd9985ce696
 2015-10-27 20:04:53 +00:00
dan
05903e6a87 Handle equality and range constraints on the "term" column of fts5vocab tables. Also have the same module report columns using names instead of indexes. 
FossilOrigin-Name: 6020d96ab47a0bebe41f691a3f44fd55d8b2d2b7
 2015-10-17 19:49:01 +00:00
dan
5f93ccd7fc Tests and minor fixes to improve coverage of FTS5 code. 
FossilOrigin-Name: f4de6d450e143cb1dd5447800d4b178e3db114c8
 2015-10-14 21:08:48 +00:00
dan
df705d8185 Further tweaks to improve fts5 prefix query performance. 
FossilOrigin-Name: 1c20c1c28b56411f106cf2f6961b3ad4b4d6f6c8
 2015-10-12 19:12:29 +00:00
drh
72724da95a Remove another instance of strcpy() from FTS5, to mollify OpenBSD. 
FossilOrigin-Name: 35e6248abb4435a8b26d270092b856beff867406
 2015-10-10 15:57:20 +00:00
drh
c5971cc859 Omit the use of strcpy() in FTS5 since OpenBSD hates strcpy(). 
FossilOrigin-Name: bc24a5bbfd95df3518611b221de69b73776111bc
 2015-10-10 15:11:49 +00:00
dan
0008ce7cc5 Makefile and fts5 changes so that fts5 works with main.mk. Still does not work with Makefile.in. 
FossilOrigin-Name: 6ebac32d8378e46f44a6eb55aaa30baf4d7dde7d
 2015-10-09 11:09:47 +00:00
dan
56eac26897 Fix further fts5 compilation issues. 
FossilOrigin-Name: 0d7f301fb03c8546a5dbce5d061a1d74e3c86bcf
 2015-10-08 20:40:18 +00:00
dan
056d7acf25 Fix a couple of errors in fts5 compilation. This branch still does not build with -Wall -Werror. 
FossilOrigin-Name: e9e76e12812b9b42b1142246b71cea98e26903aa
 2015-10-08 20:11:42 +00:00
drh
50065656f7 First attempt to add json1 and fts5 to the amalgamation. This check-in does 
not compile.

FossilOrigin-Name: d820a1bd1b8dd702d1b3a099af393530cc5a5d51
 2015-10-08 19:29:18 +00:00
mistachkin
08114efde4 Fix harmless compiler warning in FTS5. 
FossilOrigin-Name: 13adcd038fc20dd1b6f344f79b449b4034f8f8f2
 2015-10-07 17:06:17 +00:00
dan
a0f197b842 Update fts5 to support the table function syntax. "... FROM fts5_tbl WHERE fts5_tbl MATCH ?1 AND rank MATCH ?1" can now be written "FROM fts5_tbl(?1, ?2)". 
FossilOrigin-Name: 41d17d9e24303aed6d549ea23c62b93bf2f71691
 2015-10-03 15:38:57 +00:00
dan
bca189d5d8 Update fts5 to avoid using a statement journal for UPDATE and DELETE operations that affect at most a single row. 
FossilOrigin-Name: 5c83b9db46d61cfa76a1abed50467e2f02db0eb0
 2015-10-02 20:04:30 +00:00
dan
cf346d7a9c Fix a crash in FTS5 caused by specifying NULL as the rhs of a MATCH operator. 
FossilOrigin-Name: e8ed62f82e8acc40b818bf86fafe3d480687514e
 2015-09-17 09:48:01 +00:00
dan
bcb04b6128 Fix some compiler warnings in fts5 code. 
FossilOrigin-Name: 0dc436116e55e3fd55eb6085ada71e099069b32d
 2015-09-11 14:15:46 +00:00