mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,029 Commits 1,487 Branches 166 Tags 416 MiB
973bc6f1a8
Commit Graph

485 Commits

Author SHA1 Message Date
drh
973bc6f1a8 Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5 
into the amalgamation from trunk.

FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690
 2015-10-09 15:29:24 +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
drh
45fac88951 Trying to get FTS5 tests to build and run using main.mk. Not yet working. 
FossilOrigin-Name: 206174f9b154c590a3e2e94236db38e111d64bdb
 2015-10-09 01:42:49 +00:00
drh
c306e08ad5 Json1 tests are working. Builds without FTS5 enabled. Still some problems 
building with FTS5.

FossilOrigin-Name: 2928f8e87d2e5d121e6e7e5993cbb773bb2b0603
 2015-10-08 23:37:00 +00:00
dan
23fda8242c Further tweaks to main.mk so that fts5 builds as part of testfixture. 
FossilOrigin-Name: 97e11b79a52fb1c57f0afd2dbd6ee66cf00a922d
 2015-10-08 21:00:46 +00:00
dan
56eac26897 Fix further fts5 compilation issues. 
FossilOrigin-Name: 0d7f301fb03c8546a5dbce5d061a1d74e3c86bcf
 2015-10-08 20:40:18 +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
drh
32af5eda6a Merge recent enhancements from trunk, and especially the fix for 
ticket [1b266395d6bc10].

FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
 2015-09-30 14:50:39 +00:00
drh
2f20e13b83 Enable adding JSON1 by appending the json1.c source file to the amalgamation 
and compiling with -DSQLITE_ENABLE_JSON1

FossilOrigin-Name: 33404b2029120d4aabe1e25d484871810777e934
 2015-09-26 17:44:59 +00:00
drh
9ec0efd946 Merge all the latest trunk enhancements into the sessions branch. 
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
 2015-09-24 14:26:51 +00:00
drh
64ff56f91a Capture AFL-generated fuzz tests for json1.c into the test/fuzzdata4.db file. 
FossilOrigin-Name: 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
 2015-09-23 11:59:50 +00:00
drh
8911c0b339 Adjust Makefiles to use SQLITE_CORE when statically linking json1.c into 
test shells.

FossilOrigin-Name: 91682ac39e7db6a5dc8b75695a757449f068184a
 2015-09-19 16:45:43 +00:00
drh
d7f2beab86 Include json1.c in fuzzcheck and fuzzershell. 
FossilOrigin-Name: c4b68eff7f8f5402a9abf378157767b1c96a6101
 2015-09-19 14:32:51 +00:00
drh
91762f2d18 Merge the latest trunk enhancements. 
FossilOrigin-Name: 22ce9218fb2bb56cc5dd4e32077a16f669250d5f
 2015-09-14 10:47:29 +00:00
drh
7e698e9d71 In the "parse.out" output file from Lemon, show addition the complete text 
of rules on reduce actions.

FossilOrigin-Name: b6ffb7e471e51ff69668154ad2c8790e466c9d37
 2015-09-07 14:22:24 +00:00
dan
cce413202a Merge enhancements from trunk. 
FossilOrigin-Name: 4b49fe996989fe42d2bb1c24e7193fef09c5fc50
 2015-09-03 18:57:52 +00:00
dan
bea34fc53a Fix a problem with fts5 synonyms and phrase queries. Also fix an OOM handling bug in fts5. 
FossilOrigin-Name: a4c35fa2c94fe34b376670244fe72303c99868c1
 2015-09-02 17:34:22 +00:00
drh
5969c657ae Merge recent enhancements from trunk. 
FossilOrigin-Name: cb77236673e30af1e8749d984dedecc8f901b255
 2015-09-01 18:52:35 +00:00
drh
3be094df69 Link the json1 extension into the command-line shell by default. 
FossilOrigin-Name: 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
 2015-08-29 19:03:33 +00:00
