mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,866 Commits 1,487 Branches 166 Tags 416 MiB
27b1c8ac09
Commit Graph

13866 Commits

Author SHA1 Message Date
mistachkin
0311b622c4 Merge updates from trunk. 
FossilOrigin-Name: 59d1a3bb6050a812c4eb0d25ac53327081b9efed
 2015-04-19 23:40:55 +00:00
mistachkin
f659cf48e8 Modify the 'mkvsix' tool itself to support the Visual Studio 2015 CTP. 
FossilOrigin-Name: e0b7a191f3c22d9eacf645c58be59e0fdcb8860d
 2015-04-19 23:39:05 +00:00
drh
542a176d5e Fix an off-by-one assert() in the virtual table argument tokenizer. 
FossilOrigin-Name: c83052e48bbae0f45db2a44155b4e5482ee4a901
 2015-04-19 23:11:10 +00:00
drh
992590be1c Fix a broken assert() and comparison for INSERT INTO ... SELECT when the 
SELECT uses an unknown collating sequence.

FossilOrigin-Name: e73ac0cbac257d2d2b28e51423e30d7449b6c7b5
 2015-04-19 22:41:22 +00:00
drh
7520996965 Silently ignore parser stack overflow when parsing a malformed schema in 
PRAGMA writable_schema mode.

FossilOrigin-Name: 2cb37b959c66b5ae3535ab81ba14a4ebf9732df7
 2015-04-19 22:31:45 +00:00
drh
5f1d2fa4d2 Fix another assert() that is not true if the database schema is corrupt. 
FossilOrigin-Name: bc97cec6338b16a4e9b1a9457d01bb7fe462934d
 2015-04-19 21:59:19 +00:00
mistachkin
8e18922f12 Fix harmless compiler warnings seen with MSVC 2015. 
FossilOrigin-Name: d05becd873a03a366843a34e7f4c732dd8f88c86
 2015-04-19 21:43:16 +00:00
drh
33c59ecafb Fix a faulty assert in the schema parsing logic. 
FossilOrigin-Name: b1ed949584a2526c04952b98c3aa283427f45e10
 2015-04-19 20:39:17 +00:00
mistachkin
1c89a7710e Document the NMAKE_ARGS environment variable as well. 
FossilOrigin-Name: 977fd39c1509edec2e28cc8bac64e0994699f398
 2015-04-19 19:53:43 +00:00
drh
d0c7305313 Fix a potential NULL pointer deference on a corrupt database schema. 
FossilOrigin-Name: dc61b292d8eaf422ca8a2b18f1caccef1a5389fd
 2015-04-19 19:21:19 +00:00
mistachkin
88eb7fa328 Improve documentation and comments in the MSVC batch build tool. 
FossilOrigin-Name: ca64ef079811006f3e0526919871ffd286c3e714
 2015-04-19 18:58:29 +00:00
drh
a21f78b93f Bring comments on the INSERT code generator up-to-date. Fix the INSERT code 
generator so that it correctly handles inserts from a SELECT into a virtual
table with non-terminal hidden columns.

FossilOrigin-Name: 4ac81fac6c6302c042be3df493a41630b733fff0
 2015-04-19 18:32:43 +00:00
mistachkin
6bbe3dfaf2 Work in progress on making VSIX packages for the Visual Studio 2015 CTP. 
FossilOrigin-Name: 8469d651a0442a2bc572a869a0457a6ea8c06bc7
 2015-04-19 06:18:10 +00:00
drh
816070cf5c The sqlite3_trace() callback does not try to expand parameters in statements 
that have no parameter.

FossilOrigin-Name: 917e3c36293a1bf052a16116c93e5037ed712f96
 2015-04-18 19:20:14 +00:00
drh
7088d50109 Fix an incorrect assert() statement in the CREATE INDEX code generator. 
FossilOrigin-Name: 2eed41fda068f2cbac55e63d7c1875ddaa331508
 2015-04-18 17:43:29 +00:00
dan
ea8562edce Ensure that if a "ROLLBACK TO" statement is used to rollback (but not close) theoutermost transaction, the xRollbackTo() method of any virtual tables involved in the transaction is invoked. 
FossilOrigin-Name: e98d481d84ef31b6ed154f14deae9b261f722616
 2015-04-18 16:25:54 +00:00
drh
935f2e7074 Disregard leading zeros when converting strings to 32-bit integers. 
FossilOrigin-Name: 691cc201e135a01c4cc4057be7e5d99285ab392d
 2015-04-18 04:45:00 +00:00
drh
c982844097 Fix an incorrect assert() in the sqlite3_trace() logic. 
FossilOrigin-Name: eabde33997b5b2ffc0067930305d6fed5951a234
 2015-04-18 00:22:17 +00:00
dan
1586699cfc Fix a problem affecting some fts3 UPDATE and DELETE statements on order=DESC tables. 
FossilOrigin-Name: 284c1623f81704ef80edb9324954525cb2b72172
 2015-04-17 20:51:55 +00:00
drh
7693c42f1a In the expression-tree comparison routine, do not compiler Expr.iColumn 
and Expr.iTable for TK_STRING expressions.

FossilOrigin-Name: b67bb16c72c3e015ea82665ada9b5d3289ef6fb2
 2015-04-17 19:41:37 +00:00
drh
7b4da150da Always resolve symbols in all ORDER BY clauses of a compound-SELECT, even 
illegal ORDER BY clauses.

FossilOrigin-Name: 6c39ef73d5899eabdb46db50c2b00c2d8381a41a
 2015-04-17 18:52:37 +00:00
drh
97ab32bcd3 Remove unnecessary parser error count increments. Let the sqlite3ErrorMsg() 
take care of doing that.

FossilOrigin-Name: 3f3b0f683af2fbee83811536f6bef770ff919385
 2015-04-17 18:22:53 +00:00
dan
1c29c27bb0 Ensure that filenames passed to the VFS xOpen() function are terminated by 2 '\0' bytes. 
FossilOrigin-Name: 66eff473c3634edb42f6ad6955acfba3e3a10def
 2015-04-17 17:00:52 +00:00
dan
43030868e6 Fix a memory leak in sqlite3ota.c that can follow an OOM error. 
FossilOrigin-Name: c3dc15e71782fc70e92b71ad9eec0cf8ffef611f
 2015-04-17 16:29:11 +00:00
drh
c50c8f4043 Remove an ALWAYS() that turns out to be false when there is a semantic 
error on a compound SELECT.

FossilOrigin-Name: ad67a67c03078a2bc65d28f2b880b29bf02067c1
 2015-04-17 16:12:03 +00:00
drh
d99d28361e Ensure that semantic SQL errors are always reported back up to the syntax 
parser.  Also:  Improve the defense against invalid PRAGMA synchronous settings.

FossilOrigin-Name: 7aeade9a07f29bf26e50394042ea18d0121fe7a3
 2015-04-17 15:58:33 +00:00
drh
b8289a8b00 Fix a faulty assert() in sqlite3SelectNew(). 
FossilOrigin-Name: 620d19c3b462f5c4763ebd26513321431f21dd72
 2015-04-17 15:16:58 +00:00
drh
268e72f936 Add the tool/fuzzershell.c utility program. 
FossilOrigin-Name: db8d9af4d04ee862995ffa13ae6dcd9a1fc72855
 2015-04-17 14:30:49 +00:00
drh
50be9c4b28 Fix the header comment on the sqldiff utility program. No code changes. 
FossilOrigin-Name: b355ca3a3f617cd6d4c45c8e27ecd75d9e68b792
 2015-04-17 12:16:09 +00:00
dan
ec16d98489 Have OTA always specify SQLITE_CONFIG_URI when opening databases. Fix a test issue causing otacrash.test to fail. 
FossilOrigin-Name: 0d0e5ec064eaecb200b9b601b7a54a1700cd176e
 2015-04-17 08:36:05 +00:00
