Commit Graph

9034 Commits

Author SHA1 Message Date
drh
cc487d13fc Add the sqlite3_uri_parameter() interface function for use in building
new VFSes.

FossilOrigin-Name: 6b5de95fb575c7ceb3034068c4f5e0fccb1b15ac
2011-05-17 18:53:08 +00:00
dan
133d7dab17 Add extended return code SQLITE_CORRUPT_VTAB. Returned when the tcontents of the sqlite tables used internally by a virtual table module are invalid or inconsistent.
FossilOrigin-Name: 8844e8bfb87314fb40ecb92705e8fff88f72bb38
2011-05-17 15:56:16 +00:00
drh
fc24373999 Avoid exceeding array bounds when reading a corrupt database file in
autovacuum mode.  Fixes a problem discovered by John Regehr and Peng Li
using a customized clang compiler.

FossilOrigin-Name: f7c525f5fc31e909721df2b1e66fc62dfb105718
2011-05-17 15:21:56 +00:00
dan
807d0fcaba Avoid including fts3_term.c in the amalgamation, as it contains test code only.
FossilOrigin-Name: f392b7ae0266b4c694836583cb91b10f2b6c0752
2011-05-17 14:41:36 +00:00
drh
85a8375580 Enhance WAL mode so that the WAL file honors the journal size limit set
by PRAGMA journal_size_limit.

FossilOrigin-Name: db7e500f69faf1906a84991ba67d26a195f02ae5
2011-05-16 21:00:27 +00:00
drh
99a66928c2 Make arrangements so that virtual table inserts into shadow tables do
not modify the sqlite3_last_insert_rowid() return.  Document that this
is how sqlite3_last_insert_rowid() works.

FossilOrigin-Name: e569f18b989aef853c9d71eaf73d6967f0a8c583
2011-05-13 18:51:42 +00:00
drh
79d0e1c0a7 Also add fts3_term.c to main.mk.
FossilOrigin-Name: 966f2d2c1f01b6345eab5df87a40d337ced1c087
2011-05-13 17:11:20 +00:00
shaneh
671b52242b Add fts3_term.c to amalg gen script and configure input files.
FossilOrigin-Name: 6ee0773290a4c4aac2b2b5e1741e65170e08a8bb
2011-05-12 21:01:12 +00:00
drh
b706fe58ab Improvements to documentation hyperlinks. Change the value of
SQLITE_OPEN_URI to an unreserved value.

FossilOrigin-Name: 851ab75d5f5d64d95d6237c28658bbc32145b78b
2011-05-11 20:54:32 +00:00
drh
55fc08f154 URI filename documentation updates.
FossilOrigin-Name: 8885c8677b239d4cbef24b9409a1736e1ae97a3f
2011-05-11 19:00:10 +00:00
dan
1943299629 Have flags passed to sqlite3_open_v2() apply to the main and any attached databases. And change things so that any "mode=xxx" or "cache=xxx" options specified as part of a URI for the main database do not also apply to attached databases.
FossilOrigin-Name: 3e490915301216e242a5cdeb0febaff12ed53cb9
2011-05-10 18:39:10 +00:00
dan
eaadd59ab0 Update URI test cases to account for the new error message format.
FossilOrigin-Name: 5bde568028216f5bbf76fa0b61bf5b736699f4b1
2011-05-10 17:43:28 +00:00
drh
e9d45e347e Add new documentation keywords to the sqlite3_vfs description.
FossilOrigin-Name: ad3389a9ab07f6b811841ffa76a5292719c4487d
2011-05-10 10:17:02 +00:00
drh
de941c3756 Return a suitable error message if the mode= argument to a URI specifies
a higher mode than what is allowed by context.  Other minor cleanups for
the URI parsing logic.

FossilOrigin-Name: d9bc1c7fe0ca5f6973a85827330958f4d09f8171
2011-05-09 19:20:17 +00:00
drh
ffd9668fb5 Set the sqlite3.mallocFailed flag if sqlite3ParseUri fails with SQLITE_NOMEM.
FossilOrigin-Name: ca3797d4967361e31a8a5ce1ce8190b095f3ed4c
2011-05-07 18:40:36 +00:00
drh
5dd72ad6df Return SQLITE_MISUSE from the sqlite3_open_v2() function if the 3rd parameter
is not a valid set of bit-values.