drh
6fd5c1e0e8 Fixes for compiler warnings and errors in the makefiles. Rename the 
one test script to json101.test.

FossilOrigin-Name: 9ff6ccde5f26f18073587c320290570854ffc833
 2015-08-21 20:37:12 +00:00
drh
89a10b2d53 Merge recent trunk enhancements, include table-valued functions. 
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
 2015-08-20 23:54:25 +00:00
drh
03726aaf7f Merge support for table-valued functions. 
FossilOrigin-Name: 96a5d44d9fcb7b159c04630ad2d956fe27df5a43
 2015-08-19 18:31:11 +00:00
drh
398f872d1f Virtual table modules with a null xCreate method act as eponymous-only modules - 
they cannot be used in a CREATE VIRTUAL TABLE statement.  Add the series.c
extension that implements a postgres-like generate_series virtual table to
demonstrate this capability.

FossilOrigin-Name: c58426dbd5ea8b8440ebcc1214f79fa63d658216
 2015-08-19 13:54:20 +00:00
drh
5fa5c10784 Begin adding an extension that provides JSON SQL functions. 
FossilOrigin-Name: dde8afdd8dba1d92560326dca7c1cdfedbe5e070
 2015-08-12 16:49:40 +00:00
dan
d3789c0028 Add new test file fts5_test_mi.c, containing an implementation of a function similar to FTS4 matchinfo() for FTS5. 
FossilOrigin-Name: 4f9520a9dc9c667b7fda5b0822de2bf48184ac99
 2015-08-04 20:29:00 +00:00
drh
87c44ef2f7 Merge test improvements and minor fixes from trunk. 
FossilOrigin-Name: 0298a9a780695b666e7c683700d9f2f889d6f826
 2015-07-24 22:21:01 +00:00
drh
a523e31a87 New makefile target "fastfuzztest" runs the same tests as "fuzztest" but 
with a 100M memory size limit.  This more than doubles the speed.  The
original unlimited "fuzztest" is still run on a "fulltest".

FossilOrigin-Name: cfeb1b1c294c58222549d06819e9df2e300388fd
 2015-07-24 17:26:13 +00:00
drh
53e66c3cda More robust handling of zeroblob() with oversized arguments. Fix fuzzcheck 
so that it can be run with limited heap memory.

FossilOrigin-Name: 4e3e516a42059c97f42a7eb59bdf5cded0ff843a
 2015-07-24 15:49:23 +00:00
drh
244c8d7077 Merge all changes in the latest 3.8.11 beta into the sessions branch. 
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.

FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
 2015-07-23 21:59:58 +00:00
drh
cfb8f8d6a9 Change the name of the OTA extension to RBU: Resumable Bulk Update. 
FossilOrigin-Name: 017c5019e1ce042025d4f327e50ec50af49f9fa4
 2015-07-23 20:44:49 +00:00
mistachkin
bc50bb7f53 Further refine FTS5 cleanup in Makefiles. 
FossilOrigin-Name: b53a95063cf6b8ee8cad77e9fff4c50a356c43bb
 2015-07-14 21:56:53 +00:00
drh
38151adfe2 Merge trunk changes, including the addition of FTS5 and pcache1 performance 
enhancements.

FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
 2015-07-14 15:39:22 +00:00
mistachkin
ebad80e373 Refine cleaning of FTS5 files by Makefile targets. 
FossilOrigin-Name: e548d77b3c91cdf11c78d1a688fd768e209bdbf5
 2015-07-14 00:36:34 +00:00
mistachkin
68b134c73a Sync up Makefile clean targets for FTS5. 
FossilOrigin-Name: 43ead44ef6416d69602e123c3be7a258772837f1
 2015-07-04 00:04:37 +00:00
dan
a153bbc4c2 Copy fts5.h into the build directory as part of building fts5.c. Also remove code to edit fts5parse.c from various Makefiles and add it to mkfts5c.tcl. 
FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
 2015-07-02 20:12:34 +00:00