drh
e318a7f84c Restrict the scope of a local-use function in the parser. 
FossilOrigin-Name: cd6598f47480a6189df3e4283231833fd246d7fb
 2015-04-16 23:04:17 +00:00
drh
a33b68364b Use a heap rather than a bitmap for cell coverage and overlap testing on 
btree pages in PRAGMA integrity_check.

FossilOrigin-Name: e94b2ef2242d716379a35dba3d2df1ac512c8d30
 2015-04-16 21:57:37 +00:00
drh
f3151f0a0d Fix a couple of unreachable branches. 
FossilOrigin-Name: 8f391dffcfe068d48f854784648610d8a86f6bc8
 2015-04-16 20:27:09 +00:00
drh
a4bb7764fe Fix a boundry-value condition in the phrase poslist extractor of FTS3/4. 
FossilOrigin-Name: 55d10baf0bffdb1a34bf5627ed8f25e4a4efd942
 2015-04-16 20:10:17 +00:00
dan
5c06dd831f Be sure to release any xShmLock locks held when closing an OTA handle. 
FossilOrigin-Name: d0fba72a47f73082ade40a732aab114bc8f6d83e
 2015-04-16 18:49:53 +00:00
drh
ab4e7f3337 Make sure all cursors are closed when returning from a VDBE subprogram that 
implements a foreign-key construct.

FossilOrigin-Name: d04d354d8e423961c3091b6ebcfbbbf10d3ecb04
 2015-04-16 18:11:50 +00:00
drh
6dc4148547 Fix the VDBE so that it always uses the original opcode for profiling and 
debugging even after the pOp pointer has been updated due to a jump.

FossilOrigin-Name: 647495cf12b656f6a2f028dc1fb459d667153cf2
 2015-04-16 17:31:02 +00:00
mistachkin
b10f22a141 Restore SQLITE_FORCE_OS_TRACE to the MSVC makefile, which was removed during a merge. 
FossilOrigin-Name: c37f4d492f98ac5c07c08705a3826a3e86107306
 2015-04-16 16:27:29 +00:00
drh
a276e3fd4d Fix a faulty assert() in the compound-SELECT code generator. 
FossilOrigin-Name: 10715b05f2201a63dca317f99ce39d3ce182e182
 2015-04-16 16:22:27 +00:00
drh
59ac655d02 Silently ignore requests to change the PRAGMA synchronous setting to an 
illegal integer value, rather than raising an assertion.

FossilOrigin-Name: e0a88176fcfbed7b554a036948261a332c920053
 2015-04-16 16:04:39 +00:00
drh
e06874eaa1 Make sure errors in coding triggers are propagated back up to the parser. 
FossilOrigin-Name: 928f973ca9adc7933015b2fb6b6fcb8e3154cb9c
 2015-04-16 15:47:06 +00:00
drh
9569f60e18 Add the --backslash option to the command-line shell for testing purposes. 
FossilOrigin-Name: dd96211e8022365637286b146120cc5db44a9923
 2015-04-16 15:05:04 +00:00
drh
6736618a8f Fix a faulty assert() in the compound select code generator. 
FossilOrigin-Name: 9d336be1b16aa9bd5c9e4132bb645874993c7d96
 2015-04-16 14:33:35 +00:00
dan
28b22a0159 Fix a mismatched printf() argument and format specifier. Add ota files to Makefile.in. 
FossilOrigin-Name: 5db810a88dac5cbf1f6b321345d01cc0d9d05d31
 2015-04-16 14:33:09 +00:00
drh
772460fd4c Improvements to the way VALUES clauses are parsed. 
FossilOrigin-Name: ec5a493ad27593ca78899b3001630c1898b940ff
 2015-04-16 14:13:12 +00:00
drh
b073771cdf Fix the corruptC.test module due to a change in error message text. 
FossilOrigin-Name: 7c0deed25762a954c78d98412d8f4a265a437d06
 2015-04-16 12:12:07 +00:00
drh
67731a97a2 Use a heap instead of a bitmap for cell overlap and coverage testing of 
btree pages in PRAGMA integrity_check.

FossilOrigin-Name: 5619c959bf7babb19fd8ba8b228be7f090fe0ce3
 2015-04-16 11:56:03 +00:00
dan
4141a81b30 Avoid attempting to rename the *-oal file while it is still open. 
FossilOrigin-Name: 658c3b0c80b9fe7eaac5982573651dc649a4c53f
 2015-04-16 10:55:58 +00:00
dan
0d2e2f2b10 Fix a problem in test file e_reindex.test. 
FossilOrigin-Name: 5b3de9390f2ffc4c530fd47c71c70e87972cf74b
 2015-04-16 08:54:01 +00:00
dan
5b1c07e7fb Ensure the sqlite3Select() routine always returns non-zero if an error has occurred. 
FossilOrigin-Name: b51028ed2f57f4245a7ebd9bdb99d1bcfaf1a01b
 2015-04-16 07:19:23 +00:00
mistachkin
3693a094b2 Merge updates from trunk. 
FossilOrigin-Name: 22827542a5c7aeac4385ba647f45bd500e787fe6
 2015-04-16 04:20:10 +00:00
mistachkin
0cbcffa75d Move OSTRACE defines so they are visible to all source files that need them. 
FossilOrigin-Name: 72485c97c6de47b8bba63b2a307e7bdeea114040
 2015-04-16 03:56:32 +00:00
mistachkin
02b0e267fb Make sure the sqlite3DebugPrintf() function is defined for OSTRACE as well. 
FossilOrigin-Name: ae5af70427e0df960a54c48cd27a6288500b1f31
 2015-04-16 03:37:19 +00:00
mistachkin
fb383e9229 Merge updates from trunk. Make OSTRACE changes work on Linux. 
FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948
 2015-04-16 03:24:38 +00:00
drh
22ecef5c20 When parsing the schema, ignore any SQL that does not begin with "CREATE". 
FossilOrigin-Name: d3c00d61581c8ba6dce5618391432d3af8d324d4
 2015-04-16 00:26:03 +00:00
drh
4b608038b0 Fix a potential one-byte buffer overread in the command-line shell. 
FossilOrigin-Name: e018f4bf1f27f7838342940ad89a12d7f1536e8e
 2015-04-15 19:25:25 +00:00
drh
f3392e32c7 Prevent the fetchPayload() routine from reporting a cell size that extends 
off the end of the page on a pathologically corrupted database file.

FossilOrigin-Name: f71053cf658b3260a32ac06f8ba5c2cde0ea54dd
 2015-04-15 17:26:55 +00:00
drh
748c7357ab Enhance the showdb utility program so that it can read the last partial page 
of a truncated database file.

FossilOrigin-Name: 61d72e17916bc043ce53c64e5ba7050a9bae554e
 2015-04-15 15:29:05 +00:00
drh
a9de561b21 Add the --msvc command-line option to the releasetest.tcl script. This is 
only a partial merge from the winTest branch as the OS_TRACE changes are
omitted.

FossilOrigin-Name: b8768f124ef7d79e500b60a3ede288d46a0f529d
 2015-04-15 14:52:05 +00:00
drh
fdb031891c Merge all recent trunk enhancements and fixes into the ota-update branch. 
FossilOrigin-Name: 9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c
 2015-04-15 14:26:04 +00:00
dan
0d01ec8de8 Remove an incorrect assert() statement from sqlite3Fts3Dequote(). 
FossilOrigin-Name: bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
 2015-04-15 09:16:39 +00:00
drh
0be0cf6721 Remove a branch that became unreachable due to one of the earlier check-ins 
today.

FossilOrigin-Name: fa0956edf866f48f448967836709a3ad822ff917
 2015-04-15 08:37:42 +00:00
dan
2deb12be2b Fix a problem causing an assert() to fail if a snippet containing 0 tokens was requested from fts3. 
FossilOrigin-Name: eafd0a1e3f25f38d551603f177ff4634cf79de77
 2015-04-15 08:20:50 +00:00
