]>
git.ipfire.org Git - thirdparty/sqlite.git/log
dan [Sat, 15 Apr 2017 14:30:01 +0000 (14:30 +0000)]
Add header comment for sqlite3_vtab_collation().
FossilOrigin-Name:
d238694ca445ccb4eeb3e3269a5f872f998f795945d0f9dd95c11d0e42d4d538
dan [Sat, 15 Apr 2017 14:16:04 +0000 (14:16 +0000)]
Fix memory leaks in the code on this branch. Make use of the
sqlite3_index_constraint.usage field. Do not try to handle ORDER BY terms with
explicit COLLATE clauses - they don't get passed to the vtab layer anyway.
FossilOrigin-Name:
0cd75a872c89958a7f418720a0e8c6f638f8284c488f666015c19136feae6be8
dan [Fri, 14 Apr 2017 19:41:37 +0000 (19:41 +0000)]
Modify the code in ext/expert/ to use the vtab interface instead of
sqlite3_whereinfo_hook(). Remove sqlite3_whereinfo_hook().
FossilOrigin-Name:
3bb6585004090dbf92dd5e9abdf0fd2c921e64b5b3121c4fb7446db764ab59e5
dan [Thu, 13 Apr 2017 16:19:40 +0000 (16:19 +0000)]
Update this branch with latest changes from trunk.
FossilOrigin-Name:
5fcd840cf9b6a5c3ee4ef1e8f92f6c30f96a7899a3d774ee9be8a816916f2c3b
dan [Thu, 13 Apr 2017 15:51:27 +0000 (15:51 +0000)]
Reinstate the SQLITE_API qualifier on the sqlite3_delete_database() method in
test_delete.c. Accidentally removed by the previous commit.
FossilOrigin-Name:
59c70108fd179932ccdd860f93e1cd68b77476d3b1af1af00cf6e378c9984862
dan [Thu, 13 Apr 2017 15:36:47 +0000 (15:36 +0000)]
Update the code in test_delete.c to use the "win32" VFS if SQLITE_OS_WIN is
defined.
FossilOrigin-Name:
fa9bb7b768027677f7e7d5a196ba5b245dfc8d8986ccd101c8dab671bd15719d
dan [Thu, 13 Apr 2017 09:45:21 +0000 (09:45 +0000)]
Allow a user column name to be used on the LHS of a MATCH operator in FTS5.
FossilOrigin-Name:
6f54ffd151b0eca6f9ef57ac54802584a839cfc7373f10c100fc18c855edcc0a
drh [Thu, 13 Apr 2017 00:12:32 +0000 (00:12 +0000)]
Fix a regression caused by the fix for ticket [
6c9b5514077fed34551f98e64c09a1 ] -
control characters allowed in JSON.
FossilOrigin-Name:
8e7b611863247a3bf46a96ec4b47d24c0ae0d60c9cee968a1cfd1da157e7c9bb
dan [Wed, 12 Apr 2017 17:50:12 +0000 (17:50 +0000)]
Update fts5 to support "<colset> : ( <expr> )" for column filtering, as well
as "<colset> : NEAR(...)" and "<colset> : <phrase>".
FossilOrigin-Name:
c847543f8bb1376fef52bca72b4191162a32eb7e6c5f0cd1aa0ab116b3183396
drh [Wed, 12 Apr 2017 17:38:24 +0000 (17:38 +0000)]
Improved \n and \r escapes in the ext/misc/dbdump.c utility function. The
implementation of dbdump.c now matches the implementation in the CLI.
FossilOrigin-Name:
f2643315bb41a71eebd79f5d671f9163187e299a52ff8a481186f1e8fa7e5262
dan [Tue, 11 Apr 2017 20:48:30 +0000 (20:48 +0000)]
Avoid updating unaffected indexes on a table as part of an UPDATE that
requires foreign key processing in some cases.
FossilOrigin-Name:
7aae5c0f99aa2fda85654242cfc9e23a0f981d9ce4ab17610d619cd208540b3d
dan [Tue, 11 Apr 2017 19:58:55 +0000 (19:58 +0000)]
Avoid updating unaffected indexes on a table as part of an UPDATE that requires
foreign key processing in some cases.
FossilOrigin-Name:
477bea9ed0dd0fa69896bfd16d9b1d22170cbab784e3279ce65c29c47e032f34
dan [Tue, 11 Apr 2017 19:00:30 +0000 (19:00 +0000)]
Update this branch with latest trunk changes.
FossilOrigin-Name:
0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc
drh [Tue, 11 Apr 2017 18:55:05 +0000 (18:55 +0000)]
Limit the depth of recursion for valid JSON in the JSON1 extension in order
to avoid using excess stack space in the recursive descent parser.
Fix for ticket [
981329adeef51011052667a9 ].
FossilOrigin-Name:
1f68c184596912d742b50b1ca38252a9e783aacf121619a27b17a7ae9f6df041
dan [Tue, 11 Apr 2017 18:29:14 +0000 (18:29 +0000)]
Fix a formatting issue in the output of the sqlite3_expert program.
FossilOrigin-Name:
cc8c3581060ffef02290b680183e6f6bc9837ba3550e74c8aaabdc7c45edc223
drh [Tue, 11 Apr 2017 18:06:48 +0000 (18:06 +0000)]
Smaller and faster implementation of exprMightBeIndexed().
FossilOrigin-Name:
76cd611d41465fcec61c21520d55172cb236530f38386b7d4a5544ba87de2353
dan [Tue, 11 Apr 2017 17:43:12 +0000 (17:43 +0000)]
Add header comments to the API functions in sqlite3expert.h. Include a list of
all candidate indexes in the report output by the sqlite3_expert program.
FossilOrigin-Name:
0c45c5eb9f0f171b8d7c5f0d2973f9f59915467506cdff1450f3e4b2134a01ca
drh [Tue, 11 Apr 2017 16:44:39 +0000 (16:44 +0000)]
Very slight smaller and faster sqlite3SelectNew()
FossilOrigin-Name:
4143650c4ce32289d2301cdfc69bb10877246420f656bed122886f6803fc956a
drh [Tue, 11 Apr 2017 12:20:54 +0000 (12:20 +0000)]
Add an ALWAYS() around an unreachable condition in sqlite3VdbeMemGrow().
FossilOrigin-Name:
0f3eb61f44c94234ffc14c3a493a27ec62c0d1e2bb62798f36eafa98ddcdc58e
dan [Tue, 11 Apr 2017 11:52:25 +0000 (11:52 +0000)]
Fix a segfault that could occur if an indexed expression was used in a
comparison operation within the result-set of a SELECT statement.
FossilOrigin-Name:
d6bb7c42ff6309ce168ccdcf03b4cdabfccfc9e2a911d254ac7dc4fea4aa2bc1
drh [Tue, 11 Apr 2017 01:30:42 +0000 (01:30 +0000)]
When using an index on an expression, try to use the columns of the index
rather than pulling columns from the table and reevaluating the expression.
FossilOrigin-Name:
a47efb7c8520a01110ce3b3531ebe1bab6720780d67fba001992c44c5807d332
drh [Tue, 11 Apr 2017 01:01:27 +0000 (01:01 +0000)]
Improved comments. Fix a problem when an indexed expression is used in an
ORDER BY clause.
FossilOrigin-Name:
c59eaf2b7cd2596733f349fc0fe979f71fd29bd73152a0c57066e0b69d5b7a4a
drh [Mon, 10 Apr 2017 23:42:04 +0000 (23:42 +0000)]
drh [Mon, 10 Apr 2017 20:51:21 +0000 (20:51 +0000)]
drh [Mon, 10 Apr 2017 20:27:54 +0000 (20:27 +0000)]
Slightly smaller and faster sqlite3VdbeMemGrow().
FossilOrigin-Name:
efd1702ae8da8e0dd3d2ee7bd5a1bd8aeff2b370498e404041fcb406fdaf72e4
dan [Mon, 10 Apr 2017 20:00:26 +0000 (20:00 +0000)]
dan [Mon, 10 Apr 2017 16:13:20 +0000 (16:13 +0000)]
Changes to allow the code in sqlite3expert.c to be tested directly (via the
API in sqlite3expert.h) instead of by invoking the sqlite3_expert application.
Fix memory leaks and other problems.
FossilOrigin-Name:
5dd9831721b70a89a26728adcd49c7f6103ef8266891a79c2db34d913702709e
drh [Mon, 10 Apr 2017 12:31:15 +0000 (12:31 +0000)]
Add a new JSON test case to verify that all control characters are escaped
in the json_quote() function.
FossilOrigin-Name:
6ee12221fa252784c897a24ae8cff64dfe6149cbc9020abe14539df33202d892
drh [Mon, 10 Apr 2017 12:25:05 +0000 (12:25 +0000)]
Change the JSON extension so that it disallows control characters inside of
strings. Fix for ticket [
6c9b5514077fed34551f98e64c09a10dc2fc8e16 ].
FossilOrigin-Name:
475d8f82ec61a4ff3e6a7650731230ccecb6cc580d1397d189d0ba479d9bad4d
drh [Sun, 9 Apr 2017 19:23:55 +0000 (19:23 +0000)]
Do not expose the name of the internal Mem object in the public interface
defined by sqlite3.h.
FossilOrigin-Name:
19dd753f9e50fee247b1ab141669817c7e88bc3f6d6065dba6c731db9f7a2409
dan [Sun, 9 Apr 2017 08:38:37 +0000 (08:38 +0000)]
Fix the -file option on the sqlite3_expert program.
FossilOrigin-Name:
0857c48e02a76490fc623364f77363165dea94ec254f93d8f0fd0bac2968c572
dan [Sat, 8 Apr 2017 19:00:37 +0000 (19:00 +0000)]
dan [Sat, 8 Apr 2017 18:56:32 +0000 (18:56 +0000)]
Rename shell6.test to expert1.test. Have it invoke the sqlite3_expert binary
if it is present.
FossilOrigin-Name:
be0deff940bea4f653d644113f42529a32ff7039d1d168119233aaf000a22f40
drh [Sat, 8 Apr 2017 18:18:22 +0000 (18:18 +0000)]
Disallow leading zeros on numeric constants in JSON.
Fix for ticket [
b93be8729a895a528e2 ]
FossilOrigin-Name:
204e72f0080e8f08f99978870bd3cb9d59b068ecffee82192d707c650548b43b
dan [Sat, 8 Apr 2017 17:41:24 +0000 (17:41 +0000)]
Use hash tables instead of in-memory database tables for a few purposes in
sqlite3expert.c.
FossilOrigin-Name:
bf10e68d9e4d5eae7ae6148a7ad64c9596f2ed8ccd36065adb09a1f9e7dae50b
dan [Sat, 8 Apr 2017 14:11:47 +0000 (14:11 +0000)]
Expand on the comment above OP_Destroy to explain why it throws an error if
there are any active reader VMs.
FossilOrigin-Name:
b9a8c2b9bec9f537b2d5aff6659a5748b1f70b53519a1f9dfceb5209154eca8e
dan [Sat, 8 Apr 2017 13:52:41 +0000 (13:52 +0000)]
Have the rtree module close any open blob-handle within the xSavepoint method.
This prevents such an open blob handle from interfering with DROP TABLE
operations.
FossilOrigin-Name:
fa4416adc2a9a3a80db1d5befc0b95c3d0fc41affe38f7f2f45cdfae3f1b49eb
drh [Sat, 8 Apr 2017 13:42:55 +0000 (13:42 +0000)]
Fix the quoting mechanism for ".dump" so that it is not applied for the
".mode quote" output.
FossilOrigin-Name:
78c1e90305d48917d9423d8e50a7dfd15ec27aa93cb421610062229c7ede13a6
dan [Sat, 8 Apr 2017 09:12:20 +0000 (09:12 +0000)]
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
drh [Sat, 8 Apr 2017 01:09:14 +0000 (01:09 +0000)]
Make sure the RTree sqlite3_blob handle is reset prior to renaming the table.
FossilOrigin-Name:
1cdae2db3c54970a1811e597065724578408c84d49d75b8fe25d56281ddc2e94
drh [Sat, 8 Apr 2017 00:55:13 +0000 (00:55 +0000)]
Fix the ".dump" command so that it works with ".headers on". Also fix the
display of ".mode insert" with ".headers on".
FossilOrigin-Name:
a6ce57ee3c7f3527554a75cc1dd5ebcd33c944d4dca07b134d103596a2ae5b32
drh [Fri, 7 Apr 2017 20:20:08 +0000 (20:20 +0000)]
Use replace() instead of char() to quote newline and return characters in
strings in the output of .dump, to avoid excess expression complexity.
FossilOrigin-Name:
7307352988174a6c2756dbbe200bf62a45fb4cc1da7faa2c6b0f75e229eab703
dan [Fri, 7 Apr 2017 20:14:22 +0000 (20:14 +0000)]
Refactor code to suggest indexes from the shell tool into an extension in
ext/expert. Unfinished.
FossilOrigin-Name:
305e19f976ca064638a294e0817bf547ea745e1eb74746c5855514e6ced9c5fa
drh [Fri, 7 Apr 2017 19:52:13 +0000 (19:52 +0000)]
drh [Fri, 7 Apr 2017 19:41:31 +0000 (19:41 +0000)]
Proof of concept for the ability to use the expression columns in an index
on expressions in place of equivalent expressions in the result set or in
the WHERE clause. This check-in compiles but is mostly untested.
FossilOrigin-Name:
a52ef2ad7c0e14b78b801f16a1f6ea8d8fa9ae5d7d810e18dd24c600b662a312
drh [Fri, 7 Apr 2017 11:45:58 +0000 (11:45 +0000)]
Use replace() instead of char() to quote newline and return characters in
strings in the output of .dump, to avoid excess expression complexity.
FossilOrigin-Name:
4c2b572969ea2ed2a925444ecfa356aa877018cbb9c4f57d081ab4b535cd1dd0
dan [Thu, 6 Apr 2017 18:44:18 +0000 (18:44 +0000)]
Changes to allow indexes to be recommended for queries on SQL views.
FossilOrigin-Name:
0884ff1da2e27b146c764b73cf299a1f2cfe213c4a79bde34dec02d1fc946e70
dan [Thu, 6 Apr 2017 14:56:26 +0000 (14:56 +0000)]
Fix the ".lint fkey" shell command for cases where the child key is also an
INTEGER PRIMARY KEY.
FossilOrigin-Name:
48826b222c110a90996a84605318ea6b1e502b8c5129f4d561f8350dbdbcd264
dan [Thu, 6 Apr 2017 12:06:56 +0000 (12:06 +0000)]
Fix the ".lint fkey" shell tool command so that it works for foreign keys that
refer implicitly to primary key columns with non-BINARY default collation
sequences.
FossilOrigin-Name:
327eff25ba2420267cc8dc49dd3c3aab45f4bf9e060d1ad480e25d016d21f3ba
drh [Wed, 5 Apr 2017 13:44:40 +0000 (13:44 +0000)]
Remove a confusing and pointless sentence from the documentation for the
sqlite3_interrupt() interface.
FossilOrigin-Name:
c5f1a2b6eb3df879d247a22b3f92f4f74fcf4f0d219450abc420ae6d02481324
drh [Wed, 5 Apr 2017 12:39:49 +0000 (12:39 +0000)]
Split off sqlite3DbFreeNN() from sqlite3DbFree() and use it in cases where
we know that the argument to be freed is never NULL.
FossilOrigin-Name:
ad90e8bb5e47945607c8fb47b6ade8cfc52a9b684805cc40132629be0ecc14cc
drh [Wed, 5 Apr 2017 11:57:56 +0000 (11:57 +0000)]
Save a few bytes and a few CPU cycles in sqlite3ExprListDelete() routine.
FossilOrigin-Name:
9e6c939144a129b36bb119120442a4a021e00187783da211315d4bb13acd7c3a
drh [Wed, 5 Apr 2017 11:49:06 +0000 (11:49 +0000)]
Remove a conditional made unreachable by the previous ExprList enhancement.
FossilOrigin-Name:
a1cf44763277b6c745b5b5509ca9129b6c3231608b4d1c8aec2815b64b5a2a07
drh [Wed, 5 Apr 2017 11:32:13 +0000 (11:32 +0000)]
Combine the ExprList_item objects and the ExprList wrapper into a single
memory allocation, for improved performance and reduced footprint.
FossilOrigin-Name:
2b6560ad88b92820c383bcdc1e30c06f8b081ef7c6d9b1af71d2bb76c83e35cd
drh [Wed, 5 Apr 2017 10:54:14 +0000 (10:54 +0000)]
Attempt to remove bash-isms from configure.ac. Use -O0 with --enable-debug.
FossilOrigin-Name:
71ed35ccf7c0f6c49118a44cf6621f46b9ea883e4a74d51b8b1ade6d9a95413a
dan [Tue, 4 Apr 2017 19:58:54 +0000 (19:58 +0000)]
Fix a problem causing "PRAGMA integrity_check" to disable the xfer
optimization for subsequent VACUUM operations on tables with one or more CHECK
constraints. This could result in VACUUM producing slightly larger database
files.
FossilOrigin-Name:
e5bb7db51cdfd8124c60329782798cea398733545594dab55cb892b2a08c4d29
dan [Tue, 4 Apr 2017 17:50:31 +0000 (17:50 +0000)]
Add some support for OR terms to sqlite3_whereinfo_hook().
FossilOrigin-Name:
5cd070000da1d9e399090677b4db75dc5639c33211385d6eb84f14a4d0b617cd
dan [Tue, 4 Apr 2017 04:23:06 +0000 (04:23 +0000)]
Add the sqlite3_whereinfo_hook() API - an experimental API replacing the
DBCONFIG_WHEREINFO hack on this branch.
FossilOrigin-Name:
a54aef35da11f7508a8888a159372036a362fc52afa1df752dc835db334c4330
drh [Mon, 3 Apr 2017 14:07:08 +0000 (14:07 +0000)]
Avoid an unnecessary call to sqlite3WhereGetMask() inside of whereShortCut().
FossilOrigin-Name:
5c11f4303f6a33d6358f451244551be63baf9afe5630332e60b349215e20a3af
dan [Mon, 3 Apr 2017 13:59:22 +0000 (13:59 +0000)]
Do not attempt to run sync2.test with SQLITE_DISABLE_DIRSYNC builds.
FossilOrigin-Name:
658f08ce84b45f057843263961f6c47a322f841764134ec38f35719f0f2042d7
drh [Mon, 3 Apr 2017 13:33:51 +0000 (13:33 +0000)]
Force a schema load prior to "PRAGMA optimize".
FossilOrigin-Name:
86897c24c0b35ffea8df72d86a099addf67de210c6568aaba22ef92f1a60c3cf
drh [Mon, 3 Apr 2017 13:17:31 +0000 (13:17 +0000)]
Fix typos in the documentation for OP_Column.
FossilOrigin-Name:
777b43e64ffb2fb80ba7b705c129c133bf9787993a66cde1759dc070b324b4b4
drh [Mon, 3 Apr 2017 12:04:39 +0000 (12:04 +0000)]
Slightly smaller and faster implementation for vdbeSorterCompareInt().
FossilOrigin-Name:
84fa069c5bdfe41d03d03875c9157cc6785150b677c04e40b8916ba5af073dc8
drh [Sat, 1 Apr 2017 20:44:26 +0000 (20:44 +0000)]
Remove an unnecessary setting of the Mem.enc field for the output of the
OP_Record opcode, for a performance improvement and size reduction.
FossilOrigin-Name:
e6e36b288fdf21b7ff7f0bf85d2225b6505f54367b183c302c93c34a4a40b8b5
drh [Sat, 1 Apr 2017 20:14:01 +0000 (20:14 +0000)]
Minor performance enhancements to the OP_Affinity opcode.
FossilOrigin-Name:
c45cd3b947c0f03a688f827fddb4629a986788f0dd98d5ef899f11e68ff1c202
drh [Sat, 1 Apr 2017 19:45:20 +0000 (19:45 +0000)]
Remove an unnecessary clearing of the Vdbe.iCurrentTime value.
FossilOrigin-Name:
fcd2acdd6075aa9a7a66ce254eba77485f7b2804127e109c0309173488cd4b87
drh [Sat, 1 Apr 2017 11:59:36 +0000 (11:59 +0000)]
Faster implementation for sqlite3VdbeIntValue() and sqlite3VdbeRealValue().
FossilOrigin-Name:
8698df60c23d4dcc80b58352c14ae80ec238cac496f8a87bd72a96fef61cc63f
drh [Sat, 1 Apr 2017 11:40:05 +0000 (11:40 +0000)]
Remove unused fields from the BtCursor object.
FossilOrigin-Name:
1c0d82e0786ed22d07d774b8b166340fad97bcaab6016e395c469bcfcb7c77a3
drh [Sat, 1 Apr 2017 00:20:06 +0000 (00:20 +0000)]
Save a 78 bytes of code space and a million CPU cycles in speedtest1 by
storing the cell index for the leaf page in the BtCursor object in its own
field (BtCursor.ix), rather than as an entry in the BtCursor.aiIdx array.
FossilOrigin-Name:
2452f0617d1085689264b5f66681788cfe9e3b1a7b318307c93942b702a443df
dan [Fri, 31 Mar 2017 11:20:20 +0000 (11:20 +0000)]
dan [Fri, 31 Mar 2017 08:00:03 +0000 (08:00 +0000)]
Update shell6.test to account for the fact that tests are now run in a
separate directory.
FossilOrigin-Name:
1e3622de8b51fdb219eb1934533a95fe6dc5158f44d358bc2efdcb53a4a9fdab
drh [Thu, 30 Mar 2017 17:13:37 +0000 (17:13 +0000)]
Declare the Lemon-generated parser object as itself. (Duh)
FossilOrigin-Name:
c8000e94cca59dabf83d6cb75b40441aaf793d29880582dc4baa17246449b5fe
drh [Thu, 30 Mar 2017 16:51:35 +0000 (16:51 +0000)]
Increase the version number for the next development cycle.
FossilOrigin-Name:
9e550ccc29f317422dae3a4bb89a78b839330825fecd40a01d1a2acc719cef79
drh [Thu, 30 Mar 2017 16:37:05 +0000 (16:37 +0000)]
Ensure that the stack space used to hold the Lemon-generated parser object
is always 8-byte aligned.
FossilOrigin-Name:
1279de0b70cabf39899d92ece8852a780fd800bf3154971537b3427e5bd3ca50
mistachkin [Wed, 29 Mar 2017 23:22:18 +0000 (23:22 +0000)]
When compiling with MSVC, disable extra SELECT/WHERE tracing for dynamically built shells.
FossilOrigin-Name:
a68919425c528b887e66b588a73a619f0506cb06855350e0ec8f844acf64d8f7
drh [Wed, 29 Mar 2017 18:03:50 +0000 (18:03 +0000)]
Avoid unnecessary blob handle invalidation when changes are made to an
unrelated table.
FossilOrigin-Name:
4a01880b62706c12d6f16f7c2b5c8b0dc67a9a8a0a48c5b42451e1a133e85611
drh [Wed, 29 Mar 2017 17:06:14 +0000 (17:06 +0000)]
Slightly smaller and faster implementation of pcache1InitBulk().
FossilOrigin-Name:
06c2b685e15b3ee045a3e7ea018701392771c7664e59a51c9aba87cdefeb37af
dan [Wed, 29 Mar 2017 16:55:23 +0000 (16:55 +0000)]
Fix some tests in malloc5.test to account for the sqlite3_release_memory()
change in the previous commit.
FossilOrigin-Name:
d336858dfcfb9539c43582b1443911df825f9af7146957734bc6f01c8f4d98e3
drh [Wed, 29 Mar 2017 15:18:40 +0000 (15:18 +0000)]
Fix the sqlite3_release_memory() interface so that it works even if
SQLITE_DEFAULT_PCACHE_INITSZ is non-zero.
FossilOrigin-Name:
5d902b7fea3144bf57f02aca87b9795fdcec4774310ade6ef01f37d206c3d74f
drh [Sat, 25 Mar 2017 19:16:41 +0000 (19:16 +0000)]
Add the new sqlite3_set_last_insert_rowid() interface to the extension
loader thunk.
FossilOrigin-Name:
8469fc0d48d6af0accef9b8a84e08ad2ca32351907510d177b4ca4815c1ea7cb
dan [Sat, 25 Mar 2017 18:31:42 +0000 (18:31 +0000)]
Do not run tests for ".dump --preserve-rowids" when testing
SQLITE_OMIT_VIRTUALTABLE builds.
FossilOrigin-Name:
55df410b2cd27dc4c7670bcc1196fa3a0e9e601fc24c42e53d6b0a26ee3e4b45
drh [Sat, 25 Mar 2017 18:15:05 +0000 (18:15 +0000)]
Disable the new --preserve-rowids option on the CLI ".dump" command if
compiled with SQLITE_OMIT_VIRTUALTABLE.
FossilOrigin-Name:
bd5bbe4eece9051cc8c27d834d22fb243d34f261641984555d02a27b7038d4f6
drh [Sat, 25 Mar 2017 18:03:26 +0000 (18:03 +0000)]
Make the default value for SQLITE_DEFAULT_SYNCHRONOUS a simple integer
literal, so that it does not show up goofy in the output of
"PRAGMA compile_options;".
FossilOrigin-Name:
833ab3212addc340ca8004e8d6a06cc5e51bf256f43dc73d87fbe67518a4891b
drh [Sat, 25 Mar 2017 12:08:11 +0000 (12:08 +0000)]
drh [Fri, 24 Mar 2017 19:45:05 +0000 (19:45 +0000)]
Fix a harmless compiler warning in the JSON1 extension.
FossilOrigin-Name:
c2c3dd84534bb5ea81c974847b74a166c9cba1545fc749ce625929f303bf22e4
drh [Fri, 24 Mar 2017 18:38:41 +0000 (18:38 +0000)]
Previous check-in was not correct. This is a better fix for the OP_Once
problem of ticket [
06796225f59c057cd120f1 ].
FossilOrigin-Name:
8194dd2814b0b3f8cffbcb16306f55aabf1c1508b9d27fa806f92f0e6ecd7631
drh [Fri, 24 Mar 2017 17:59:56 +0000 (17:59 +0000)]
Fix the OP_Once opcode so that it works correctly for recursive triggers.
Ticket [
06796225f59c057cd120f1 ].
FossilOrigin-Name:
2556014514f36808e6d18b25722eae0daeeb8fbb5d18af13a9698ea6c6db1679
drh [Fri, 24 Mar 2017 13:31:47 +0000 (13:31 +0000)]
Add the RFC-7396 Appendix A test cases for json_patch().
FossilOrigin-Name:
c5441d2df2526723f72610cc14dd243223663979e67ecdd76fe06fcd366f2b29
drh [Fri, 24 Mar 2017 12:35:17 +0000 (12:35 +0000)]
Fix an error in the new json_patch() routine discovered by Ralf Junker.
FossilOrigin-Name:
9d5350418b2f6113e0b50c57e8a872006f27753067baf08ffdfa7943c0c9a148
drh [Thu, 23 Mar 2017 23:44:55 +0000 (23:44 +0000)]
Add the json_patch() SQL function to the JSON1 extension.
FossilOrigin-Name:
476088482024e411e2549b1697cdaf0124294c79d43f508c71c4eb66906a56fc
drh [Thu, 23 Mar 2017 20:33:49 +0000 (20:33 +0000)]
Change the name of the json_merge_patch() function to just json_patch().
FossilOrigin-Name:
04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
drh [Thu, 23 Mar 2017 19:51:38 +0000 (19:51 +0000)]
Improvement to the amalgamation configure.ac file contributed by
Bob Friesenhahn.
FossilOrigin-Name:
bf28a55d8185e370fea39de297c37387f852f43fac0a316e5900e633f99b367f
dan [Thu, 23 Mar 2017 17:22:09 +0000 (17:22 +0000)]
Do not run test file autoanalyze1.test if OMIT_VIRTUALTABLE is defined.
FossilOrigin-Name:
e1d06a573ee56bf6a14e4dc8086d6a4df1464f2914834cf4596a0a406688f608
dan [Thu, 23 Mar 2017 17:03:35 +0000 (17:03 +0000)]
Remove an invalid assert() statement failing when VACUUMing a database that
contains an index on a column explicitly declared "COLLATE BINARY".
FossilOrigin-Name:
9f2e04d3c3526b5ff60d941aa6d5446f602cab37cb93972937f39eefabd6868d
drh [Thu, 23 Mar 2017 12:56:44 +0000 (12:56 +0000)]
Avoid redundant edits in the json_merge_patch() function.
FossilOrigin-Name:
4a8e6437dd610c5376a07867a73e5a7e2ea90357a018e1788ecce6f4e10bc939
drh [Thu, 23 Mar 2017 00:46:15 +0000 (00:46 +0000)]
Fix harmless compiler warnings in the new json_merge_patch() logic.
FossilOrigin-Name:
5d2cf5a2f8afd88d041d89b3936042ce5a43629d23c48738cb2791b24da3e6af
drh [Thu, 23 Mar 2017 00:13:52 +0000 (00:13 +0000)]
Various fixes to the json_merge_patch() function.
FossilOrigin-Name:
f49fd2554b0723eb7cf2fd765d655c6820833ee7e5f7d7629d98c27a6fffa1d9
drh [Wed, 22 Mar 2017 21:45:20 +0000 (21:45 +0000)]
Change the name of the new function to "json_merge_patch()".
FossilOrigin-Name:
53bf70f37bbca319ea35f70849e2a34ae628a504486158fdad5c4bb7431c68e0
drh [Wed, 22 Mar 2017 21:24:31 +0000 (21:24 +0000)]
Initial implementation of the json_mergepatch(A,B) SQL function.
FossilOrigin-Name:
a267444039af519f088dd8f8ee33f686cc3071c087677075af2364ebc2587514
drh [Wed, 22 Mar 2017 12:51:34 +0000 (12:51 +0000)]
Fix harmless compiler warnings in the shell.
FossilOrigin-Name:
a786829783ef65ef270ca360712364cbd47a540d31ed1547d50808aad698bea7