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

19216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
drh
12e40cebb7 Merge the preupdate hook change from trunk. 
FossilOrigin-Name: 7353caabb31803ccff83fe188c4ee65e75c883de2beea79cbe17375a4a98d9ac
 2018-04-13 16:29:50 +00:00
drh
54f2cd905b Remove an always-true branch from the preupdate hook logic. 
FossilOrigin-Name: 0ab4518811b23bdb57feba55014cef07de66028f8fcbf8cf0831a712b2954b91
 2018-04-13 16:23:22 +00:00
drh
c8a0c90b62 Get the ON CONFLICT DO NOTHING form of upsert working by mapping it 
into INSERT OR IGNORE.

FossilOrigin-Name: d07f05e98bb9ce0f9b46db159d9df161b7499d6face6a5299ecd2d00a94fb8d0
 2018-04-13 15:14:33 +00:00
drh
d5af54207d Get the conflict-target clause parsing working correctly, with test 
cases.  This change involves an enhancement to sqlite3ExprCompare() which
needs to be reviewed on trunk prior to merging.

FossilOrigin-Name: 5bf704256206f84b3db7a5d8523215604eeb218ef8db86316d1e43ecd7248d6a
 2018-04-13 14:27:01 +00:00
drh
3b45d8bfb7 Improved conflict-target matching logic. 
FossilOrigin-Name: 98d32ba661f4ba662b639994b74352b695d53a33bc8a498bd09b9e02f794c81e
 2018-04-13 13:44:48 +00:00
drh
e9c2e772f1 Back off of the extended upsert syntax that allows multiple ON CONFLICT 
clauses.  The syntax now is exactly as in PostgreSQL and MySQL.  Add support
for WHERE clauses on the conflict-target phrase, for partial indexes.

FossilOrigin-Name: 2c1b1987d8de1efa8ed7e1f199710e32ff20edf8ceec570514fc63bb1ef264e0
 2018-04-13 13:06:45 +00:00
drh
788d55aa77 Begin adding upsert logic. This is an incremental check-in. 
FossilOrigin-Name: 809696434097e62e8ef486c7478b5eb62c0cf1342522a5584939fade82821410
 2018-04-13 01:15:09 +00:00
drh
fcfd756fe3 Break out the upsert code into a separate source file. 
FossilOrigin-Name: 389806b05f163687d8eb858b0f87f9a2d02e90af9f2097924a66715f05177613
 2018-04-12 21:42:51 +00:00
drh
4357e22637 Fix another typo in a comment. 
FossilOrigin-Name: 046bb6d25865041477f046f24c39a4791224f5b622ff70eda909d8ee3c097511
 2018-04-12 20:21:42 +00:00
drh
7007640f2e Simple comment clarification. No code or logic changes. 
FossilOrigin-Name: a26f9c9f89c24048cb77d5c0c8de37f46de7dce80f8bf49cadcd58b239dbdfa7
 2018-04-12 19:51:22 +00:00
drh
dab0eb58d7 Extend the upsert syntax to allow a WHERE clause on the UPDATE. 
FossilOrigin-Name: e4396c540a22fbc087a01050a32bfad514259d700c2381d7ac912580d7dca00f
 2018-04-12 17:28:06 +00:00
drh
6cd7d489db Update the upsert parsing so that it accepts conflict-target labels using 
the PostgreSQL syntax, and also accepts the MySQL "ON DUPLICATE KEY"
syntax.

FossilOrigin-Name: c48f64d8ae2625a19267b02e4a173a07766934235ad3052cd9d38f5ecbcbfbc3
 2018-04-12 15:43:05 +00:00
drh
46d2e5c35a Add the Upsert object for holding upsert clause information. 
FossilOrigin-Name: d83eaed539b274c2abd650d07522f491865d4917acbb64d05d01b3ba5c3cd446
 2018-04-12 13:15:43 +00:00
drh
35e86bf15d Merge changes from trunk. 
FossilOrigin-Name: 9f6f11805eb7cc02f7eb3044250f3981d46d2dbf0c421bd73e7f8b437390db25
 2018-04-12 12:25:45 +00:00
drh
2424aa723b Help the parser run faster by avoiding the "explain ::= ." production. 
FossilOrigin-Name: d7ec7b5970df9e542401f8299e098a5039d1875e2e3383dad06a0ec998589b6e
 2018-04-11 17:10:54 +00:00
drh
84fbff18d0 Prohibit bound parameters in the arguments to table-valued functions within 
a trigger.  Problem discovered by OSSFuzz.

FossilOrigin-Name: b7178209152452e82f5908513385018524472640d67547927d6b4c0aa0c15a46
 2018-04-11 16:04:01 +00:00
dan
d6189eafa4 Minor simplification to internal function generateSortTail(). 
FossilOrigin-Name: f32cdb41ca213cfcfe0bb5bfe56930d43e55525fa5640274b00f1ccce7f69634
 2018-04-11 14:11:53 +00:00
