64919e9b00
Merge patches and enhancements from trunk.
...
FossilOrigin-Name: da53f3d3ff26cc32d3a5ac788b6785baa3d1688e50d9354025a3130dc7e71a38
2018-12-28 19:23:20 +00:00
4177c8a2b7
Fix another problem with loading the structure record from a corrupt fts5
...
database.
FossilOrigin-Name: c4d44542d259bbec11aea60ae94fcb4acd53e97e125723cae078cf0f8873f8ef
2018-12-28 18:09:45 +00:00
eefc72d12f
Avoid an undefined left-shift operation in fts5 caused by malformed utf-8
...
text.
FossilOrigin-Name: c3a3a11194586bef80a9d7ca54caae8af30d4e7b464b8bb3d257ba2d2ec4791f
2018-12-28 14:33:55 +00:00
666636b6de
Fix a buffer overwrite in fts5 triggered by a corrupt database.
...
FossilOrigin-Name: a385298df264dbfa6765f63ad8708f74bc8e8a1404239c1049890b39a1bda888
2018-12-28 13:57:30 +00:00
b163b57212
Fix problems in fts5 found by ASAN.
...
FossilOrigin-Name: c564bf870106faef297594a51995619c80311d06bd5f8a0c7644f666f22ba576
2018-12-28 07:37:22 +00:00
593c716781
Fix another problem with corrupt database handling in fts5.
...
FossilOrigin-Name: fb0d7fba07865ff557bfcdacfda7b625d099ac8b4dcbe0c08cd2d4b84a068bb9
2018-12-27 20:12:02 +00:00
e80834f6ff
Fix another problem in fts5 caused by a corrupt schema record.
...
FossilOrigin-Name: ff45f9dd69fe1e1c7875e5bb73ac3dde2a31746475d3765cda9233f8e06e26ca
2018-12-27 15:36:16 +00:00
cd80dc3667
Fix a null-pointer dereference that could occur in fts5 with a corrupt
...
database.
FossilOrigin-Name: b0a49d5e6df116bb5eacb60a0bb0f482760aec38bd417d4250d9e57d43bdbb13
2018-12-27 07:46:37 +00:00
0f55a571fc
Avoid an "unitialized value read" problem in fts5 that can occur with a
...
corrupt database.
FossilOrigin-Name: 6cae81cd1ffb0180e0260d5ba921502c7dee2f54637bff3558a4d1cb5dfd3f32
2018-12-26 16:57:47 +00:00
c2909bf8ac
Fix a problem with handling corrupt databases in the fts5 integrity-check
...
function.
FossilOrigin-Name: 9bad745d373f4686a2726c3f77a2ccad60e7181645d7ed483a2e43075a4ef30c
2018-12-26 16:04:54 +00:00
d8f3b4c320
Fix a problem with corrupt fts3 database detection introduced by [95a9a39f].
...
FossilOrigin-Name: c80bb15b44e9b6a3c0c5a49d5e93e66376c3520ecefc1db7425c8a7e09d3eade
2018-12-26 14:15:09 +00:00
8625221444
Fix a problem with the CSV extension when it uses the "header" option on
...
a real file.
FossilOrigin-Name: 7acaed08f946633fca3ab8434dd6349ea6f1bac4fd9ec21f476db013ee06de30
2018-12-26 12:50:47 +00:00
e4c26c41b4
Fix a typo in a comment that is used to generate session documentation.
...
FossilOrigin-Name: a1f50d57ce76f6c08a0ddbdd3c3fe2732d0e57dda14cb9aa3da00a14ceb4bc44
2018-12-25 11:17:50 +00:00
bd462bcc10
Improvements to EXPLAIN QUERY PLAN formatting. The MULTI-INDEX OR now shows
...
a separate "INDEX" subtree for each index. SCALAR SUBQUERY entries provide
a subquery number that is related back to the .selecttrace output.
FossilOrigin-Name: 7153552bac51295c56a1c42ca79d57195851e232509f9e9610375692f48c7e86
2018-12-24 20:21:06 +00:00
1ab76166e3
Change another fts5 assert() that may fail with a corrupt database to an
...
assert_nc().
FossilOrigin-Name: d9653380c455b4bf6c371540d677cbde6d17664c58662b5cc9a12929f46192dd
2018-12-24 19:59:37 +00:00
29e9af8848
Change the way a comparison used to detect corrupt databases in fts3 is done
...
to avoid potential pointer overflow in 32-bit builds.
FossilOrigin-Name: 95a9a39ff784b960b62dd6298e722a620ba3f9c8b76839a49bbef35d7bc84a8e
2018-12-24 13:34:36 +00:00
6a509d56bc
Catch another case of a corrupted structure record in fts5.
...
FossilOrigin-Name: fb17fea4b9779fbd3adb6ff9500da83a6ca4fa7cba379aa70074e4328814a7f2
2018-12-22 19:54:17 +00:00
862faf28bb
Change a faulty assert() in fts5 that could fail on a corrupt db to an if() statement.
...
FossilOrigin-Name: 1daaba9fb46706af8ed0669a661c304df999a69cf639d29d93208f422c515d8c
2018-12-22 19:09:46 +00:00
11d07ed643
Fix one more instance of excess whitespace in test result strings.
...
FossilOrigin-Name: c064964deb0b7220ba784f07ca9c603680f3c8bb936d56ab4eca1962beac1359
2018-12-22 16:14:45 +00:00
3a07548b0d
Remove unnecessary whitespace from testcase result strings.
...
FossilOrigin-Name: ad70f03ceda74163903d247a975666b35fae722a27c48dd3efd31c1164b5627e
2018-12-22 15:46:23 +00:00
b63d6070ee
Fix an assert() in fts5 that could fail with a corrupt database.
...
FossilOrigin-Name: 83935b950619855fb3bf05486091804ac2a61fb993c6ec826c89f943264fabc3
2018-12-22 15:21:31 +00:00
634ac14488
Fix a "jump or move depends on uninitialized value" valgrind error that could
...
occur in fts5 when dealing with a corrupt database.
FossilOrigin-Name: 3518c09b944c92974939b1de244401afd34de5d9aa75050e5ad55581a94e1e71
2018-12-22 13:34:52 +00:00
fb11bf8c91
Avoid a left-shift of a negative value (undefined behaviour) when dealing with a corrupt database in
...
fts3.
FossilOrigin-Name: b851d12474035328df8354c7da8d81bc78833c8c704153f9f573c19b47a8487e
2018-12-22 09:39:06 +00:00
cde4bf8ba7
Improved detection of shadow table corruption in RTREE.
...
FossilOrigin-Name: b39bf4356e6bcf1d8442721d6cbbfe06caba01325104fb469da8fe69e1f623a2
2018-12-21 22:08:59 +00:00
deb201b866
Use SQLITE_PREPARE_NO_VTAB in rtree as well.
...
FossilOrigin-Name: 82a2ae7132964eab0dfad9a8314a399ffd3b72366b35e1767df6452125dd1d80
2018-12-21 19:55:20 +00:00
38e3853240
Add tests for the use of SQLITE_PREPARE_NO_VTAB in fts5.
...
FossilOrigin-Name: 1999612010e310fc2430d1f00076f69fade0c66d202771dbb0f3d5597ac0a03c
2018-12-21 19:30:18 +00:00
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
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
687e20079c
Fix the node hash function in RTREE to ensure that it always returns a
...
non-negative value.
FossilOrigin-Name: 0bf4c70a6849da74797e8616a4f3730492ad02882ae67a0fe0f3b3cc3f1043b4
2018-12-21 18:17:35 +00:00
273e01b4c6
Fix a potential NULL-pointer deference in RTREE due to corrupt shadow tables.
...
FossilOrigin-Name: 1fdd3604eef880414682e9e6f74d714520fe1c63f267ec4da752d2dc1da6bf72
2018-12-21 17:51:30 +00:00
fb077f3c50
Prevent an infinite loop in rtree that can result from a corrupt shadow table.
...
FossilOrigin-Name: 085667180b230587abb82abfdd14da8859e23620994d5cf152236b64c756dd04
2018-12-21 16:53:58 +00:00
1429eca9d4
Fix the RTree extension so that it correctly ignores constraints that it
...
does not understand, even if they are against a dimension column.
FossilOrigin-Name: ed8531e57596f0d5911a05a26d5ae61e1eccfaadee49219d7f6e212cac288238
2018-12-21 15:13:49 +00:00
558ef11ad9
In RTREE, turn an assert() into an if() because the condition can
...
sometimes be false when dealing with a corrupt database.
FossilOrigin-Name: 99bce4358beb5dbaba47048ee2eec5c376dcd86e5b1462238a37ea4c5f3d77db
2018-12-21 13:30:34 +00:00
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
bef06d2637
Fix errors in comments in fts5.h.
...
FossilOrigin-Name: 4002790d9418289f3e090c694f651a89d8f523119c8ce2f396999b0387148241
2018-12-15 07:12:34 +00:00
3c2db5def6
Fix harmless compiler warnings.
...
FossilOrigin-Name: 27221c69901d2b4546167639c4a3c8f54b2e18820f1346870fa26b7c919027db
2018-12-14 18:11:02 +00:00
fa94d492c8
Fix a harmless compiler warning in Sessions.
...
FossilOrigin-Name: fc9791ea987352e3e1322fbb7f833c23b402432af8249f9d397c6f7456788637
2018-12-14 13:47:17 +00:00
dc6214ee39
Fix a problem with using "<db>-vacuum" (the default) as the state database
...
when resuming an RBU vacuum.
FossilOrigin-Name: c878d741733a897d47a1a0b57b454bc9095ce302b48cc01089336d5d20e2a24c
2018-12-10 08:41:32 +00:00
f8c2fea195
Remove the unused sqlite3Fts5UnicodeNCat() function.
...
FossilOrigin-Name: 7149dacf1d440a19f62808b4591c3fa8da202b2ec742d5490a63f2ec005ff9e7
2018-12-03 17:40:46 +00:00
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
1ba88c7f1d
Fix a typo in a comment. No changes to code.
...
FossilOrigin-Name: 23684cb841ac2cb0d69e5470253bd96feb733762a7553b952a08470834fe85fa
2018-11-30 20:59:00 +00:00
f7c44f9bd2
Fix the name of the trig function approximation in geopoly. No functional
...
changes to the code.
FossilOrigin-Name: 33576b12b450a37b467ba012e77b297eb80d7147b12a5b23302009bb32455720
2018-11-29 12:00:02 +00:00
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
52f0c6205c
Fix a bug in the geopoly_ccw() function. Test cases in TH3.
...
FossilOrigin-Name: 773c5c1d9c0ec40c51949c38c9dc17e778086f3f92791cca9b85288de0076dab
2018-11-24 20:44:46 +00:00
20b3fc4db1
Add SQLITE_CONSTRAINT support to the xBestIndex methods on dbstat,
...
sqlite_dbpage, and zipfile.
FossilOrigin-Name: 5cd24e552b4fed71cfb2e37929371175682f23f1430df2900a87e6a5823d138e
2018-11-16 20:18:07 +00:00
d16f26a708
Update the explain virtual table to make use of SQLITE_CONSTRAINT.
...
FossilOrigin-Name: b2d41ff7027b44ccb5dffc303c47d42f1f6fd66ce22e90450d3a666c73fe8b8e
2018-11-16 19:19:58 +00:00
43579191e8
Fix the JSON table-valued functions to make use of SQLITE_CONSTRAINT.
...
FossilOrigin-Name: 3f34f4f561c77f8ec88906818f2984dcf8f17d1645bac175e9027595517560bc
2018-11-16 16:04:50 +00:00
a69262c0f2
Add an assert() to the generate_series virtual table to verify
...
assumptions about the design.
FossilOrigin-Name: cd13b499a20a7d476edb8500537edef4c5151410ba0300469ebf0f7ba16964b8
2018-11-16 15:41:27 +00:00
e4f90b7075
Update the generate_series() table-valued function to make use of the new
...
SQLITE_CONSTRAINT return from xBestIndex.
FossilOrigin-Name: 4372ad644dda5a1fa46b6b6070092320c835439b41f598cbc041e9deef786988
2018-11-16 15:08:31 +00:00
32dcc847b5
Enhance the xBestIndex interface of virtual table so that if the xBestIndex
...
method returns SQLITE_CONSTRAINT then that particular combination of
constraints is considered unusable and does not participate further in
query planning.
FossilOrigin-Name: 684013cef6bfcfd920a4aec645df9f5d41ace8b34e75fca61759c1b4f82cc89e
2018-11-16 13:56:15 +00:00
drh