Commit Graph

4126 Commits

Author SHA1 Message Date
drh
0a0e131c7e Revise the amalgamation so that all symbols have file scope except those
that begin with "sqlite3_".  Ticket #2554. (CVS 4197)

FossilOrigin-Name: 73db545289a1a99bd48b22895d2a3ee86540f107
2007-08-07 17:04:59 +00:00
drh
e6e4d6bb1a Fix some compiler warnings. (CVS 4196)
FossilOrigin-Name: 6cc15409ad6baefbe6e2214a4ac1cb3a0433f922
2007-08-05 23:52:05 +00:00
danielk1977
19b26f37b7 Change some (English language) grammar in faq.tcl. Ticket #2480. No code changes. (CVS 4195)
FossilOrigin-Name: e526817f158883f617720fd389741a29454ad483
2007-08-03 08:18:44 +00:00
danielk1977
d42f8fdc7a Avoid reloading the schema when an expired statement is finalized or reset.
This is only necessary when the in-memory schema does not match the file-system schema. (CVS 4194)

FossilOrigin-Name: 61de5b52daa0a862a04147dbaf71fafb696052f6
2007-08-03 07:33:08 +00:00
drh
bb9491293b Fix a typo in limits.html. (CVS 4193)
FossilOrigin-Name: c709140b51610a2fbbff15c1fd80783218780f6f
2007-07-30 23:02:38 +00:00
drh
b695acae1f Make excess output from the CLI appear inside SQL comments so as not
to interfere with generated SQL.  Ticket #2544. (CVS 4192)

FossilOrigin-Name: 49a2e85511e845051cfc6ae4318207b1866d43c9
2007-07-30 20:41:52 +00:00
rse
e21733baa5 Fix ticket #2439: the FTS1 and FTS2 extensions use the non-standard,
unportable and highly deprecated <malloc.h> header on all platforms
except Apple Mac OS X. The <malloc.h> actually is never required on
any OS with an at least partly POSIX-conforming API as the malloc(3) &
friends functions officially live in <stdlib.h> since over 10 years.
Under some platform like FreeBSD the inclusion of <malloc.h> since a few
years even causes an "#error" and this way a build failure. So, just get
rid of the bad <malloc.h> usage in FTS1 and FTS2 extensions at all and
stick with <stdlib.h> there only. (CVS 4191)

FossilOrigin-Name: 3f9a666143a8aafa0b1a5d56ec68f69f2b3d6a21
2007-07-30 18:55:36 +00:00
rse
8f30448a30 "extern" declarations inside function bodies are not every compiler's
favorite, so move to global scope. Additionally, at least under Unix
environment use <unistd.h> to get the proper prototype instead of using
a K&R-style own declaration. (CVS 4190)

FossilOrigin-Name: 5955a77d6c902dc65897ba19d6e06db3e10bd3ee
2007-07-30 18:31:53 +00:00
rse
43e47c8ec1 Get rid of the following compile-time warnings:
tool/mkkeywordhash.c:353: warning: array subscript has type 'char'
tool/mkkeywordhash.c:354: warning: array subscript has type 'char' (CVS 4189)

FossilOrigin-Name: c01d7944799d8a96a29f8d4f6d2bb7c4bb0e14bb
2007-07-30 18:26:19 +00:00
rse
be0a909683 Get rid of the following compile-time warning:
"src/shell.c:112: warning: 'iotracePrintf' defined but not used" (CVS 4188)

