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
7b0ced74c0
Merge vtab-conflict branch with trunk.
...
FossilOrigin-Name: 8f9666af5f9459cbd0305a86281d745ea6163acf
2011-05-04 17:23:19 +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
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
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
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
drh
8e1bb041a8
Changes to memory allocator usage tracking to delay the onset of integer
...
overflow.
FossilOrigin-Name: 4e33a0eaf83922926f8d5ee988a20439a09bc795
2011-04-15 16:39:52 +00:00
drh
3e9548b30d
Do not do full table scans of unordered indices.
...
FossilOrigin-Name: a8761a9128de945aa4b6196df5ffe64115d66b61
2011-04-15 14:46:27 +00:00
drh
d4a80312b8
Fix #ifs involving SQLITE_ENABLE_LOCKING_STYLE so that they check the value of
...
that macro and not whether it is defined.
FossilOrigin-Name: 8775f159c129e1ee36a1a13c362184713376bd40
2011-04-15 14:33:20 +00:00
drh
a21b83ba3b
Make sure the unix backend returns SQLITE_FULL if write() fails with an
...
ENOSPC error code.
FossilOrigin-Name: 721e3c16b389a43f5d7c47a8fd0294473a39dad2
2011-04-15 12:36:10 +00:00
drh
5f2dfdbc23
Remove extra CR and NL characters from FormatMessage() generated error
...
messages in the windows VFS.
FossilOrigin-Name: 8332949c28ac72890de82b49bc11f02064b2647d
2011-04-13 23:42:53 +00:00
drh
50990dbb29
Add new extended error codes for I/O errors on seek and shared-memory map.
...
Add sqlite3_log() calls in the windows backend to record details of errors.
FossilOrigin-Name: fe603217fce8e3a696bd108d5ae7f7a291b7e215
2011-04-13 20:26:13 +00:00
drh
2aa5a00e70
Make sure the array of overloadable system calls is always correctly
...
sized, regardless of the compile-time configuration.
Ticket [bb3a86e890c8e96ab].
FossilOrigin-Name: c6e727ab3b16e71b0151673bb24b0bafec368ee6
2011-04-13 13:42:25 +00:00
drh
a6c47493ee
Do not override the fchmod system call in unix unless the
...
SQLITE_ENABLE_LOCKING_STYLE compile-time option is engaged.
FossilOrigin-Name: 51029d8430d2dbc782f161577d47e3dd11c4e4d7
2011-04-11 18:35:09 +00:00
drh
c6e4172a12
Updates to the OS/2 patches. This change also move the location of a global
...
variable declaration in shell.c which might effect other build targets.
FossilOrigin-Name: 73906b67dc920e0c36e68ef9a302be3b495e8e3a
2011-04-11 15:36:26 +00:00
drh
68bf06716d
Fix a signed integer overflow problem in the testcase() macro.
...
FossilOrigin-Name: f18f5f5893a0d37ecedcfcfdddbe06cdbe0b4243
2011-04-11 15:35:24 +00:00
dan
6950c616ff
Apply OS2 WAL patch. Changes to os_os2.c only.
...
FossilOrigin-Name: eac17106808fa54551a18ff9b44f8370cb5d7160
2011-04-11 13:57:26 +00:00
drh
806ebcb449
Remove an always-true conditional. Replace it with an assert().
...
FossilOrigin-Name: 1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
2011-04-09 17:53:30 +00:00
dan
579667537a
Add VerifyCookie instructions to "DROP XXX IF EXISTS" statements if the specified database object does not exist when the statement is prepared.
...
FossilOrigin-Name: a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
2011-04-09 17:32:58 +00:00
dan
7687c83d4c
Add an OP_VerifyCookie instruction to "CREATE XXX IF NOT EXISTS" commands. This way, if the specified database object existed when the statement was compiled but removed from the database before sqlite3_step() was called, the statement still works as expected (and creates the object).
...
FossilOrigin-Name: b9dbd9936191666c3fc9889e938344a82cc03aeb
2011-04-09 15:39:02 +00:00
drh
c2822b76b4
If the keyword "unordered" appears at the end of the SQLITE_STAT1.STAT
...
column for an index, then use that index for equality lookups only, never
for range queries or sorting. This feature is currently undocumented and
my change or be removed in a future release.
FossilOrigin-Name: 8a42e236701c8afd9ada7d4568712a21690ea087
2011-04-09 03:20:59 +00:00
drh
2184fc75a2
Back out the SQLITE_OMIT_UNIQUE_ENFORCEMENT compile-option. It is an unneeded
...
complication.
FossilOrigin-Name: 927e955b93e869727c55b784401de3ea07bee257
2011-04-09 03:04:13 +00:00
drh
9f6106f5ee
When ATTACH-ing a new database to an existing database with a codec, do
...
not enable the codec in the attached database if it is not enabled in the
existing database and it is not requested by the USING clause.
FossilOrigin-Name: 4caa5fc86e7fe404cd188713277f2801cd02dbc9
2011-04-09 02:34:33 +00:00
drh
2b89fbcb1e
Do not do a backup if the number of reserved bytes in the source and
...
destination do not match. Try to make the match, but if unable fail.
FossilOrigin-Name: 0ca8a2332b28d88585dc890e5162b095e783fc20
2011-04-09 02:09:44 +00:00
drh
ea6dc4458b
Always make sure the left-hand side of the IS NOT NULL operator is a
...
smiple column, not a general expression, before applying the IS NOT NULL
query optimization.
FossilOrigin-Name: 543f75a6abe3aa4f49df43e71a462702d40b3251
2011-04-08 21:35:26 +00:00
drh
041e09f189
Change two new internal functions in where.c from global to file scope.
...
FossilOrigin-Name: 5bbfa17d4d6db18f8077f758d70c1bc253b58e2e
2011-04-07 19:56:21 +00:00
drh
93b4fc78cf
When searching a list of freelist trunk pages looking for a specific page
...
to allocate, avoid unnecessary journalling of the unchanged trunk pages towards
the start of the list.
FossilOrigin-Name: d03d63d77ed144ac2c02a0245c4b4b070b79c88e
2011-04-07 14:47:01 +00:00
dan
7329ed9b38
Do not run multi-threaded Tcl tests if the library was built with SQLITE_MUTEX_NOOP defined.
...
FossilOrigin-Name: e4e99606fdf1f1cecf914dc865b066bf07793d1f
2011-04-07 10:09:00 +00:00
shaneh
cef8368093
Fix a couple of MSVC compiler warnings;
...
FossilOrigin-Name: 748c9109c973e1d3e914adbe533f12af7783bfe4
2011-04-07 03:41:01 +00:00
drh
8b2b2e67fe
Fix typos in documentation comments. No changes to code.
...
FossilOrigin-Name: 9c64b5a99c5251818000e7d655f3a870589b631e
2011-04-07 01:14:12 +00:00
drh
dc5b047ec3
Fix a performance regression: Keep two btree masks in each prepared
...
statement; one for btrees used and another for btrees that require locks.
Only try to lock the btrees identified by the second mask.
FossilOrigin-Name: 614de91a504d2231009a9de1305e31fce1b1c5a6
2011-04-06 22:05:53 +00:00
dan
dc5df0f824
Fix a benign inaccuracy in the os_unix.c SQLITE_FCNTL_SIZE_HINT code.
...
FossilOrigin-Name: 61a6ccbe3c9c3ad5f35fb325e3c327cb19409925
2011-04-06 19:15:45 +00:00
dan
bb2b441867
Changes to support building with various SQLITE_OMIT_XXX options defined.
...
FossilOrigin-Name: 2039ed952a02bdcd4fc6d2e20572c4632084dcdb
2011-04-06 17:54:31 +00:00
dan
6d59c2c1c2
Update a comment in sqliteLimit.h. No changes to code or tests.
...
FossilOrigin-Name: b7296fd380319bcae26b1ac13f23e57a4852881b
2011-04-06 12:38:10 +00:00
drh
fcd71b6010
Suppress many harmless compiler warnings, mostly signed/unsigned comparisons
...
within asserts or unused parameters in extensions.
FossilOrigin-Name: 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
2011-04-05 22:08:24 +00:00
drh
1a86f50d85
Simplifications to the sqlite3BtreeEnterAll() and LeaveAll() routines.
...
Just have them call BtreeEnter and BtreeLeave() repeatedly rather than
trying to be clever.
FossilOrigin-Name: 51039b3578f948c23a810d176e81fa51a278fb28
2011-04-05 19:27:41 +00:00