mistachkin
8384e43c18 Include the 'sqlite3rebaser_' APIs in the Windows '.def' file. 
FossilOrigin-Name: 56e4965f7ac850c59596120878434f5ef023e77919ef9416d20812eac764bac1
 2018-04-10 18:56:21 +00:00
drh
80aab206a4 Version 3.23.1 
FossilOrigin-Name: 4bb2294022060e61de7da5c227a69ccd846ba330e31626ebcd59a94efd148b3b
version-3.23.1 		2018-04-10 17:39:29 +00:00
dan
0493222ff8 Fix a problem causing the LEFT JOIN strength reduction optimization to be 
incorrectly applied in some cases where the WHERE clause of the query contains
a filter expression of the form "lhs.x IS NOT ?".

FossilOrigin-Name: 1fdaf2c34431adcac1c7ff29aae0623c4cbaa6a7f38e843c786bd407d8b3e730
 2018-04-10 15:31:56 +00:00
dan
6831dbedeb When testing, avoid injecting an OOM fault into a file-control call made by 
SQLite on an unopened file-descriptor.

FossilOrigin-Name: 9c1a5eba3ec37c877af4b83c6f8c05b7140304f3d23e49832ba63e321247fc8d
 2018-04-10 14:29:51 +00:00
drh
032495a34e Increase the version number to 3.23.1. 
FossilOrigin-Name: 9488c87b54ace8a92a52a368e8cf161dfdd24201bd6b60d50e88c2d92d592f0c
 2018-04-10 12:33:42 +00:00
dan
a1054dcc3f Fix a problem causing the LEFT JOIN strength reduction optimization to be 
incorrectly applied in some cases where the WHERE clause of the query contains
a filter expression of the form NOT(x AND y). Ticket [1e39b966].

FossilOrigin-Name: 38d319c153641ea4138fab2d5a47c31a86f57a071a1e1c299ca54c980cfb2b60
 2018-04-10 12:10:01 +00:00
drh
a2ce1b99a8 Remove an unnecessary SQLITE_UNTESTABLE compile-time conditional from 
the command-line shell.

FossilOrigin-Name: 80b75a34a2a4c11bc35b8638f8f05d999db416c81edc1a1c81aa5029f0301da1
 2018-04-10 10:37:33 +00:00
drh
eb557618d2 Update the top-level README.md file to point to the whynotget.html document. 
Put it on the correct branch, this time.

FossilOrigin-Name: a52e3cddea58b838e94e09a8488220a4406ff37d2cad8da05799d47fcf95ea38
 2018-04-10 00:53:36 +00:00
drh
5f17ef037e Update the top-level README.md file to point to the whynotget.html document. 
FossilOrigin-Name: 7dfd4543da7ef741852252d3c78ba89a919d737787e9e5118579e35fdfdeb24c
 2018-04-10 00:30:47 +00:00
drh
a5746e0317 Minor changes to the input grammar resulting in a faster and slightly smaller 
parser.

FossilOrigin-Name: a2c443c0ee9a0e0b2d10298b8a74ff00a1a66e3f96f4093348f0fef977587204
 2018-04-09 20:36:09 +00:00
drh
337679be4e Enhance the query planner so that it detects when the xBestIndex method 
of a virtual table gives out-of-sequence argvIndex values and reports an
error.  Secondary fix for ticket [2b8aed9f7c9e6].

FossilOrigin-Name: 9506ec14fb9e58986c1b79a3ca78430ad94b10966944c864e0429a7688dd1454
 2018-04-09 15:57:54 +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
0f1631db06 Improvements to ".wheretrace" output. 
FossilOrigin-Name: ea2e5b34bf35ade602dfcef359b64f810674f304fda14326b7f2dedefcc5f340
 2018-04-09 13:58:20 +00:00
dan
fe55da387a Add a "flags" parameter to experimental API sqlite3changeset_apply_v2(). Also 
add the SQLITE_CHANGESETAPPLY_NOSAVEPOINT flag.

FossilOrigin-Name: 3d29631fa7270b18f51de8cfe1285959e42ad9a673d5d2d5c016126f5f1b31a8
 2018-04-09 11:43:58 +00:00
drh
3517b312dc Fix a (harmless) signed integer overflow warning. 
FossilOrigin-Name: 43c2c60caf0ba105f57e32fc7fe6938dc29538c04d477a35b9b8bba2fb8fdd07
 2018-04-09 00:46:42 +00:00
drh
2c2e844a36 More complete parsing of UPSERT, including UPSERT within a trigger. 
The sqlite3Insert() logic to actually perform the UPSERT is not yet
implemented, however.

FossilOrigin-Name: 5cc2a5a315a2f26b392811de45b3dc352873a173c2c6c65f37ce2e5f88a71cd2
 2018-04-07 15:04:05 +00:00
drh
26cf56f80b Demonstration of how the parser can be augmented to recognize a 
PostgreSQL-style UPSERT.  This check-in implements parsing only.

FossilOrigin-Name: 9b22905b15791170998a5d1bcf42c7b60b5064f6848fff827bd55e864bf724aa
 2018-04-06 19:36:49 +00:00
drh
12f6839380 Enhance LEMON to show precendence of symbols and all rules in the report 
that is generated in parallel to the parser.