FossilOrigin-Name: 271e27fd30f3b99e6d6ad2fc2c6e87f43f4c76c8
2007-07-30 18:24:38 +00:00
danielk1977
eb5453d122 Fix a bug with explicit collation sequences attached to a column reference expression that is on the right-hand-side of a binary comparison operator. (CVS 4187)
FossilOrigin-Name: 7b69968618bfc19f0c1ab25c5f16c9fdff5af094
2007-07-30 14:40:48 +00:00
danielk1977
0c3f607c21 Test that an explicit collation sequence overrides an implicit one attached to a 'new' reference (it does). No code changes. (CVS 4186)
FossilOrigin-Name: a443b07ed659223401ee7acaf613d0b04f33fc89
2007-07-26 10:16:30 +00:00
danielk1977
e0fc52618c Fix two obscure memory leaks that can follow a malloc() failure in sqlite3_set_auxdata(). Ticket #2534. (CVS 4185)
FossilOrigin-Name: b88af1827bec3e8a32450dd0a073ffc3b12a5939
2007-07-26 06:50:05 +00:00
shess
a2d04e9a0f Implement xRename() for fts1 so that it is possible to rename fts1 tables.
See http://www.sqlite.org/cvstrac/chngview?cn=4143 (CVS 4184)

FossilOrigin-Name: febf75f022b9414fc456ddf274d301f95d61e1b8
2007-07-25 00:56:09 +00:00
shess
443ecd036d Replicates http://www.sqlite.org/cvstrac/chngview?cn=4151 which
modified fts2:

Modify handling of SQLITE_SCHEMA in fts2 code. An SQLITE_SCHEMA error
may cause SQLite to reload the internal schema, deleting and
recreating v-table objects. So the sqlite3_vtab structure can be
deleted out from under a v-table implementation. (CVS 4183)

FossilOrigin-Name: f9020cffda02923ef45979bb447ec2e232086ad5
2007-07-25 00:38:05 +00:00
shess
f6e3624cfc Sorry, previous check-in included a last-minute "Did it really work?"
change :-). (CVS 4182)

FossilOrigin-Name: 5db25e369a1a4b5a4d87947abdbf25f96fe64807
2007-07-25 00:27:59 +00:00
shess
9f8a4b43ef Apply change 4095 to fts1. Fix snippet generation when the left-most
column of an fts table is used in the MATCH clause. Fix for ticket
#2429. (CVS 4181)

FossilOrigin-Name: c2ba3cc0f7ac9f5dfe5ffb554f9a1cd96b28335a
2007-07-25 00:25:20 +00:00
drh
75b97c2207 Remove the comment in the documentation that says that incremental vacuum
mode is not persistent because as of 3.4.1 it is persistent.  Ticket #2528. (CVS 4180)

FossilOrigin-Name: 6c4040941e3cf84ac0b1f5797cd700c7a2ce9353
2007-07-24 10:22:57 +00:00
drh
36379e973b Detect nested aggregate functions even if the inner aggregate function is
aliased using an AS clause.  Ticket #2526. (CVS 4179)

FossilOrigin-Name: de000280c6d0b13440d2450eb6ba42073ad46c56
2007-07-23 22:51:15 +00:00
drh
2e06c67c08 The REPLACE conflict resolution falls back to FAIL when on a
CHECK constraint violation.  Ticket #2525. (CVS 4178)

FossilOrigin-Name: b213614abff90c65cc7228c87f4973150e8a9679
2007-07-23 19:39:46 +00:00
drh
95bdbbbd9e Move prototypes for LEMON-generated parser functions into sqliteInt.h.
Ticket #2521. (CVS 4177)

FossilOrigin-Name: bc02c7f1621ff46707f147c75f7e98462b01907f
2007-07-23 19:31:16 +00:00
drh
67f80b67bb Check the return value of sqlite3PagerWrite() when autovacuuming.
Ticket #2524. (CVS 4176)

FossilOrigin-Name: b4a5c62b853f7a7d38863c39be274dccd2640944
2007-07-23 19:26:17 +00:00
drh
6615095629 Rework the UTF8 reader logic in order to avoid the use of malloc().
Ticket #2523. (CVS 4175)