FossilOrigin-Name: 3c926ce0976e765b4c51fcd81d251268ff21a741
2011-05-07 18:18:33 +00:00
drh
522c26fbfb Fix minor compiler warnings.
FossilOrigin-Name: 139eecbe1b072711a36128f1eeb24fc3e3bacc1c
2011-05-07 14:40:29 +00:00
dan
c46948a09d Merge the uri branch with the trunk.
FossilOrigin-Name: 88df33c45fd5875ea82bc757b239fe3e61663c12
2011-05-06 18:55:31 +00:00
dan
8d7a2d3b45 Remove some unnecessary modifications from the uri branch. Add a test to show that ATTACH only interprets its argument as a URI if the connection was opened with SQLITE_OPEN_URI (or URI interpretation is globally enabled).
FossilOrigin-Name: aa90b943254cf348aa2d23ac05e1895b188e2101
2011-05-06 18:53:27 +00:00
dan
286ab7c2b1 Update comments and documentation associated with new URI parsing code. Add test file e_uri.test, containing tests mapped to documentation regarding URI filenames.
FossilOrigin-Name: 92751788eae082e3104838cb6dd8b9793cb325d1
2011-05-06 18:34:54 +00:00
dan
7fa104889c Merge windows test case fixes. No changes to code.
FossilOrigin-Name: 2e5c0ed724060388b97e0c0881bb1b68ec1a23b4
2011-05-06 13:58:03 +00:00
drh
e578b5967c Increase the iVersion for sqlite3_module needed for the xSavepoint,
xRelease, and xRollbackTo methods from 1 to 2.  This is so that it will
conform to published documentation.

FossilOrigin-Name: 0f4954e9793332573d4ffa0c1e199180f4cb990a
2011-05-06 00:19:57 +00:00
drh
367e84d089 Fix an incorrect assert() in sqlite3_value_config(). Updates to the
sqlite3_value_config() documentation.

FossilOrigin-Name: 22cbc01a2600c6100112315d9afb5f2d8f80b3df
2011-05-05 23:07:43 +00:00
dan
33f5379c43 Changes to various test scripts so that they pass on windows.
FossilOrigin-Name: 1586244b6d86d5a98af8c6f7a8324672e02df9c3
2011-05-05 19:44:22 +00:00
dan
4d7a4461e2 Have the xFullpath method in os_win.c discard the initial "/" if a filename begins with "/X:", where X is any alphabetic character. Also fix some test issues in uri.test.
FossilOrigin-Name: fe57a8f621944fd2af5a4e9349c8fd77c4aba237
2011-05-05 18:53:48 +00:00
drh
87f67bf143 Fix sqlite3_vtab_on_conflict() to return the correct values for
ABORT, FAIL, and IGNORE.

FossilOrigin-Name: f0617d619dc6654f6d27543999c0aad724a0d967
2011-05-05 17:41:58 +00:00
drh
2e5a422eee Fix a bug in memory usage tracking that was introduced by
check-in [4e33a0eaf83922].

FossilOrigin-Name: 8ba456ae0b3d0c0b6f72f98bd0bc28f72dfa4ff5
2011-05-05 17:00:51 +00:00
drh
ef45bb75b3 Bump the version number to 3.7.7 on account of the new sqlite3_vtab_config()
and sqlite3_vtab_on_conflict() interfaces.  Updates to the documentation on
those interfaces.

FossilOrigin-Name: 930be6a1bdec8c150caafd790973f7a401fc1970
2011-05-05 15:39:50 +00:00
drh
7af72cf963 Change sqlite3_create_module() so that it avoids resetting the schema as
long as preexisting modules are unchanged.