drh
347bdc39a7 Fix the error message generator for illegal token errors so that it does not 
leak memory if it immediately follows another erroneous SQL statement.

FossilOrigin-Name: 3576973f8b88b6109fbefdebfa53468ffa137009
 2015-04-15 07:57:27 +00:00
drh
29031837c1 Remove an incorrect ALWAYS() from the automatic index generator. 
FossilOrigin-Name: eeb4bd06bf69e411736cc6077d1d64af6bd8fb09
 2015-04-15 07:34:25 +00:00
drh
1b6789697d Remove an incorrect ALWAYS() from the table_info pragma. 
FossilOrigin-Name: 0e087c0183bc7a758cf2a1d39158bc24fde833a2
 2015-04-15 07:19:27 +00:00
drh
3dc4cc66b3 Change the multiSelectOrderBy() routine to return non-zero if there has 
been any prior error.

FossilOrigin-Name: 14784c317bff05dd0a74e2596432dfd12c139391
 2015-04-15 07:10:25 +00:00
drh
a43f02efc6 Fix a faulty assert() statement in the name resolver associated with the 
optimization that converts compound selects with ORDER BY COLLATE into
subqueries.

FossilOrigin-Name: c72324ef9243946550ae3d974826502b1cc5eb10
 2015-04-15 06:45:13 +00:00
drh
6456b7710c Correctly handle COLLATE operators applied to COLLATE operators in an 
ORDER BY clause.

FossilOrigin-Name: 9e1f837b08facbc7a2b6196770599a58233e725c
 2015-04-15 05:57:50 +00:00
drh
3457338ced Fix a faulty assert() in the sqlite3StrAccumAppend() routine. 
FossilOrigin-Name: 998cfdb8dcda2cac94b83326751e16dcef8b267f
 2015-04-15 05:38:35 +00:00
drh
65df68e8c5 Correctly deal with an unknown collating sequence on an indexed DISTINCT query. 
FossilOrigin-Name: a0b6e2fed3e95cf78ed0515c6e4da7510af4e86a
 2015-04-15 05:31:02 +00:00
drh
1978d171cb When adding the implied "LIMIT 1" to the end of a scalar subquery, make sure 
that subquery is not a VALUES-only query as such queries cannot deal with
LIMIT clauses.

FossilOrigin-Name: 7c27310bdf6b4af44a0811a2787ed64966d720d2
 2015-04-15 05:20:44 +00:00
drh
0ec68f845c When doing the (dubious) conversion of double-quoted identifier into string 
literal for MySQL compatibility, be sure to also clear the iTable value from
the Expr entry to avoid an assert.

FossilOrigin-Name: d7211b68107ea669de39e0aa81a1be40901e1487
 2015-04-15 04:51:28 +00:00
drh
311efc70a7 Add a test case for what was formerly thought to be an unreachable condition: 
when the LHS of an OR operator contains an error and the RHS contains an IN
operator.

FossilOrigin-Name: 3872742591add4e94033484c2844e7d7ab69674b
 2015-04-15 04:20:58 +00:00
drh
126a6e260c An oversize hex literal can cause a parsing error while generating code for 
constants that are factored out of the main body of the VDBE program.  So
allow for that case.

FossilOrigin-Name: a084690b4fcabba20d9770ebf3a014dda84e2954
 2015-04-15 04:10:50 +00:00
drh
8a1cd765df Add the --summary option to the sqldiff command-line tool. 
FossilOrigin-Name: 88b22761c59b06fa86c57f8d22a46046ad17d5d5
 2015-04-14 19:01:08 +00:00
drh
d9a0a9a0c6 Update API documentation to identify many functions as methods on objects. 
No changes to code.

FossilOrigin-Name: b549cbcee1c11f9ffedf763ca672b125eac87bfe
 2015-04-14 15:14:06 +00:00
drh
6bca651166 Add #ifdef magic for HAVE_GETHOSTUUID so that the build will hopefully now 
work on more verions of MacOS with SQLITE_ENABLE_LOCKING_STYLE turned on.

FossilOrigin-Name: 211411d02c0729c9af0e3cc7e4910db2e7e0d08e
 2015-04-13 23:05:28 +00:00
drh
2647dfa292 On a DETACH statement, keep all schemas intact except fo the one that is 
being detached, and thus avoid unnecessary schema reparsing.

FossilOrigin-Name: 661db19b34566642dd44ee4cff4ebc093cb8a552
 2015-04-13 22:26:55 +00:00
drh
f56fa4676e Omit the "pc" or "program counter" variable from the VDBE loop for 0.6% 
performance increase.

FossilOrigin-Name: d2f10c41a832f520de13cf8315be22e66552f8e1
 2015-04-13 21:39:54 +00:00
drh
27a348c7a0 Remove the out2-prerelease VDBE opcode property and its associated code, 
for a 0.5% performance improvement.

FossilOrigin-Name: e29c7f2c910dac07f0f92dfef5e0e743141954eb
 2015-04-13 19:14:06 +00:00
dan
1fe0af200d Add a comment to wal.c to explain why a race condition is safe. 
FossilOrigin-Name: bc33af866403c23d548dd4705675315810d52d7f
 2015-04-13 17:43:43 +00:00
drh
c01501a386 Remove a faulty assert() from the btree balancing logic. 
FossilOrigin-Name: d06669d968c8f6af8799fbfeabadaab68b9b8db8
 2015-04-13 14:44:01 +00:00
dan
481ecd95d0 Test that if the definition of a collation sequence is changed and VACUUM run, the new database contains records sorted in the (new) correct order. 
FossilOrigin-Name: ce6eaac10a190b26b87bfe75918e2ef58fd7a3f9
 2015-04-13 14:08:27 +00:00
drh
ab06b0e5be Remove an unreachable branch from the VACUUM logic. 
FossilOrigin-Name: 65ace4b062d9454a296c5a1aa7ea7316b1507ad4
 2015-04-13 14:03:54 +00:00
drh
4a614e9013 Remove an unreachable branch from the vdbeSorterCompareInt() routine. 
FossilOrigin-Name: f666ef06869f4fb655c43daacf5034c17575d951
 2015-04-13 12:45:58 +00:00
drh
9dc225ef1c Update the version number to 3.8.10 because of the new sort optimizations from check-in [79326d6eec]. 
FossilOrigin-Name: bd2cfa1d72368db91064bace298df3d77d9963e6
 2015-04-12 21:28:50 +00:00
drh
f932f7145e Fix a problem with a stale Select.pWith pointer when a CTE is used together 
with a compound query and an ORDER BY clause.

FossilOrigin-Name: 9a453f52a2b30595891604ede7d4acf61c2736a1
 2015-04-12 17:35:27 +00:00
drh
11b0481778 Avoid problems when a query has a GROUP BY and an ORDER BY but no FROM clause. 
FossilOrigin-Name: e527d96a1e098ade4e9d124b630a8c2ea2ac9b36
 2015-04-12 01:22:04 +00:00
dan
ead438156e Optimizations for VACUUM, CREATE INDEX and some cases of ORDER BY. 
FossilOrigin-Name: 79326d6eece926fd1c148b29f0b726208d8b44c0
 2015-04-11 20:44:28 +00:00
dan
96974bd393 Fix a problem with sorting large amounts of partially ordered data. 
FossilOrigin-Name: acca97efda86a0c020854d2dd9da16f5879986b1
 2015-04-11 20:20:29 +00:00
dan
a89688144e Merge latest trunk changes with this branch. 
FossilOrigin-Name: cf7590f607d94a120385576b538484ca738349e2
 2015-04-11 18:45:55 +00:00
drh
dba04b6d8e Add the --changeset option to the sqldiff utility program, for generating 
a sessions changeset file instead of an SQL diff.

FossilOrigin-Name: f9a3a8391c28cf13d76ec54f471735d35059acea
 2015-04-11 13:49:16 +00:00