FossilOrigin-Name: 9a059cb6bced5cdc950f7816602ac92d89a899be
2007-07-23 19:12:41 +00:00
drh
ad6b3159be Fix a bad sizeof in vdbe.c. Ticket #2522. (CVS 4174)
FossilOrigin-Name: 77ebc3feb089c28155cf20873fb4eabd26fa50c1
2007-07-22 19:10:20 +00:00
drh
ddb63de659 Work around a bug in GCC. Ticket #2469. (CVS 4173)
FossilOrigin-Name: 1924ba5207bdc8d503c17cd9460c1a9f9c357635
2007-07-21 19:41:45 +00:00
aswift
f6f426be4e Work around an AFP file system byte-range locking error caused by opening and closing a second file descriptor on the database file as RDWR which clears the exclusive byte-range lock and results in an fcntl error when the AFP locking code attempts to clear it afterwards. This error is caused by the test harness and isn't a flaw in the sqlite or its implementation of AFP file locking. (CVS 4172)
FossilOrigin-Name: b2ba3e81fb1015d6f979a490e00a45fb7d5e1a9a
2007-07-20 20:25:37 +00:00
drh
d6e78a2e4f Updates to build scripts. Added scripts for building FTS2 shared libraries. (CVS 4171)
FossilOrigin-Name: e269f6e9f6273210259a488c356f4996d75c6436
2007-07-20 13:42:26 +00:00
drh
cda62a771d Version 3.4.1 (CVS 4170)
FossilOrigin-Name: 81a4dd07c1d7099461e9e6668433dac5d99b1f32
2007-07-20 10:56:07 +00:00
drh
d8a2b3845d Keep sqlite3ext.h backwards compatible. This really should have been part
of the previous check-in. (CVS 4169)

FossilOrigin-Name: 7cf15a5f651f0777972e21e0a96d601cf294f0f3
2007-07-20 10:48:35 +00:00
drh
6bf0ae74c2 Add new APIs to the end of the sqlite3_apis structure in loadext.c, in order
to preserve backwards compatibility.  Fix an incompatibility introduced
by (4108). (CVS 4168)

FossilOrigin-Name: 639993490ea829208b5f309bbe6c166c34e89d14
2007-07-20 10:33:58 +00:00
drh
85d5ef8b78 Documentation change in preparation for version 3.4.1. (CVS 4167)
FossilOrigin-Name: cf227766aca5065fd68e83f145943fe9d15cd7ef
2007-07-20 01:17:28 +00:00
drh
a693bcde02 Fix a memory leak in the Rename method of the echo test virtual table.
No changes to the core. (CVS 4166)

FossilOrigin-Name: e5c132fff3e8a0478622527a7e47d679594f899a
2007-07-20 00:35:58 +00:00
drh
b100391318 Cleanup unused function in pager.c. This is the conclusion of the fix
to ticket #2518. We believe the fix is complete and correct. (CVS 4165)

FossilOrigin-Name: 31dba1e933c523a47fdd007c2c7492133dfe72f2
2007-07-20 00:33:36 +00:00
drh
3260548b53 Disable tests that use the progress handler when the progress handler
is disabled at compile-time.  Followup to ticket #2497. (CVS 4164)

FossilOrigin-Name: cbc56fd4ec60d08a13a3aa181d044e726c49ef3c
2007-07-19 22:30:19 +00:00
drh
f85953edd0 Preliminary fix for ticket #2518. Make sure the VACUUM command
increments the change counter. (CVS 4163)

FossilOrigin-Name: 75263797e29af437290c09e85cd5fd2aea08694f
2007-07-19 16:35:17 +00:00
drh
21f06723fb Clarify the documentation on the nByte parameter to sqlite3_prepare().
Make it clear that nByte is a maximum string length.  Ticket #2516. (CVS 4162)

FossilOrigin-Name: d1ae3de4613d36b5352eb852f1951a09d4a92ac1
2007-07-19 12:41:39 +00:00
drh
309be02483 Get the min/max optimization working with descending indices. Ticket #2514. (CVS 4161)
FossilOrigin-Name: a80a3c9d0a5e0a8a3d67bd841e2076893fd5e9aa
2007-07-18 18:17:11 +00:00
drh
e927818455 Additional diagnostics added to the "out" file generated by lemon. (CVS 4160)
FossilOrigin-Name: 7ef2aaf72a8a953df7a763dd94657bb4ff05294f
2007-07-18 18:16:29 +00:00
shess
d8c1648301 Fix annoying emacs warning about suspicious line. The change removes
a leading space (emacs wants Makefiles to use leading tabs there). (CVS 4159)