FossilOrigin-Name: 8485855afc71fb8078d53719c3da75021890ce9e
2011-05-05 13:54:28 +00:00
drh
134ec491c5 Add a #include to test_demovfs.c in an effort to get it to compile on Solaris.
FossilOrigin-Name: 8f06ea33c9070de8ea85368d76cf26237d1aee73
2011-05-05 13:53:46 +00:00
dan
00142d70a9 Fix a problem in the URI code preventing the amalgamation from building. Add comments describing SQLITE_CONFIG_URI and SQLITE_OPEN_URI to sqlite.h.in.
FossilOrigin-Name: ea562d6d67c2f2ef8baca02a77634c21b945196f
2011-05-05 12:35:33 +00:00
dan
ff4ec04240 Merge latest trunk changes with uri branch.
FossilOrigin-Name: af279f367e01732560b8b2b6aeb5ede4f04415dd
2011-05-04 17:35:12 +00:00
dan
7b0ced74c0 Merge vtab-conflict branch with trunk.
FossilOrigin-Name: 8f9666af5f9459cbd0305a86281d745ea6163acf
2011-05-04 17:23:19 +00:00
dan
62d6c7e32b Fix a couple of compiler warnings in the FTS code.
FossilOrigin-Name: 1a113359705d307efa1833b1dfa5542b045dae43
2011-05-04 16:30:05 +00:00
dan
e1c8e13bf6 Fix a performance problem in queries that use "ORDER BY rowid DESC" and one or more FTS auxiliary functions.
FossilOrigin-Name: 95e09b20e9aad28f829c8950f3632debe473070a
2011-05-04 15:41:18 +00:00
dan
0f599faa29 Optimize "ORDER BY rowid/docid DESC/ASC" clauses on FTS tables.
FossilOrigin-Name: 13395121e3d17ab6581dc5f6736ea324321a374c
2011-05-04 12:52:59 +00:00
dan
6d49e25613 Remove some unused code related to URI parsing.
FossilOrigin-Name: 008cd0ef6b504cf4549468f795aa46f8472f0130
2011-05-03 15:09:05 +00:00
dan
3b18a9a334 Allow only "localhost" and "" as authorities in URIs. Do not allow escapes (%HH) in the authority part of a URI.
FossilOrigin-Name: b8a0f1b523d1f31c8e7a102ba4bae5935b07104a
2011-05-03 11:53:20 +00:00
dan
78e9dd2b54 Change the supported URI options to "mode" and "cache".
FossilOrigin-Name: 0a694a0b27e3ce251ce313cb5d19a7637c2fa309
2011-05-03 10:22:32 +00:00
dan
fb261ceceb Merge the latest trunk changes into uri branch.
FossilOrigin-Name: 7fdd0786c7e0d66baf3aba4485128e16a4e5ea46
2011-05-02 17:41:01 +00:00
dan
c6055c7374 Have r-tree virtual tables support on-conflict clauses.
FossilOrigin-Name: 822ab52f1023b1c4973c806cc75454acd4e95fd0
2011-04-28 18:46:46 +00:00
drh
4d953fd5b1 In windows, ignore ERROR_NOT_LOCKED when calling the read-lock removal
routine.

FossilOrigin-Name: f55156c5194e85c47728b8a97fde3e5f0a5c9b56
2011-04-27 19:54:44 +00:00
drh
840561f2a4 Change the name of an internal function to avoid conflicts with the math
library.

FossilOrigin-Name: 1bd1484cd7e09709d87aa84b82e87597d00a4162
2011-04-27 18:08:42 +00:00
drh
5b92f192d9 Expose the UTF8 to MBCS conversion routine in os_win.c to external
applications.

FossilOrigin-Name: 7b479b9bee93df909edecd44c7d6584d943b39c9
2011-04-27 16:05:42 +00:00
dan
3480a01dad Add documentation for the newly introduced sqlite3_vtab_config() and on_conflict() API functions. Test that encountering an SQLITE_MISMATCH in fts3 does not corrupt the full text index.
FossilOrigin-Name: abdd70ae0424ccadb7edaf16e970c78b5257d23c
2011-04-27 16:02:46 +00:00
dan
d9495cd0c6 Fix problems related to savepoint rollback and fts3.
FossilOrigin-Name: ff69f823f23e6fb6e8b2857c4576d9c0732d9572
2011-04-27 12:08:04 +00:00
drh
5275d2ee63 Fix a comment typo.
FossilOrigin-Name: 19c6625abd5b4e6a4406a8e421ae22527529e305
2011-04-27 01:00:17 +00:00
dan
a311b80392 Extra tests for fts3. And fixes for conflict-handling related problems in fts3.
FossilOrigin-Name: fb4a355871d9482ccb28b6ba03b842b3cc87b696
2011-04-26 19:21:34 +00:00
dan
b061d058cb Add support for on conflict clauses to fts3/fts4.
FossilOrigin-Name: 6d2633a6d0a9bb88fb1a6adac0827dc51df2d4d2
2011-04-25 18:49:57 +00:00
drh
53a9d15826 Test case for the ".log" command to the command-line shell.
FossilOrigin-Name: 7d0ff26a95cb1e9fcace4641245dda787f3522b4
2011-04-25 18:20:04 +00:00