drh
6e42ce44db The --changeset option now appears to be working. 
FossilOrigin-Name: 1a2e2803920dcf64190d81d8a487d6c3c9bb28ee
 2015-04-11 13:48:01 +00:00
drh
697e5dba80 First complete attempt to generate a working changeset. Still contains bugs. 
FossilOrigin-Name: 5611fa9bd5b8fd762d16ce9b0853c2e779a1a1b7
 2015-04-11 12:07:40 +00:00
dan
8aad8c482c Update tests in whereD.test to account for the change in the previous commit. 
FossilOrigin-Name: da49700ca148d91e1b8863c2eb6ee79144e83ac9
 2015-04-11 11:53:39 +00:00
dan
2813bde028 Do not assume an index contains unique entries unless it is declared UNIQUE and NOT NULL is specified for all columns. Fix for [7b4fee9f6c]. 
FossilOrigin-Name: e3b1f625518edc0e925116668dca5d25c3232b59
 2015-04-11 11:44:27 +00:00
drh
4a33507f60 Detect and report oversized records constructed from multiple zeroblobs. 
FossilOrigin-Name: 9e139afd92116ebc593114ed63b57c8f469653f6
 2015-04-11 02:08:48 +00:00
mistachkin
2252917e75 Minor build enhancements for MSVC. 
FossilOrigin-Name: 40c417a7efb17221cec4a0a703863854bcab8db2
 2015-04-10 21:16:11 +00:00
drh
83e63dc385 Work toward adding the --changeset option to the sqldiff utility program. 
Changes are incomplete.  This is an incremental check-in.

FossilOrigin-Name: 463e38d765f9d055b63792a8ea15c3782657b07f
 2015-04-10 19:41:18 +00:00
dan
4e23536e56 In sqlite3_declare_vtab(), avoid accessing the database structure until after the "api-armour" safety-check has completed and the db mutex has been obtained. 
FossilOrigin-Name: 860e4f8a94901d451fac3954960c1d2f589e8882
 2015-04-10 16:05:33 +00:00
drh
e918aaba98 Fix foreign key CASCADE for cases where the parent key is an INTEGER PRIMARY 
KEY and the parent table contains other columns named "rowid", "_rowid_",
and "oid".

FossilOrigin-Name: ed3cbaab6ad49b0cb5b17e44def26c866919387a
 2015-04-10 12:04:57 +00:00
dan
6864076cc4 Update this branch with latest trunk changes. 
FossilOrigin-Name: 60be9c1c1ad0d8250a99cadda820dff40a31c94e
 2015-04-10 08:20:42 +00:00
dan
75395ccd17 Do not allow virtual table constructors to be called recursively. 
FossilOrigin-Name: 0a72726da21581ab16cb3e964bd825b8f2e931e4
 2015-04-10 07:55:07 +00:00
drh
2139d252dd Fix incorrect column names in UPDATE statements generated by the sqldiff 
utility.

FossilOrigin-Name: ee53b46011852e27db23708387fe1e918cc8284c
 2015-04-09 19:39:54 +00:00
drh
a37591cdd1 Add the --primarykey option to the sqldiff tool, which causes it to use the 
schema-defined PRIMARY KEY.

FossilOrigin-Name: 5063f9070afde9374ea0f2bc338fee840d8b3dd4
 2015-04-09 18:14:03 +00:00