FossilOrigin-Name: 4daadf659afe6b2524e1b37347247f233a211950
2007-07-17 17:22:03 +00:00
drh
1ef2ca0fd1 Add an extra integrity_check to the transaction test script. (CVS 4158)
FossilOrigin-Name: 5ea43b2db1f0263c5f0ab76351bc9ca940d1428a
2007-07-13 10:36:47 +00:00
drh
f4c932bb07 Update documentation to make it clear that VACUUM is free to
change implicit rowids.  Ticket #2382. (CVS 4157)

FossilOrigin-Name: d111b1daa547fea51d9e1fbe49c0b1338298484e
2007-07-13 10:35:14 +00:00
drh
eba1a1ebee "extern" prototypes cause problems for the Digital Mars compiler. So
remove them.  Ticket #2502. (CVS 4156)

FossilOrigin-Name: f35fbf8070d770a603960b2a2afdeae91574ed5f
2007-07-13 10:26:08 +00:00
danielk1977
612642de32 Fix for #2497. Set the database error code to the return value of sqlite3_step(). (CVS 4155)
FossilOrigin-Name: b01fda5f50e40b6122faf169c44486bde7ffe16c
2007-07-12 13:18:05 +00:00
pweilbacher
d8e9b6238e Fix compilation warnings shown when using strict GCC options for os_os2.c. (CVS 4154)
FossilOrigin-Name: 22277b7e1b3eb1678280de5d49a6613908ab4bff
2007-07-03 23:37:09 +00:00
danielk1977
2ac2762f37 Fix a memory leak in shell.c. Reported on the mailing list. This has only been informally tested. (CVS 4153)
FossilOrigin-Name: a008905b39e7d4cd5b39db4906eb3b678e3ee8b7
2007-07-03 05:31:16 +00:00
drh
1c55ba094a Fix a comment typo reported on the mailing list. (CVS 4152)
FossilOrigin-Name: 25e6df9cdd7d0cbb2bdee9ce76806cfd08314212
2007-07-02 19:31:27 +00:00
danielk1977
ab9749ebb9 Modify handling of SQLITE_SCHEMA in fts2 code. An SQLITE_SCHEMA error may cause SQLite to reload the internal schema, deleting and recreating v-table objects. So the sqlite3_vtab structure can be deleted out from under a v-table implementation. (CVS 4151)
FossilOrigin-Name: dee1a0fd28e8341af6523ab0c5628b671d7d2811
2007-07-02 10:16:49 +00:00
drh
12e8dcfbf6 Remove an unnecessary temporary variable for clarity of presentation in
a loop that GCC 4.2.0 is miscompiling.  Ticket #2469.  GCC 4.2.0 miscompiles
this loop regardless of whether or not the temporary variable is used, but
by removing the variable, we hope to make it easier to explain the problem
to GCC maintainers.  The error only appears if -ftree-vrp is used (which
is turned on by -O2). (CVS 4150)

FossilOrigin-Name: 35ae398bd37e4abbe362b0b780fc51153145b43d
2007-07-01 21:18:40 +00:00
pweilbacher
503028d61a Change OS/2 version of sqlite3Os2FullPathname() for cross-compiler compatibility:
- allocate zBuff on demand (restricted stack space on old compilers)
- 2 bytes in zDrive in include '\0'
- pass drive number to DosQueryCurrentDir() instead of 0 to make EMX work
- zFull does not need to be preallocated (CVS 4149)

FossilOrigin-Name: cc2105176563c352a6dccef89a429a76b6f3adf5
2007-07-01 15:41:02 +00:00
pweilbacher
2b9ca8d3e4 Including os2safe.h from os_os2.c is no longer necessary (now that it's including from os.h) (CVS 4148)
FossilOrigin-Name: 6432bbe1c1db1d31bd0057d99a9d6b6a428d8ffc
2007-06-30 16:30:39 +00:00