mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,019 Commits 1,487 Branches 166 Tags 416 MiB
5dd72ad6df
Commit Graph

9019 Commits

Author SHA1 Message Date
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
drh
3ca84ef623 Add the (deliberately undocumented) sqlite_log() SQL function as a built-in. 
FossilOrigin-Name: f7806e03995b314771aa72a08ce55d56d60096cf
 2011-04-25 18:03:10 +00:00
drh
9a3baf10ca Invoke the unix open() system call through a wrapper to avoid problems 
resulting from differing declarations to that function in various systems.

FossilOrigin-Name: 4c7ff4dd352276e9c01cc536e188cbcd69396952
 2011-04-25 18:01:27 +00:00
drh
713de341a7 Disable the transfer optimization if the destination table contains 
any foreign key constraint and foreign key constraints are enabled.
Ticket [6284df89debdf].

FossilOrigin-Name: ddeea5ab5f6c0c4a86cdfbbb9f24d9d54bf8d301
 2011-04-24 22:56:07 +00:00
dan
8e98037c1b Test that it is now possible to use different VFSs for two databases attached to a single handle. 
FossilOrigin-Name: 2af51f856c6203f836d8bb62b6b79b19554886e7
 2011-04-23 19:06:26 +00:00
dan
3a6d8aec2a Have the ATTACH command do URI interpretation in the same way as sqlite3_open() and sqlite3_open_v2() do. 
FossilOrigin-Name: 68240e75e87a54cde93352b0ec364d34365a8170
 2011-04-23 15:54:54 +00:00
dan
5de1537478 Fix parsing of %00 in uri handling code. 
FossilOrigin-Name: 44f0874a95408c75a296964a04eef00341abb94a
 2011-04-23 10:12:30 +00:00
drh
092e4bdb91 Add the "getlock" utility for determining if a database file (on unix) is 
currently locked.

FossilOrigin-Name: 0ab24b133e332ad7f4517b8e113e9c241ee9af9f
 2011-04-22 22:55:10 +00:00
dan
cd74b611f4 Add the start of the "uri-filenames" feature. 
FossilOrigin-Name: b8a8132e7148a7c90ca1352f20ab71d97b0bc4b0
 2011-04-22 19:37:32 +00:00
dan
fc083ab973 Update a comment in e_createtable.test. 
FossilOrigin-Name: d8b149f5e465f7794739ed0210e1e5c53110ee9a
 2011-04-20 13:35:44 +00:00
dan
355c53b6ef Avoid passing NULL to the xOpen method of an FTS3/4 tokenizer. 
FossilOrigin-Name: 0dd09fc034c127718366d3a3183e367d2f9fd82d
 2011-04-19 06:43:22 +00:00
drh
1c4e603727 Change the prototype for the open() system call to agree with Posix. Though 
a faulty function prototype in a pointer cast is a seemingly innocuous error, 
the correct prototype is necessary for pthreads to work correctly on NetBSD.

FossilOrigin-Name: 3e135748f1efacb52b414b3ac3f4ae2c08bcd8fb
 2011-04-17 17:09:58 +00:00
shaneh
35913a49db Adjust some test cases in triggerC.test to handle non-default SQLITE_MAX_TRIGGER_DEPTH settings. 
FossilOrigin-Name: 9d6c6129fd8be42c164f14bb90011b252c1f2c46
 2011-04-17 00:55:13 +00:00
shaneh
b76ee876ba Adjust test case in quota.test to handle Windows dir seperators. 
FossilOrigin-Name: 75ed1bcee85587ddd54269156aa53df5f456a6c4
 2011-04-15 21:37:33 +00:00
shaneh
9dd6e0801d Updates to test code in os_win to bring winSync inline with unixSync (test code only). 
Updated a few test scripts to account for dirsync counting issues on Windows.

FossilOrigin-Name: 8f99c5bf639ee4f6384cc3c2d7f056d1b08e4f16
 2011-04-15 20:18:40 +00:00
shaneh
ca591feb34 Remove stray semi-colon that MSVC complained about. 
FossilOrigin-Name: 7a085271ff85033479c2057c19a45a750168d228
 2011-04-15 19:30:42 +00:00