drh
3875becf35 Remove two pointless assert() statements. This should silence harmless 
compiler warnings reported at 
[https://bugzilla.mozilla.org/show_bug.cgi?id=1152845]

FossilOrigin-Name: 83b342a44ffc9ea07dc4d59f2866cefc68ee4f13
 2015-04-09 16:30:56 +00:00
drh
39b355c70f Fix comment typos in the sqldiff.c utility program. 
FossilOrigin-Name: 32ab2bb990746a84f5944e3cf428fb2dff3628da
 2015-04-09 13:40:18 +00:00
drh
d62c0f4c2d Add the "sqldiff" utility program. 
FossilOrigin-Name: 88da5bf5d2c4f848dbd4b5ffb1539abfbbdaff18
 2015-04-09 13:34:29 +00:00
drh
50c7bb67f0 Remove a variable initializion to silence a harmless compiler warning. 
FossilOrigin-Name: 79861adbef8998c0f23e160543af8212d5546cd0
 2015-04-09 11:24:03 +00:00
drh
57d0d9f33c Merge all changes for version 3.8.9 into the ota-update branch. 
FossilOrigin-Name: ec9d907a57fcea72c8a64e521e8a1b5777d67568
 2015-04-08 14:01:07 +00:00
drh
5efbd06ab3 Version 3.8.9 
FossilOrigin-Name: 8a8ffc862e96f57aa698f93de10dee28e69f6e09
 2015-04-08 12:16:33 +00:00
mistachkin
d4411941e2 Merge updates from trunk. 
FossilOrigin-Name: c458db41bbb6bd13d47531685e25a09f512c7f5f
 2015-04-07 21:18:17 +00:00
mistachkin
cc445402c9 Correct typo in new test numbering. 
FossilOrigin-Name: d176c9fa4c65ff2f3952dd3dee46da149dfa442f
 2015-04-07 21:17:53 +00:00
mistachkin
151c75ad89 Enhance the shell export to support emitting column names in 'insert' mode when headers are enabled. 
FossilOrigin-Name: 6e504cd00b148b5acca73f039a20b8acc85dc2f0
 2015-04-07 21:16:40 +00:00
drh
b6f47deb0c Avoid signed integer overflow when converting oversized in-line integer 
widths and precisions in printf().

FossilOrigin-Name: 8e4ac2ce24415926247961b00a62425ae85d6ffb
 2015-04-07 15:39:29 +00:00
dan
8c069147ce Another change to avoid a problem caused by integer overflow in the printf() code. 
FossilOrigin-Name: 95625ef3adc3c408d67e70f877f390445fbb8292
 2015-04-07 14:38:57 +00:00
drh
a30d22a7a6 Further changes to guard against integer overflow in the width and precision 
of printf() arguments.

FossilOrigin-Name: 5ce4e7d7651e5c72a59f03f7aeb366291e62ab57
 2015-04-07 13:28:41 +00:00
drh
74b42275ec Guard against excessive width and precision in floating-point conversions 
in the printf routines.

FossilOrigin-Name: c494171f77dc2e5e04cb6d865e688448f04e5920
 2015-04-07 12:41:17 +00:00
dan
e3cdbad274 Fix a problem with fts3 prefix terms within phrase queries on "order=DESC" tables with a mix of negative and positive rowids. 
FossilOrigin-Name: 3ad829e50faca538db3abb2afb898b5521550c5c
 2015-04-06 11:04:51 +00:00
dan
4b0000c9a8 Fix a problem with fts3 prefix terms within phrase queries on "order=DESC" tables with a mix of negative and positive rowids. 
FossilOrigin-Name: 0cdf502885ea7e5805d7ba3719f055f5d48fc78d
 2015-04-06 09:05:29 +00:00
dan
cf860700e5 Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached to compound SELECT statements. 
FossilOrigin-Name: edc1de2a588fd50c0049bb2be76d3f6783443165
 2015-04-04 16:49:04 +00:00
dan
b33c50f215 Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached to compound SELECT statements. 
FossilOrigin-Name: 427b50fba7362e5b447e79d39050f25ed2ef10af
 2015-04-04 16:43:16 +00:00
mistachkin
00eb70d89c Enhance the 'releasetest.tcl' tool to support MSVC. 
FossilOrigin-Name: f664bfdc82597a4530d4f4938bb96557b43b171b
 2015-04-04 00:02:07 +00:00
drh
62ca61ee61 Disable the SQLITE_FCNTL_WAL_BLOCK feature for now. It needs more work and 
is not yet ready for release.

FossilOrigin-Name: 4ae9a3acc4eeeb7998769eb856c97c2233476f72
 2015-04-03 20:33:33 +00:00
drh
eaf2640237 Add source code to the "showlocks" utility program in the tool/ subdirectory. 
FossilOrigin-Name: 6868cc66d2be67b7f03776c982962ffa4b30de11
 2015-04-03 18:33:40 +00:00
mistachkin
34cf258302 Fix build with OSTRACE enabled on Windows when building using separate source files. 
FossilOrigin-Name: 5f6e35802fcf7b5e9fc3dd4424e9074523fa8ad3
 2015-04-02 17:46:52 +00:00
dan
5f1731f670 Disable e_walauto.test on OpenBSD, as it requires a coherent cache. 
FossilOrigin-Name: 90701227085b8b8eb10a8eebe8d55f38b4778574
 2015-04-02 15:24:53 +00:00
dan
29f1a19cd9 Fix a problem in vdbesort.c to do with caching unpacked records. 
FossilOrigin-Name: 80a00539506c95443165a781d1d869205057ca6c
 2015-04-02 09:06:21 +00:00
dan
49e24da9e7 Merge latest trunk changes with this branch. 
FossilOrigin-Name: 4621b2eef8be6d944f87de097bd11c649fe43333
 2015-04-01 18:22:26 +00:00
dan
e34162b14f When vacuuming an index that uses no collations other than BINARY, assume that the order of index entries will not be changed by the VACUUM. 
FossilOrigin-Name: e403460b96814ac8cb976d58b27939b3bd3c61f9
 2015-04-01 18:20:25 +00:00
dan
b18e60b3e4 Reduce the CPU used by CREATE INDEX statements by taking better advantage of the fact that keys are inserted in sorted order. 
FossilOrigin-Name: 592cdc5d7254be7032aa9c0b03405a74ca060b51
 2015-04-01 16:18:00 +00:00
drh
ccf46d0b90 Improved detection and suppression of endless loops in clearDatabasePage(). 
FossilOrigin-Name: 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
 2015-04-01 13:21:33 +00:00
drh
f50e8aec77 Improved tracing and debugging support on windows. 
FossilOrigin-Name: 5c965a71b957fdb0310ac1af9bf2fc3b418af668
 2015-04-01 01:26:12 +00:00
drh
f9d02f3663 On windows, flush the mapping view when syncing content to disk. 
FossilOrigin-Name: a828e73dc1ae50189bdf73f60caeb7308738ad7a
 2015-03-31 19:40:05 +00:00
mistachkin
98f1c4086d Set the winShm.id member when it is going to be traced. 
FossilOrigin-Name: fa7916b67efbc44e6f115bb0d32d8b92fd0acf3c
 2015-03-31 19:17:44 +00:00
mistachkin
d25675f897 Build fixes for OSTRACE enhancements. 
FossilOrigin-Name: f79c236fc537ecee1ea7448a3e3216a2415561a1
 2015-03-31 19:06:46 +00:00
drh
2c32ed7a58 Path portability enhancements for mptester.exe. 
FossilOrigin-Name: c8694657bdc5d0917d8fe78fd3937d8e9cd9d04b
 2015-03-31 18:18:53 +00:00
drh
4c45196a76 Add the "mptest" target to main.mk. Change TRUNCATE and PERSIST to DELETE 
for mptest.c on Windows because of problems trying to delete the journal.

FossilOrigin-Name: ea697e6d9ff1f4d77774589a02ba4a18feafbf03
 2015-03-31 18:05:49 +00:00
mistachkin
25a72de917 Path handling portability enhancements for mptester. 
FossilOrigin-Name: da49634b331812fa4d6e33d72c9661aeab203ae8
 2015-03-31 17:58:13 +00:00
mistachkin
eb48b062a1 Testing enhancements on Windows. 
FossilOrigin-Name: 9cc70eee2e365dd390210f436b893b9d80a19b04
 2015-03-31 17:45:44 +00:00
drh
8237f6d180 Change the sqlite3_log() message generated on a retry after delay in os_win 
to be an SQLITE_NOTICE instead of SQLITE_IOERR.

FossilOrigin-Name: 5d533eee049e63b3700f5ef7c28c588afccde57a
 2015-03-31 17:32:06 +00:00
drh
d881ce8fa7 Fix configure.ac and Makefile.in so that they generate pkgIndex.tcl correctly. 
FossilOrigin-Name: 3deff25249c59b7fc1b6eb65dda39736955679c6
 2015-03-31 17:01:52 +00:00
mistachkin
4d2daba467 Minor tweaks to the MSVC Makefile. 
FossilOrigin-Name: 7244ea59ede8aa2c7d1dc2c85268e12ddd452e27
 2015-03-31 16:42:16 +00:00
drh
6b5f0ebe97 Handle very large URI pathnames for in-memory shared-cache databases. 
FossilOrigin-Name: 586a94e85bc13700a2093734711c1367fa814b8c
 2015-03-31 16:33:08 +00:00
drh
1cc0d11a16 Fix harmless compiler warnings in lemon.c 
FossilOrigin-Name: bbe7dcda689a25860f2104804f00ba0a720c1372
 2015-03-31 15:15:48 +00:00
drh
96e285692a Fix the corruptJ.test case so that it works with and without 
SQLITE_SECURE_DELETE.

FossilOrigin-Name: 0c0ecfd68573957553b966229a67bfcd10ce4b99
 2015-03-31 14:31:41 +00:00
drh
8773b858e1 Additional logging information output by mptester. 
FossilOrigin-Name: 0cbbf6e4571ffef102c0e515f29166f2f2022126
 2015-03-31 14:18:29 +00:00
drh
fe0ba71112 Add the "mptest" target to Makefile.msc 
FossilOrigin-Name: 1e814e0bd116ad5a05ab9f0ebed7e21b23ed0681
 2015-03-31 13:46:13 +00:00
drh
bc8a6b31b6 Ensure that comparison operators do not mess up the MEM_Dyn flag on registers 
when reverting affinity changes.

FossilOrigin-Name: 02e3c88fbf6abdcf3975fb0fb71972b0ab30da30
 2015-03-31 11:42:23 +00:00
drh
116f0be024 Prevent a possible infinite loop when trying to DROP a table from 
a corrupt database.

FossilOrigin-Name: 395bb3e677a6551b06ba96fc58c393132b93d1e8
 2015-03-30 23:43:56 +00:00
dan
7004f3f6a3 Improve performance of multi-field sorts where the first field has a low cardinality. 
FossilOrigin-Name: 601e7b6b8e6bfabda03b70f75094c9014e3a3c49
 2015-03-30 12:06:26 +00:00
dan
d2e1191929 Remove some unnecessary code from vdbesort.c. 
FossilOrigin-Name: b58191e91736b1d978db4127f22867dfe2302f7c
 2015-03-30 09:58:38 +00:00
dan
a9d9111c4a Further optimizations for sorting records that begin with integer or text values. 
FossilOrigin-Name: 24fe9f25d64ee516633fed1ae7ebc21554aa69ca
 2015-03-28 19:56:41 +00:00
mistachkin
30d1dcabf5 Merge updates from trunk. 
FossilOrigin-Name: 45acf6a85150839d591316418dad59ae20ce3aa4
 2015-03-27 18:22:01 +00:00
mistachkin
ad1e55e55a Enhancements to OSTRACE usage in the Win32 VFS. 
FossilOrigin-Name: ab5800291e1908b5b51d912feeacf748dc9be14b
 2015-03-27 18:20:25 +00:00
drh
6f5a37a464 Fix the ".testctrl imposter" command in the command-line shell to be 
consistent in error reporting and results with the other .testctrl
commands.

FossilOrigin-Name: 0ec08ba8a0fa188146b071a489908332693ba59a
 2015-03-27 02:27:20 +00:00
mistachkin
9871a933c1 Using MSVC, get the sqlite3IoTrace variable working with the USE_STDCALL and/or DYNAMIC_SHELL options. 
FossilOrigin-Name: fe976c9130f6eecfa0a10347ee3f800f32051b89
 2015-03-27 00:21:52 +00:00
mistachkin
34a8065f49 In the MSVC Makefile, make the DYNAMIC_SHELL option work without USE_STDCALL. 
FossilOrigin-Name: 25b46a9c7e03a84bee2ffddc6d7fd6ae280e9d7b
 2015-03-27 00:19:31 +00:00
mistachkin
ccb43714da When syncing a memory mapped file on Windows, flush the mapped view as well. 
FossilOrigin-Name: df204049b9ec8dd3e43ed7dc251eaecedc05af4b
 2015-03-26 23:36:35 +00:00
mistachkin
56d89cbee3 Revise Win32 locking test to account for recent log message changes. 
FossilOrigin-Name: 1bc76339e8542770bff7829a3dd346680950c0a5
 2015-03-26 18:24:26 +00:00
drh
592f0cb15e Avoid leaving the malloc subsystem in a partially initialized state if 
the low-level initialization callback fails.

FossilOrigin-Name: 3e872011ff5e27738c282f46d2b5803d94fe4b76
 2015-03-26 17:04:23 +00:00
drh
21aa6a1acb Provide source code line numbers for errors in the Windows VFS generated 
by the winLogIoerr() routine.

FossilOrigin-Name: b5da0d93cd1a3c0917399af3775a32327b883c8e
 2015-03-26 15:27:32 +00:00
drh
f3e8748683 Fix a harmless compiler warning in FTS3. 
FossilOrigin-Name: 1688f60c08cc9270948402d98a2333382aa32681
 2015-03-26 14:29:51 +00:00
dan
57a140946f Optimize cases where all the sorter is sorting a set of records that all begin with integer values, or that all begin with text values to be compared using BINARY. 
FossilOrigin-Name: ce5ad17c25cf2f8274ce304c51e4421faae0b32b
 2015-03-26 11:55:03 +00:00
drh
606a357288 Change an unreachable branch into an assert(). 
FossilOrigin-Name: fb076b28c36975ff2e41440f22fe5de115c195da
 2015-03-25 18:29:10 +00:00
drh
d2f83139f3 Fix the saveCursorPosition() routine in btree.c so that it works 
correctly for a eState=CURSOR_SKIPNEXT cursor.

FossilOrigin-Name: 37866b4d483296ab9b7fcb9f5486695d4c2b8ddd
 2015-03-25 17:35:01 +00:00
dan
32c9068adb Extend [52e73eec] so that the IS optimization may be used on primary keys with more than 3 columns. 
FossilOrigin-Name: 4e8796af7d40d6ca423e07c68877035e4aa2485c
 2015-03-25 15:23:00 +00:00
drh
cbd3349ab9 Reactivate an older assert() (adding an "|| CORRUPT_DB" term) and add a 
new assert() in btree.c.

FossilOrigin-Name: 1e96520ac1d12ca83f019a60482efa0a074f2f94
 2015-03-25 13:06:54 +00:00
drh
f94c9485ef Add two new assert()s to the sqlite3BtreeDataSize() method. 
FossilOrigin-Name: 42d1793d6516e285a8925bbfd96b3d3375603d15
 2015-03-25 12:05:49 +00:00
mistachkin
d69e557940 Add SQLITE_STDCALL and SQLITE_CDECL macros on public function definitions. 
FossilOrigin-Name: cae3239aa58b4f7016fc9dcac3966fe6ef833879
 2015-03-24 22:00:26 +00:00
drh
790fa6ec30 Further simplifications to the amalgamation builder. 
FossilOrigin-Name: e826cd7db6b3ab010533d81a759794c2470343d2
 2015-03-24 21:54:42 +00:00
mistachkin
8de1250638 Update the 'mksqlite3c-noext' tool as well. 
FossilOrigin-Name: a532256688c3a7a6385e041ec73913842e2c3ab3
 2015-03-24 21:52:12 +00:00
mistachkin
26bbfaa59d Fix a couple comment typos in a tool script. No changes to code. 
FossilOrigin-Name: 83421af67063825981f6051eb415944d90e9b2f6
 2015-03-24 21:34:53 +00:00
mistachkin
59b9b02c1f Add SQLITE_STDCALL and SQLITE_CDECL macros on public function definitions. 
FossilOrigin-Name: 242f09d4d1c92ee9058857a5e780442f4b7bad55
 2015-03-24 21:27:27 +00:00
dan
6da7a0a93d Merge the latest trunk changes into this branch. 
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
 2015-03-24 18:21:41 +00:00
drh
4756404847 Suppress a compiler warning that was appearing with SQLITE_THREADSAFE=0. 
FossilOrigin-Name: 436314b5728c9413f9ac2d837e1c19364f31be72
 2015-03-24 18:19:39 +00:00
dan
f37120a416 When the OTA module updates or deletes a row, save only those fields that are part of an index or primary key to the ota update database. 
FossilOrigin-Name: 6326fd3249bee267da0172f8afd1e7b3f71521b9
 2015-03-24 18:03:29 +00:00
drh
126e9e6347 Prevent a virtual table from being destroyed while it is in use. 
Also: replace Vdbe.inVtabMethod with sqlite3.nVDestroy.  Simplify the
EXPLAIN output for P4.pVtab to only show the sqlite3_vtab pointer.

FossilOrigin-Name: cbeb9a1aed8ce3fb569a7717ad03c7c058b68de6
 2015-03-24 16:43:34 +00:00
dan
428630cfcf Add tests to check that attempting to DROP a virtual table while it is use does not cause problems. 
FossilOrigin-Name: 5ee625b1980f9fab6294d308349dfd9ba960b60b
 2015-03-24 14:57:21 +00:00
drh
466fd815fb Simplify the EXPLAIN output of virtual table P4 parameters to only show the 
pointer to the sqlite3_vtab object and omit the sqlite3_module object.

FossilOrigin-Name: 85610bbbc60cb4a6ec856123447fdb2ba948e52f
 2015-03-24 14:57:02 +00:00
drh
f496a7dc81 More defenses against virtual table being deleted out from under a running 
statement.

FossilOrigin-Name: 116c99823022c017946b6088878a2d46759deb6e
 2015-03-24 14:05:50 +00:00
drh
a68d628291 Prevent a virtual table from being destroyed while it is in use. 
FossilOrigin-Name: fba674c083286dabb37fed9357b67593b56ed3a5
 2015-03-24 13:32:53 +00:00
drh
086723a4a8 Replace the Vdbe.inVtabMethod field with the sqlite3.nVDestroy counter. 
FossilOrigin-Name: 9faefb96272967e731e83ef516a8c1e1b876391b
 2015-03-24 12:51:52 +00:00
drh
ada3f2b14f Disable loadable extensions in the command-line shell on VxWorks user-space. 
FossilOrigin-Name: 0ee2d38deb35aefc55395e86984a9a773caf6218
 2015-03-23 21:32:50 +00:00
drh
d741129e2b Track total memory usage using a 64-bit integer on 64-bit systems. Add 
the sqlite3_status64() interface.  Make the sqlite3_status() and
sqlite3_status64() interfaces atomic using mutexes and verify correct
mutex operation using assert() statements.

FossilOrigin-Name: 6fc4e79a2350295a15ac464593ad39d904953041
 2015-03-23 19:55:21 +00:00
drh
2493870d9c Fix a non-C89 variable declaration that causes problems for MSVC. 
FossilOrigin-Name: 3de085eab2fbe491f2242b340851e8af8f61ad13
 2015-03-23 19:16:30 +00:00
drh
062cf27d00 Fix datetype size asserts in btree.c. 
FossilOrigin-Name: ff4812d0e8e6322ca8b6992925fd4ef4aee463e6
 2015-03-23 19:03:51 +00:00
drh
2b4905c81f Add the SQLITE_PTRSIZE macro. Use it to help sqlite3_status() run faster 
on 32-bit systems.

FossilOrigin-Name: c742bd6047bc6d0319a5a8c31d97f6b9229507f6
 2015-03-23 18:52:56 +00:00
drh
af89fe66ea Add the sqlite3_status64() interface. Make the new interface and the legacy 
sqlite3_status() both atomic and threadsafe.  Check threadsafety using
assert()s.

FossilOrigin-Name: 1ce8e8fa4b866aafa12b1da0eb4d02321af9293e
 2015-03-23 17:25:18 +00:00
dan
5e4eeb3c00 Fix a broken assert() in the ota module. 
FossilOrigin-Name: 858de8a5e7925bd96d7b9c0f00bc16358cf3b295
 2015-03-23 17:10:51 +00:00
drh
74893a4cdb Fix a potential NULL pointer dereference following a syntax error. 
FossilOrigin-Name: 8d27e3e16a9be79fe227e833f4770ebe09a9d90b
 2015-03-22 10:23:17 +00:00
mistachkin
d425864d33 Fix harmless compiler warnings with MSVC when assert() and SQLITE_MEMDEBUG are both enabled. 
FossilOrigin-Name: 9513dbd4860c8dd391f831982d09aff227d16f5c
 2015-03-21 23:38:59 +00:00
mistachkin
774f42b6c6 Add more comments to the MSVC batch build tool. 
FossilOrigin-Name: 03522da37821958c647d49bf8189a5affa3f6720
 2015-03-21 22:23:46 +00:00
mistachkin
082be63b17 Increase the debugging level for the debug configuration in the MSVC batch build tool. 
FossilOrigin-Name: 041484ff91fd4615368ccb2257ab50acc2cd4fea
 2015-03-21 22:13:47 +00:00
drh
5ac936529c Do not invoke a C preprocessor macro with an empty argument, as (reportedly) 
some versions of GCC are unable to deal with that.

FossilOrigin-Name: de9da317d4df3efefe9a1a48f954af8a19e7d098
 2015-03-21 20:59:43 +00:00
drh
3858cb44b6 Add a missing "int" on a constant declaration. 
FossilOrigin-Name: 235157de5113ac4c750e36a498e2a1f1cf461751
 2015-03-21 20:50:58 +00:00
dan
e10d87f65a Avoid a segfault if NULL is passed as the first argument to SQL scalar function fts3_tokenizer(). 
FossilOrigin-Name: 6d0989695b486275824c14d5f88357267c1e8104
 2015-03-21 19:35:09 +00:00
dan
d2f99333cf Change walblock.test to block an external process for 10 seconds, not 5. 5 seconds is not long enough to tell the difference between a blocking lock and a series of retries. 
FossilOrigin-Name: 717335fcdb15430ed977cbc98d30345b71728b66
 2015-03-21 16:40:24 +00:00
drh
c435cf75a5 Fix the blocking WAL lock so that it works and so that it compiles on a Mac. 
FossilOrigin-Name: 67d69d21de32816894be53e4b446656d4174eb0d
 2015-03-21 16:36:03 +00:00
dan
b4e0fd26e3 Remove an unreachable branch from the OP_VCreate opcode (merge accidental fork in trunk). 
FossilOrigin-Name: 2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
 2015-03-21 12:25:23 +00:00
dan
998aaa03ea Avoid an integer overflow in fts3 causing gcc 4.7.1 with -O2 to behave counter-intuitively (perhaps because the behaviour is undefined). Add an "ifcapable trace" to a test in shell4.test. 
FossilOrigin-Name: e3e234649616f20610abce9ae9da1c572d3a4377
 2015-03-21 12:22:51 +00:00
drh
474640638d Remove an unreachable branch from the OP_VCreate opcode. 
FossilOrigin-Name: 5fca41a3811766b48f5f23d5d49cc4e6e79fa867
 2015-03-21 12:22:16 +00:00
dan
e56f53ef7c Add a missing "ifcapable fts3" to a test case in vtab2.test. 
FossilOrigin-Name: d845b0f69093178517d66e1fc5060e8f62c681c7
 2015-03-21 10:53:01 +00:00
drh
8f9d0b2b25 Correctly detect the error of having a "*" wildcard on a SELECT without 
a FROM clause on the left-hand side of a recursive CTE.

FossilOrigin-Name: b11d1793a06a44931edcbf12a615b49794d53a62
 2015-03-21 03:18:22 +00:00
drh
f063685079 If a column is both UNIQUE and a PRIMARY KEY, make sure the PRIMARY KEY 
designation takes precedence.

FossilOrigin-Name: d871a7921722bb0fef6d51e1110a9703ddff78c8
 2015-03-21 02:58:20 +00:00
mistachkin
48cc29a9ac Merge updates from trunk. 
FossilOrigin-Name: 441a00e70d8c0a3d09b7f283a65a2918791ad1bb
 2015-03-21 02:34:17 +00:00
mistachkin
299903c6a6 Remove superfluous define from the MSVC makefile. 
FossilOrigin-Name: 880d2513a0fb084fae82080401b108fb13e61478
 2015-03-21 02:25:29 +00:00
mistachkin
44723ce096 Improvements to the MSVC build. Fix harmless compiler warnings. Enable use of 'stdcall'. 
FossilOrigin-Name: 737630b87314283b2c38790ace9d25ec05f81f4a
 2015-03-21 02:22:37 +00:00
drh
e441efb688 Provide the BTREE_SEEK_EQ hint to the b-tree layer. 
FossilOrigin-Name: 3c367004dab0a1a24d955482c97b0f2d84129ab6
 2015-03-20 16:54:29 +00:00
drh
1fa509afa1 Fix to get SQLITE_SMALL_STACK working correctly again after the previous change. 
FossilOrigin-Name: 78df0ce13d4f35226f2571bd7de78484ccbee4bb
 2015-03-20 16:34:49 +00:00
drh
e0997b341b Provide the BTREE_SEEK_EQ hint to the b-tree layer. 
FossilOrigin-Name: e750830f1e61160c0c67e35b13e50b35a95b50e1
 2015-03-20 14:57:50 +00:00
dan
80103fc614 Fix a problem causing collation sequence names to be dequoted multiple times under some circumstances. 
FossilOrigin-Name: eddc05e7bb31fae74daa86e0504a3478b99fa0f2
 2015-03-20 08:43:59 +00:00
drh
17ba562025 If a virtual table is created with a malformed UTF8 name in a UTF16 database, 
make sure that does not cause problems.

FossilOrigin-Name: b74cb0a92bba69f8ea705adf4695d03ea4470984
 2015-03-19 20:09:16 +00:00
dan
8b3c0ae47c Fix a crash that can occur following an OOM condition within a CREATE VIRTUAL TABLE statement on a utf-16 database. 
FossilOrigin-Name: 9453e7da046c55715631f10f018e97a336197969
 2015-03-19 19:59:30 +00:00
dan
7377945a7b Fix a problem with creating virtual table with names specified using malformed utf-8 within utf-16 databases. 
FossilOrigin-Name: 9969cff2d0553c9bfa88a437e1bb0cc4200d49d7
 2015-03-19 18:56:17 +00:00
dan
b7134d0863 Fix an FTS3/4 problem with handling empty tokenizer declarations (e.g. "CREATE VIRTUAL TABLE t(tokenize=);"). 
FossilOrigin-Name: 26d2def8a53094356008861636d66f9ae8f2448a
 2015-03-19 16:25:42 +00:00
dan
e0417626ea Silently ignore any attempt to add a prefix index for prefixes zero bytes in size to an fts3/4 table. Or any prefix index size so large that it overflows a 32-bit signed integer. 
FossilOrigin-Name: ad4b19d2ac0889a23fe3b0fd844286efc10cdd82
 2015-03-19 15:52:07 +00:00
dan
b77009fdd9 Add an assert() to check that the database mutex is held in sqlite3BtreeLeave(). 
FossilOrigin-Name: 31f54d7b0798e70da6a60b8ea3c5d9e35dce164c
 2015-03-19 15:04:23 +00:00
mistachkin
ba132c7728 Fix typo in shell error message. 
FossilOrigin-Name: 775a02d597549567a0634483525664643064b3fd
 2015-03-19 14:48:38 +00:00
mistachkin
398f109dfb Merge updates from trunk. 
FossilOrigin-Name: 3e363f405655e2e39588029d797496a952cca11d
 2015-03-19 14:46:52 +00:00
drh
657b4a87e5 Fix a bug in error handling in the ".trace" command of the command-line shell. 
FossilOrigin-Name: 6a48b5d794e891fdd167547c76835d677eb5e31d
 2015-03-19 13:30:41 +00:00
dan
c3b328da6e Allow whereShortCut() to use the PRIMARY KEY index of a WITHOUT ROWID table to optimize a vector of "IS" operators in a WHERE clause. 
FossilOrigin-Name: 52e73eeca063bb30092ce600068bf487641399a0
 2015-03-18 20:03:27 +00:00
dan
9340de52e2 Clarify that OTA is unable to update or delete rows with NULL values in primary key fields. 
FossilOrigin-Name: 2e7c1e0a0d128d9bac119692b2505b5ed0abe87a
 2015-03-18 19:04:40 +00:00
drh
2b3f1409db Add another sqlite3FaultSim() to the multi-threaded sorter logic to 
improve testability.

FossilOrigin-Name: 49ea2cded4a76596f85419c820cdaf4a1751d7ac
 2015-03-18 16:00:44 +00:00
drh
d671e66337 Clarify the documentation on sqlite3_errcode(). No changes to code. 
FossilOrigin-Name: 2c0e0d87fb418d684fba1c83d9fd8e4e96588c54
 2015-03-17 20:39:11 +00:00
drh
5572f7e42e Also merge the WAL blocking lock tests that were somehow missed on the 
previous check-in.

FossilOrigin-Name: 7214dab7443d35c105904dd69635c1f8b45b2fc8
 2015-03-17 17:08:35 +00:00
drh
a5eaece932 Transient locks in WAL mode can now block in order to resolve priority 
inversions.

FossilOrigin-Name: ec2f46de531ec8ef91981b19b48ab64db7727264
 2015-03-17 16:59:57 +00:00
dan
363fc9e724 Add a test for the change on this branch. 
FossilOrigin-Name: e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
 2015-03-17 16:01:29 +00:00
dan
f104abba84 Make SQLite slightly more likely to use an auto-index within a sub-query. 
FossilOrigin-Name: ab832336f4a28193c4d2b61e833564822a7b86a8
 2015-03-16 20:40:00 +00:00
mistachkin
05b6048dbd Fix typo of test prefix in the new WHERE test file. 
FossilOrigin-Name: 34779c528f1817d6ec34216b58fb4277956b5167
 2015-03-16 18:08:56 +00:00
drh
29894b6d2b When the WHERE clause contains two OR-connected terms with identical 
operands but different operators, try to combine them into a single term.
Example:  (X=A OR X>A) becomes (X>=A).

FossilOrigin-Name: 8bdda827a3d268009297a0216e3d94bf0eceeb2e
 2015-03-16 17:48:12 +00:00
drh
07b38959a4 Modify the fts3query.test script so that it works even when testfixture is 
built using a version of TCL that is unable to sort the
integer -9223372036854775808

FossilOrigin-Name: f61fd24b4d3b686911ea578f77612309099f0cc6
 2015-03-16 17:07:09 +00:00
drh
75a4d7c3da When deleting the master journal to commit a multi-database transaction, do 
not sync the directory if PRAGMA synchronous=OFF for all participating
database files.

FossilOrigin-Name: 018d7671402a0f8103d1306641655b69f9fa235d
 2015-03-16 16:44:55 +00:00
dan
5f881b8c8d When estimating the number of rows visited by a range scan for which the keys consist of more than one field, consider prefixes of stat4 samples as well as the full samples. This generates more accurate estimates. 
FossilOrigin-Name: 3e0590dee0e68cc1599858757c650a7378026170
 2015-03-16 16:28:43 +00:00
drh
8cdcd87c53 Use #ifdef to omit code that is only used for STAT3 and STAT4. 
FossilOrigin-Name: f2c9c5b57b7739daafc44e8ec36d4a2beacd5f17
 2015-03-16 13:48:23 +00:00
drh
c03acf2ea7 Improved comments. No code changes. 
FossilOrigin-Name: 23f71a26386ff2aff9800fe96cec1dc9c805b5b6
 2015-03-16 13:12:34 +00:00
drh
8426636cdc When a WHERE clause contains disjuncts with the same operands, try to 
combine them into a single operator.  Example:  (x=A OR x>A) becomes
(x>=A).

FossilOrigin-Name: 7a3097689d17625fb0dfc4372712f375f3bdb9a1
 2015-03-16 12:13:31 +00:00
dan
a0d56aef18 Another test case for the planner change on this branch. 
FossilOrigin-Name: f2207a0691ed361061719f4dacf021a677a9d892
 2015-03-16 09:21:30 +00:00
dan
a3d0c13654 When estimating the number of rows visited by a range scan for which the keys consist of more than one field, consider prefixes of stat4 samples as well as the full samples. 
FossilOrigin-Name: e1caf93c9ad0ee15d42030af95619f212d3fcf9d
 2015-03-14 18:59:58 +00:00
dan
dfac7016a7 Add tests to ensure "PRAGMA incremental_vacuum" and "PRAGMA auto_vacuum = incremental" handle corrupt databases correctly. 
FossilOrigin-Name: 1c2166cb2a387a0856f41b399c3648bf8c5fce73
 2015-03-13 15:44:36 +00:00
dan
3df3059252 Extra tests for commit [0f250957]. 
FossilOrigin-Name: 5aa522dcb9bfa18d49683f7cc889516984e2bcd2
 2015-03-13 08:31:54 +00:00
drh
e9b9f7599a Remove debugging logic accidently included in the previous check-in. 
FossilOrigin-Name: 2887fb38ffc28712c34028cd38db2b7993d864eb
 2015-03-13 00:11:09 +00:00
drh
3df79a9a1f Fix the "now" option for date-time functions for cases when STAT4 is disabled. 
FossilOrigin-Name: 3ac1f6a3cf1a8fd3ab1ca96b2564c13c4b8d2234
 2015-03-12 23:48:27 +00:00
drh
3795f3cee3 When STAT4 is enabled, allow probes of the STAT4 table using the value 
of constant functions computed at compile-time.

FossilOrigin-Name: 0f250957cd82be63e44eb99be6cc10760f4fdfc4
 2015-03-12 21:22:08 +00:00
drh
96f4ad20fd Always disallow functions as the DEFAULT of a column. Add assert()s and 
FossilOrigin-Name: a991bb1a9eb54bdbd45bd623e8b304bdfeb481a3
 2015-03-12 21:02:36 +00:00
dan
63c088e783 Disable multiplexing of master-journal files in the test_multiplex.c module. 
FossilOrigin-Name: b8684df395b5585a9428417c2bfd076515560f19
 2015-03-12 19:12:30 +00:00
drh
81367381a9 If an error occurs in the compile-time evaluation of an application-defined 
function, then propagate back out the exact error code, not just the
generic SQLITE_ERROR.

FossilOrigin-Name: 93f42586cc9db63c5a4599ce06630e60204a5bc9
 2015-03-12 18:38:51 +00:00
drh
a9e03b1b82 The valueFromFunction() routine is better able to handle OOM errors. 
Omit unreachable branches.

FossilOrigin-Name: 8fb6bd9be59d6b04e922d7b246aaefd4851539b6
 2015-03-12 06:46:52 +00:00
drh
0a0d0560ab Improve the text on one of the opcode documentation comments in vdbe.c. 
FossilOrigin-Name: 08958f57970d2346f3e98e62225e2b5d351d12d8
 2015-03-12 05:08:34 +00:00