drh
bed6de557a Merge in the latest enhancements from trunks, especially the use of 
_byteswap_ulong() and similar intrinsics on MSVC.

FossilOrigin-Name: 85ca4409bdca7aee801e9fba1c49a87fabbf2064
 2015-07-02 18:47:12 +00:00
dan
3abdc44e7b Add fts5_source_id() SQL function, similar to sqlite_source_id(). 
FossilOrigin-Name: ec2573487cb86664f7f056168a764c28ca8236fc
 2015-07-02 18:16:02 +00:00
dan
3f09beda45 Remove "#ifdef SQLITE_ENABLE_FTS5" from individual fts5 source files. Add a single "#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5)" to fts5.c. 
FossilOrigin-Name: 7819002ed85497bbd0f9cf4d39df641573324436
 2015-07-02 15:52:21 +00:00
drh
59b4bd4840 Merge all the latest enhancements from trunk. This merge include FTS5 
and a number of notable performance enhancements.

FossilOrigin-Name: 39936b33b0668aad81aa574d4d74c92b0ddd218a
 2015-06-30 16:29:59 +00:00
dan
018a93d216 Remove unnecessary lines from fts3.h and main.mk. 
FossilOrigin-Name: c1b268ced38259706674ed2fcbf842d3fbd9fb8c
 2015-06-26 20:13:56 +00:00
dan
ed2589f555 Add a script to combine all fts5 code into a single file - fts5.c - that can be used to build an SQLite loadable extension. 
FossilOrigin-Name: 46e86b0637248fb4d623c97778cc041eabe3636c
 2015-06-25 20:10:24 +00:00
dan
c94a08100b Merge latest trunk changes with this branch. Add tests for columnsize=0. 
FossilOrigin-Name: ef44c71a22518727030dd90c0139af8973b05841
 2015-06-23 15:06:13 +00:00
drh
60c97e6aa8 Merge recent trunk enhancements and fixes. 
FossilOrigin-Name: c39cb0e2571f58c87053de009e2c135d71b2c3af
 2015-06-11 18:01:29 +00:00
drh
905da63a82 "test" targets on all makefiles use --verbose=file --output=test-out.txt. 
Add the new "quicktest" target to all makefiles - designed to run in under
three minutes.  The --quick option on releasetest.tcl now uses quicktest.

FossilOrigin-Name: 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
 2015-06-10 18:53:09 +00:00
drh
d1f2f9b90c Add the valgrindfuzz target to unix makefile. 
FossilOrigin-Name: e62aed01f1a6dbc12d6e21386c1671eb640b8d49
 2015-06-08 19:15:50 +00:00
drh
38b4149ca1 Factor out the TreeView parse tree printing module into a separate file. 
FossilOrigin-Name: c32ce54ca46a4be4373983be6fd44b1f3a0250d1
 2015-06-08 15:08:15 +00:00
drh
6c1f4ef217 Split more subfunctions of where.c out into a new whereexpr.c source file, 
for improved maintainability.

FossilOrigin-Name: 46ef95c108ad8961f2bf3d2dc839d4fb1fddd770
 2015-06-08 14:23:15 +00:00
drh
6f82e85a80 Split out the bulk of the actual VDBE code generation logic from where.c 
into a new file, leaving behind the analysis logic.  This makes the original
where.c smaller and hopefully easier to edit.

FossilOrigin-Name: faa0e420e93a2bc1c84df9eb9fef4748d29ce339
 2015-06-06 20:12:09 +00:00
dan
167fd757f0 Merge latest trunk changes with this branch. 
FossilOrigin-Name: c9ffda4abb4390bbc5719e269196e2807b254f97
 2015-06-02 18:07:58 +00:00
dan
3f3074e0c1 Remove the "#include sqlite3Int.h" from fts5Int.h. 
FossilOrigin-Name: e008c3c8e29c843ec945ddad54b9688bbf2bdb44
 2015-05-30 11:49:58 +00:00