FossilOrigin-Name: 602fbd8149b53d8f0e9a223cc1aec912e7df03fca35071e8d707776ce225371c
 2018-04-06 19:12:55 +00:00
dan
3e259bcd96 Fix a problem in the sessions module causing sqlite3session_apply_strm() to 
allocate enough memory for the entire input buffer - which defeats the point
of a streaming interface.

FossilOrigin-Name: 7594e60935b0b5dcf764476dccdf9b403303818a0419a30bc2c16d58e44f6d04
 2018-04-06 16:22:25 +00:00
dan
9a3c375fce Fix an instance where an uninitialized VM register might be accessed. Fix for 
[093420fc0]. This problem was found by OSSFuzz.

FossilOrigin-Name: a3b02db74681a215996c5ed110eb0ece5ed24f71a1b131c10e9f33e666af0256
 2018-04-05 16:26:39 +00:00
drh
1d7b0a5d72 Fix the sqlite3WhereTrace mechanism so that it compiles with 
the --disable-amalgamation and the --enable-debug options to ./configure
using clang.

FossilOrigin-Name: 813224363d9ac22fcb37f657c4ac988f76fa39989301faec7206e9ba0b1f4476
 2018-04-05 12:02:27 +00:00
mistachkin
33fc27790a Fix segfault in 'eval.c' extension when used with 'empty_result_callbacks'. 
FossilOrigin-Name: e8b87bd4954437041139344d6d1ce3e4aace40ea6891b70f9c20cd95671270e7
 2018-04-04 12:21:33 +00:00
drh
b14e6de579 Fix an error message in speedtest1.c and make the "trigger" testset sensitive 
to the --size parameter.

FossilOrigin-Name: 5a6fd9e0156a14e6509c4ea713c4b332b2d050432b49571c7a45a7ecc7cb5da4
 2018-04-03 20:44:53 +00:00
dan
b278c594f1 Update speedtest1.c with new testset "trigger" based on the tests in 
speed4p.test.

FossilOrigin-Name: 7b7fa5fa0dd0dcef759ce1e22ade3a4e5fc8e8a244eac19b1abcc96d89c99721
 2018-04-03 20:00:09 +00:00
dan
22f60b847c Fix a few small test script issues affecting SQLITE_TEMP_STORE=3 builds. 
FossilOrigin-Name: e171f3722f78c58d2f20443e3bbcce2bd9701b8537f6e8d482ae804154d7a17f
 2018-04-03 17:05:13 +00:00
drh
92a2ec00eb Fix the generate_series virtual table so that it correctly returns no 
rows if any of its constraints are NULL.
Ticket [fac496b61722daf28].

FossilOrigin-Name: 3328e828e28ca7198fd1ce84503e649ab2278913a2cf85a0f0391f31d0c9c8d7
 2018-04-03 14:25:51 +00:00
drh
9881155d54 Change the LEFT JOIN strength reduction optimization so that assumes that 
virtual table constraints can be true even if terms within the constraint
are NULL.  This works around dodgy virtual table implementations.

FossilOrigin-Name: cbb977fe1908431f3aad8e67668588b119e7d491724f2042af436f509a4f6623
 2018-04-03 14:04:48 +00:00
drh
18e2b8af1c Version 3.23.0 
FossilOrigin-Name: 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2
version-3.23.0 		2018-04-02 11:04:16 +00:00
drh
4de3353d4a Better solution to the LIKE problem from the previous check-in that works 
even if the SQLITE_LIKE_DOESNT_MATCH_BLOBS compile-time option is used.

FossilOrigin-Name: b850dd159918af568c55c00ff146ba9c9c04d33ff384fe1eb0ad74164bc401bb
 2018-04-02 00:16:36 +00:00
drh
1f0ecc79b0 Fix a logic error discovered by OSSFuzz. 
FossilOrigin-Name: fc06ddd458fc1028b33b3927cc3b113b7106caa67136993de2e57926a8a19623
 2018-03-31 23:28:55 +00:00
dan
4f9a7e5cb7 Fix an assertion failure triggered by a SELECT with a compound sub-query that 
contains an incorrectly placed ORDER BY clause. This problem is just an
assert() failure - non-DEBUG builds are not affected. Problem found by
OSSFuzz.

FossilOrigin-Name: 823779d31eb09cda5effe747d9adb35e600a52d4274226586437f674e7824d91
 2018-03-31 16:31:51 +00:00
drh
58bd03320d Fix a bug in the spellfix extension causing it to compute suboptimal answers. 
The problem was introduced by check-in [afd6fbc01052ccfc9].

FossilOrigin-Name: 3bf28fd9a70ebefc464dceda124d6ed342dd83f71eeeb0568f79e34e731a073e
 2018-03-30 16:34:04 +00:00
drh
9f95e48d94 Fix an off-by-one error in the dist3 algorithm of the spellfix extension. 
FossilOrigin-Name: 5c34af7b975598bbe20751dfdd346f43031cb2bcb6b78f1bbdb2b51b398de182
 2018-03-30 15:59:54 +00:00