Compare commits

..

2682 Commits

Author SHA1 Message Date
drh 739aab893a Version 3.2.8 (CVS 2835)
FossilOrigin-Name: e61382aed45a83ad688a0461948f9cd052a527fa
2005-12-19 17:26:59 +00:00
drh 6a42c8f368 Bump the version number on the 3.2 branch to 3.2.8. (CVS 2830)
FossilOrigin-Name: d8e74af5b081a074173c470e9f2115be9b095777
2005-12-19 16:34:31 +00:00
drh 523de6a830 Backport the fix for ticket #1567 into the 3.2 branch. (CVS 2829)
FossilOrigin-Name: 33397742282425351157a92785f83f10ad564af7
2005-12-19 16:29:07 +00:00
drh b842b1a61f Version 3.2.7 (CVS 2736)
FossilOrigin-Name: bd141a7c12c779d15d81acc8f919c37b9a4aa40b
2005-09-24 15:25:01 +00:00
drh 8dc5a288c6 Perparations for version 3.2.7. (CVS 2735)
FossilOrigin-Name: 70937d5cfa10eda66d926d378f30f9961a7822bf
2005-09-24 15:10:59 +00:00
drh 74217cc079 Add the SQLite console source code in the contrib section of the source tree. (CVS 2734)
FossilOrigin-Name: 079c6348f944ad708214f5f335065373d9ae509a
2005-09-24 11:01:11 +00:00
drh 8e647b8191 Fix an uninitialized structure member that was causing a malfunction when
you used deeply nested and very complex views.  Ticket #1449. (CVS 2733)

FossilOrigin-Name: 352cc9f53b7724621ecbf3a6362f34c31a18cce8
2005-09-23 21:11:53 +00:00
drh c035e6e4ab Optionally call fdatasync() instead of fsync() only if _POSIX_SYNCHRONIZED_IO
is positive, which should only be the case on operating systems that
actually support fdatasync(). (CVS 2732)

FossilOrigin-Name: a9b341dccffaf324a64139d6f482599258ef7009
2005-09-22 15:45:04 +00:00
drh de29e3e9be Add VM code comments on the group-by processing. Extra group-by test case. (CVS 2731)
FossilOrigin-Name: 655e75ac7d96b05c118226c5b70443da2df319ec
2005-09-20 18:13:23 +00:00
drh d654be803f Code cleanup and simplification. Three new Mem opcodes added.
The sqlite3VdbeJumpHere function added. (CVS 2730)

FossilOrigin-Name: 2471957feee57538e5e1e50a704a337f0927d10e
2005-09-20 17:42:23 +00:00
drh 4f68623875 Cleanup the implementation and the documentation of the new 0x200 P1 flag
on the VDBE comparison operands. (CVS 2729)

FossilOrigin-Name: f22d0f64a0b9100e16746fb800efa508d286e40e
2005-09-20 13:55:18 +00:00
drh e313382e3e NULLs compare equal to each other when computing GROUP BY categories. (CVS 2728)
FossilOrigin-Name: d9b0c9705379a8b3a28a83bb29fc1cd688fe184e
2005-09-20 13:11:59 +00:00
drh b6fb62d9b4 Update comments in where.c. No code changes. (CVS 2727)
FossilOrigin-Name: bb84d27eda64479d65b13fbbcaeef6a00da4d103
2005-09-20 08:47:20 +00:00
drh e1547a2f1c Documentation updates. (CVS 2726)
FossilOrigin-Name: 6ec8883c366532948e619830ff7d9f63b79fc08b
2005-09-20 01:36:30 +00:00
drh 22d6a53a77 ON-clause terms in a LEFT JOIN that restrict only the left table, should not
really restrict the left table but instead rows that fail to meet the condition
to be joined with NULL rows from the right table. (CVS 2725)

FossilOrigin-Name: ea10f9785e3c5248dafcc297f3a2c5465b6e0dba
2005-09-19 21:05:48 +00:00
drh eb8cbaeb18 Set the default maximum page size to 32768, not 8192. (CVS 2724)
FossilOrigin-Name: b32e9ec2480f9da2c2ea705ed3c88ca77b77cf2a
2005-09-19 19:05:21 +00:00
drh 4b14b4d720 Do not optimize views with an ORDER BY clause if they are used in a UNION ALL
that also has an ORDER BY clause.  Ticket #1444. (CVS 2723)

FossilOrigin-Name: 6cc57fcf15cfa3ce73c78b1cac90f7806e5bae40
2005-09-19 17:35:53 +00:00
drh a7aa59e097 Fix uninitialized value on a UNION ALL select with an ORDER BY clause. (CVS 2722)
FossilOrigin-Name: 92126a216101d30e16390bf063d52d7182fbc763
2005-09-19 15:37:06 +00:00
drh 549c8b68c7 The sqlite3_query_plan debugging variable now only appears with SQLITE_TEST=1. (CVS 2721)
FossilOrigin-Name: 41e226d2ff5c0021fd07388da13f6d750fac508b
2005-09-19 13:15:23 +00:00
drh bbdc2b94fc Work around limitations of MSVC++ 6. Tickets #1429, #1437, and #1440. (CVS 2720)
FossilOrigin-Name: b2d1803c25b0b823c9cbe27989bacb730b18b45b
2005-09-19 12:53:18 +00:00
drh 48083cee4c Change some debugging #defines in order to get SSE working again after
recent upgrades. (CVS 2719)

FossilOrigin-Name: 86eb7d8363559c94bfcd7e48ff6270025ecacb7b
2005-09-19 12:37:27 +00:00
drh a15cdcc4f4 Download page reports sizes in MiB and KiB instead of just bytes. (CVS 2718)
FossilOrigin-Name: e985f02d20d50b0451bfd35a7343e0386336dd71
2005-09-17 19:28:45 +00:00
drh ee2b437f0a Update to the download page on the website. (CVS 2717)
FossilOrigin-Name: 91bc0d0032d5305671da0ebfc6e697b9b882f1ad
2005-09-17 19:14:40 +00:00
drh 8cb1895c74 Version 3.2.6 (CVS 2716)
FossilOrigin-Name: 1cdfe66714c2374b1d93bc62f37873111e090e44
2005-09-17 18:49:49 +00:00
drh 5c959118f1 The sqlite3ReallocOrFree routine should set its pointer to NULL when it fails. (CVS 2715)
FossilOrigin-Name: 0e85af44faca4b625e6ab7cb21a300867298c539
2005-09-17 18:34:11 +00:00
drh e3000ae84c Fix up the busy test so that it can be run multiple times in a row without
giving false errors on 2nd and subsequent runs. (CVS 2714)

FossilOrigin-Name: 7a7ba73fb5d1d493dc2c8c0d5ed4ee6d895bb339
2005-09-17 18:02:36 +00:00
drh ac1733d409 Fix a memory leak that occurs after malloc fails. (CVS 2713)
FossilOrigin-Name: 85b931bf72dac88187e4531053a06abe25d6f462
2005-09-17 17:58:22 +00:00
drh 0aadf33312 Fix the crash.test script to accomodate recent changes. (CVS 2712)
FossilOrigin-Name: d594608ff37bbf1d6866adb337aa2fbcd517eada
2005-09-17 17:05:19 +00:00
drh 432a93ba73 Fix a bug in the lock2 test script introduced by check-in (2709) (CVS 2711)
FossilOrigin-Name: c3bf17436bc1e264b4dbe255876a990a5a2b8b0c
2005-09-17 16:48:18 +00:00
drh a67367e7d1 Fix a problem with the lock_status pragma and the UTF-16 encoding. (CVS 2710)
FossilOrigin-Name: 1a737b457c59286d7d5c3a98391dec17dbc82d09
2005-09-17 16:36:55 +00:00
drh 4928570812 Changes to make corruption errors easier to track down. (CVS 2709)
FossilOrigin-Name: c07330000b9427a77f412918078beffa18de2c36
2005-09-17 15:20:26 +00:00
drh bfcb8909c6 Update the webpage description of 3.2.6 changes to talk about ticket #1432. (CVS 2708)
FossilOrigin-Name: 0e23c28b25aced292cb068bc9a202cb627ba38ec
2005-09-17 15:17:40 +00:00
drh 36da52425b Bug fix in the ORDER BY optimizer. Ticket #1435. (CVS 2707)
FossilOrigin-Name: 553b7ba8f8ae4cb865494f2d301690149d7edb9f
2005-09-17 13:29:23 +00:00
drh f5b1138bae Make sure dependencies on the right-hand side of IN operators are checked
correctly.  Ticket #1433. (CVS 2706)

FossilOrigin-Name: 21740794ab81924442f358a6adbbe6d5590cf58d
2005-09-17 13:07:13 +00:00
drh 4190d4b53e Updates to the FAQ. (CVS 2705)
FossilOrigin-Name: 0eaf430d9538ece1a3d1300db91f269577a5e028
2005-09-17 02:34:04 +00:00
drh 267cb326e9 Do not journal the locking page which doing an autovacuum. Similar to the
problem of #1432 except that this one occurs on autovacuum instead of vacuum.
An assert() has been added to catch any future incidents of this type. (CVS 2704)

FossilOrigin-Name: 5b6dc12b7d25d999be5d282cd0b06e02e2bda765
2005-09-16 17:16:52 +00:00
drh 50f2f43cba Do not journal the file locking page when doing a database copy as
part of a VACUUM.  Ticket #1432. (CVS 2703)

FossilOrigin-Name: 248f77972bb1be3325708ea143fd87bb7ce914a7
2005-09-16 11:32:18 +00:00
danielk1977 15f411dbdd Prevent the sqlite3_pagecount() function from ever returning the pending-byte
page. (CVS 2702)

FossilOrigin-Name: 35a8893537ae5faed6ee49270ac9c01a6010993f
2005-09-16 10:18:45 +00:00
danielk1977 2349c3d151 Move the definition of sqlite3_pending_byte from test2.c to os_common.h. (CVS 2701)
FossilOrigin-Name: bedf702f539636fa3b65fd0d6797b087481b4613
2005-09-16 10:13:41 +00:00
danielk1977 fd5f5b65b4 Fix an auto-vacuum problem with the PENDING_BYTE page. Also link the Tcl
variable sqlite_pending_byte to the internal pending-byte location when in test mode. (CVS 2700)

FossilOrigin-Name: 9115e0621d1fdc5a89a0288b87c0a4ce1e4b50c6
2005-09-16 09:52:29 +00:00
drh a2833a0cf6 Documentation changes in preparation for the release of 3.2.6. (CVS 2698)
FossilOrigin-Name: 243f455c7c4e5c0c56406c197fa78088bc3659ca
2005-09-16 02:55:13 +00:00
drh 688c9f0622 Undo check-in (2694). (CVS 2697)
FossilOrigin-Name: 6017b1962517eb206183042bbb718925d9819063
2005-09-16 02:48:01 +00:00
drh 53f733c7ae Fix a whole host of newly discovered memory leaks the occur after a
failure of realloc(). (CVS 2696)

FossilOrigin-Name: 4686d649756a0aa301ade901ac49c89a976c5402
2005-09-16 02:38:09 +00:00
drh b38ad9991c Fix a memory leak: a failure to deallocate the P3 parameter on a call
to sqlite3VdbeChangeP3. (CVS 2695)

FossilOrigin-Name: 714254cbc12564d44548707043fdcdffb17e4fde
2005-09-16 00:27:01 +00:00
drh 6e4fc2ca2b The table_info pragma now gives the order of columns in the primary key. (CVS 2694)
FossilOrigin-Name: 9b60f48de7fbca96c6e26266a8fb9eed8bc378f2
2005-09-15 21:24:51 +00:00
drh 289ab0760b Correct the sense of a test for SQLITE_DEBUG on the resent NDEBUG change.
Ticket #1425 (CVS 2693)

FossilOrigin-Name: 81fdffdff6fd107c361b1ee69649455143bf3921
2005-09-13 16:12:47 +00:00
drh 111cf34f7a Updates to the documentation on the TCL bindings. (CVS 2692)
FossilOrigin-Name: 94aa2d32459e1cee2df21fcc7df76c73dab903cd
2005-09-13 07:00:05 +00:00
drh b27795c183 Fix a comment typo in the previous check-in. (CVS 2691)
FossilOrigin-Name: 49c952807dabd80bfeb46caf55856aaab988226c
2005-09-13 00:02:16 +00:00
drh 4b529d97ff Automatically set the NDEBUG preprocessor macro unless SQLITE_DEBUG is set.
In this way, assert() statements become opt-in rather than opt-out. (CVS 2690)

FossilOrigin-Name: 2ec2bd85741e36e410f05ff34de430ffbcf51eea
2005-09-13 00:00:00 +00:00
drh 9d4673a9ea Bug fix in the new COUNT(DISTINCT) logic. Ticket #1420. (CVS 2689)
FossilOrigin-Name: 37116550d33d8e3bdc15cd9998b9d2b97dec312b
2005-09-12 23:03:16 +00:00
drh c99130fd82 COUNT(DISTINCT x) is now fully functional, though it could benefit from
additional testing. (CVS 2688)

FossilOrigin-Name: 2f397bd8142ec5e8f7238127012d14fdb558d918
2005-09-11 11:56:27 +00:00
drh 00b950d71e The ".dump" command from the shell correctly saves the state of the
sqlite_sequence and sqlite_stat1 tables, if they exist.  Ticket #1419. (CVS 2687)

FossilOrigin-Name: 3f191cf497e5798a8620ebc5a85e34187f58371c
2005-09-11 02:03:03 +00:00
drh 0c35667b02 The shell does not output the sqlite_stat1 table on .dump or .schema.
The ANALYZE command now gathers statistics on tables that have only
a single index because this sometimes helps when reordering tables
in a join. (CVS 2686)

FossilOrigin-Name: 26565b8931419031f9a8dd3947e1e2bd23ccbff2
2005-09-10 22:40:53 +00:00
drh ecc9242f6f Add the experimental EXPLAIN QUERY PLAN diagnostic capability. (CVS 2685)
FossilOrigin-Name: 986efb7b12643800805ad4b1f1e90e30fcf6d38a
2005-09-10 16:46:12 +00:00
drh d891967052 Avoid a memory leak and/or assertion failure when parsing a table
declaration that contains a duplicate column name.
Ticket #1418. (CVS 2684)

FossilOrigin-Name: f43427742b1c086f2621c900f4ede1a34a8b44ee
2005-09-10 15:35:06 +00:00
drh 3dec223ca0 Use of the CROSS keyword in a join prevents table reordering. Ticket #1414. (CVS 2683)
FossilOrigin-Name: 415b8b24629aa12756d8285c094b5f85d8a8e532
2005-09-10 15:28:09 +00:00
drh f307a4aaf8 Enhanced disk-full tests. (CVS 2682)
FossilOrigin-Name: 0288fa5d25886f6fbef0be782f12285d62bebd68
2005-09-09 10:46:19 +00:00
drh e08b814d72 Detect errors returned by SetFilePointer on windows. (CVS 2681)
FossilOrigin-Name: bc8c33f94ce069f7bcfc32a59d5c40e034e023b5
2005-09-09 10:17:33 +00:00
drh fd35797469 Infrastructure for the DISTINCT keyword in aggregate functions. But it does
not work yet.  If you try to use it you get an error message. (CVS 2680)

FossilOrigin-Name: 4d62e36fe3819c2a1412737c2ec8a91ddc5e1777
2005-09-09 01:33:19 +00:00
drh b4746b9e33 Defend against disk I/O errors that happen during an sqlite3OsSeek(). (CVS 2679)
FossilOrigin-Name: 461e3a0a27ff083b0bae10c9880e3b41bb85ee31
2005-09-09 01:32:06 +00:00
drh c2bd913a40 SUM returns NULL when it has no inputs. Ticket #1413. (CVS 2678)
FossilOrigin-Name: 6281859425d39c11d82875301fefafad1f08416d
2005-09-08 20:37:43 +00:00
drh 3f219f46fc A SUM() of all NULLs returns NULL. A SUM() of nothing return 0.
A SUM() of a mixture of NULLs and numbers returns the sum of the
numbers.  Ticket #1413. (CVS 2677)

FossilOrigin-Name: 2e6230edfd651b40481ebad8aa01a22ac92ce80c
2005-09-08 19:45:57 +00:00
drh 825c662e66 Remove a C++ism that snuck in on one of the reason changes. (CVS 2676)
FossilOrigin-Name: 48f6a331efea419fe948cd366f9c60ae41edddfd
2005-09-08 19:01:05 +00:00
drh 4f26bb62a8 Remove a few unused variables detected by Borland C. Ticket #1412. (CVS 2675)
FossilOrigin-Name: cdfe372a958fb446485913e860d52b87fffd34e4
2005-09-08 14:17:20 +00:00
drh 97571957a1 Aggregates with GROUP BY can sometimes return no result rows. (CVS 2674)
FossilOrigin-Name: 0c3e368d4766685b94a44f2c514e2dea806c297c
2005-09-08 12:57:28 +00:00
drh eb796a7c8f While doing a transaction comment, use fdatasync() instead of fsync() in
cases there the file size is unchanged. (CVS 2673)

FossilOrigin-Name: 3c555a87493128620ac967faf7c63c2a58856e9e
2005-09-08 12:38:41 +00:00
drh f80bcd73af Fix another test to account for SUM() returning integer rather than float. (CVS 2672)
FossilOrigin-Name: bc723235e65eb4da7d2e4b18653f1173374cb407
2005-09-08 12:37:28 +00:00
drh 2af6742d86 Fix typos in documentation. Ticket #1239. (CVS 2671)
FossilOrigin-Name: 73fbb8d9689fecec18c36814e4358e691bcd647e
2005-09-08 11:04:57 +00:00
drh 3224b32b00 Fix a comment in sqlite.h. Ticket #1321. (CVS 2670)
FossilOrigin-Name: ed4e9e751be2b982af9561aba20c8e1367828b81
2005-09-08 10:58:51 +00:00
drh 3d1d95e625 The SUM() aggregate function returns an integer result if all inputs are
integers.  Any single non-integer input causes the result to be a floating
point value. (CVS 2669)

FossilOrigin-Name: 21adf4bd99e732650a1e8e9a1cc954126983a654
2005-09-08 10:37:01 +00:00
drh d49c16ee9b Changes to comments only in sqliteInt.h. No changes to code. (CVS 2668)
FossilOrigin-Name: cc2a61650ea0d4b2ef67e144424327362999526d
2005-09-08 02:00:25 +00:00
drh 9d2985c7b4 Optimizations and refinements. Improvements to test coverage. (CVS 2667)
FossilOrigin-Name: 7283f7c29db4f622380b6a5cb745a4dc0c8e6a25
2005-09-08 01:58:42 +00:00
drh 5360ad34b1 All regression tests now pass. But I am sure there must still be problems.
New tests need to be added. (CVS 2666)

FossilOrigin-Name: bcc7d722cea4487a3adf9d9b2af4b74bfbfc5f39
2005-09-08 00:13:27 +00:00
drh d1c301e804 More bug fixes. All of the "quick" tests pass. The full test suite still
shows problems. (CVS 2665)

FossilOrigin-Name: a1b6d910cdbb53f12366402d9585dce2aad3ba3d
2005-09-07 23:05:21 +00:00
drh 5774b80629 More bug fixes. But there are still tests that fail. (CVS 2664)
FossilOrigin-Name: 7e85a162d0ecf0acdbffcacc62b60d97fe123881
2005-09-07 22:48:16 +00:00
drh a10a34b88f Bug fixes in aggregate processing. Fewer tests fail. (CVS 2663)
FossilOrigin-Name: c3ac58592f5e6305640868cdf42c129f1a25255d
2005-09-07 22:09:48 +00:00
drh 13449892ef Rewrite the aggregate handling logic so that it runs in O(1) space.
This is the first cut at the code.  Many regression tests fail. (CVS 2662)

FossilOrigin-Name: 17039ec3ff4396862beedf4a8af89654b2140f58
2005-09-07 21:22:45 +00:00
drh 79158e1865 Changes to reduce the amount of stack space required. (CVS 2661)
FossilOrigin-Name: b86bd70f301205d6ca66475a425e157b976107e2
2005-09-06 21:40:45 +00:00
drh abfcea25ea Cleanup the processing of MEM_Agg elements. (CVS 2660)
FossilOrigin-Name: 7ecf3654aa9a275a4cf0c3ec5f63a8c1e0a11fc9
2005-09-06 20:36:48 +00:00
drh 1ec43c9a5a Fix ANALYZE so that it works even if the empty_result_callbacks pragma is
enabled. Ticket #1409. (CVS 2659)

FossilOrigin-Name: bfdaef1224d741deefe211e1e607bac4c80f2d89
2005-09-06 10:26:47 +00:00
drh b726ee6d1c Make due with "sub()" instead of "gsub()" in awk scripts so that builds will
work on Solaris which will runs an archiac version of AWK. (CVS 2658)

FossilOrigin-Name: 449a7895995013720f5d4c7b3b7f5bd6a5413717
2005-09-05 20:35:25 +00:00
drh d81bd4e209 Fix bugs introduced by checkin (2656) and do some modest code enhancements. (CVS 2657)
FossilOrigin-Name: 7b56763a8b514834198d2392639d6d726b17d901
2005-09-05 20:06:49 +00:00
drh c092998715 Use the unicode API to win32 where available.
Tickets #1407, #1396, #1331, #1243, #1206 (CVS 2656)

FossilOrigin-Name: 3ec58c673ae4cf0695ea0c287cc9bcbdcdb1a200
2005-09-05 19:08:29 +00:00
drh a21c8495f9 Fix over-aggressive optimization of ORDER BY as reported on the mailing list. (CVS 2655)
FossilOrigin-Name: efbb4bc83cd86b6a26d58c5818c58c2e3edaab18
2005-09-01 17:47:51 +00:00
drh 4db38a7092 All regression tests now pass with the new bounded-memory sort code.
There is still lots of opportunity for optimization, however. (CVS 2654)

FossilOrigin-Name: 81259a01f1e85ba50a1d017b1282bf841b16f0a5
2005-09-01 12:16:28 +00:00
drh 0342b1f542 Sorting is now done using a sorting index rather than loading the entire
result set into memory and doing a merge sort.  The old merge sort technique
was a carry-over from SQLite version 1.  The new method uses a bounded amount
of memory and scales to much larger result sets.  There are still errors:
some 39 regression tests fail. (CVS 2653)

FossilOrigin-Name: 09db0a24241f9248584250d1728117b8a3159626
2005-09-01 03:07:44 +00:00
drh dece1a8464 {quote: KeyInfo} generation moved to a common subroutine. (CVS 2652)
FossilOrigin-Name: a25801df06e218e70570a6b9eae71603d590fe3a
2005-08-31 18:20:00 +00:00
drh 6242b9511d Updates to the query optimizer overview document. (CVS 2651)
FossilOrigin-Name: b1dceef0508ffe20ab2ff8fa5e5b5a44f4f224aa
2005-08-31 13:48:34 +00:00
drh 37108e112a Explicit typecasts to silence nuisance compiler warnings. Ticket #1398. (CVS 2650)
FossilOrigin-Name: 90712ea7273597214d6c77a01e41f84146d201c8
2005-08-31 13:13:31 +00:00
drh a91965b38a Refinements to the optimizer overview and integration into the website. (CVS 2649)
FossilOrigin-Name: ccd12e9e790e271cb1dbbae1c13e9cb980eaf11d
2005-08-31 03:13:12 +00:00
drh b64d5ee42c Update the FAQ to include an entry about binary versus decimal numbers. (CVS 2648)
FossilOrigin-Name: 0bbe73fccfe52700c2ae1122388764e81a78bc22
2005-08-31 02:46:21 +00:00
drh f6ac657f27 Adding the first cut of the optimizer overview document. (CVS 2647)
FossilOrigin-Name: 4c8d0a4c26e44088ffb9f21aa7641a5ebd0058be
2005-08-31 01:49:59 +00:00
drh 8897f6fa3f Adjust the makefile for new optimizer documentation. (CVS 2646)
FossilOrigin-Name: 14668c85b87f7c9b83efd592ddc693522c764969
2005-08-30 22:44:29 +00:00
drh 3e60cdc3c0 Initial work on documentation describing the optimizer. (CVS 2645)
FossilOrigin-Name: 5cebd7ba3ccbdd0f4c8fe77091992f52d3a4b24c
2005-08-30 22:44:05 +00:00
drh 0a8640d4f2 The CSV output mode does not sign-extend bytes where the high-order bit is set.
Ticket #1397. (CVS 2644)

FossilOrigin-Name: 528df777e5d76077d8766f04ee222fd64d9373a6
2005-08-30 20:12:02 +00:00
drh 63782855ee Fix printf.c so that it handles 10.0 correctly. (CVS 2643)
FossilOrigin-Name: 0f7a53f78d9dd5c426be834f2d50a6fe4e860141
2005-08-30 19:30:59 +00:00
drh 5d9a4af9af Minor code enhancements. (CVS 2642)
FossilOrigin-Name: 4ab994a87ee844f453d693555abd61b51bb44a0e
2005-08-30 00:54:01 +00:00
drh 220b10285b Update the home page to brag about 150KiB code footprint when optional
features are omitted. (CVS 2641)

FossilOrigin-Name: 0e1ac1284c0547af0bb0eb4ff320b9f5ae9c248d
2005-08-30 00:10:45 +00:00
drh 01b4171e57 Make the shell aware of SQLITE_OMIT_MEMORYDB. Ticket #1395. (CVS 2640)
FossilOrigin-Name: 71a71cef5b3c97744322ceceb48ac3055512c987
2005-08-29 23:06:23 +00:00
drh 19e2d37f1d Increase resolution of time-of-day on unix. Add an experimental
sqlite3_profile() API. (CVS 2639)

FossilOrigin-Name: ed2ca0873fa89d6cfd123541d5d1c6b92c72b6ab
2005-08-29 23:00:03 +00:00
drh b46b57745d Initialize a local variable to avoid a nuisance compiler warning.
Ticket #1394. (CVS 2638)

FossilOrigin-Name: 9b914901a18f8ea39c39a51509c0b3b862c13d6a
2005-08-29 16:40:52 +00:00
drh d64fe2f374 The LIKE optimization does the right thing when collating sequences are
present.  LIKE expressions where the left-hand side has COLLATE NOCASE
are optimized in the default case. (CVS 2637)

FossilOrigin-Name: ef84ff795c85e9d28f1cac84ff42d8d4ef84cfc4
2005-08-28 17:00:23 +00:00
drh bfd6b03554 Improvements to the formatting and layout of the code in the previous checkin. (CVS 2636)
FossilOrigin-Name: 73b430de0c0f3cd230861fc1a53691818f17de0d
2005-08-28 01:38:44 +00:00
drh de941c605e Add an assert to verify that floating point values and integers use the
same byte order.  Add a comment to the SELECT code generator. (CVS 2635)

FossilOrigin-Name: 07b4892149a436dbd904c781b46e3b9a82a7a744
2005-08-28 01:34:21 +00:00
drh 9b4b45d5cf Version 3.2.5 (CVS 2634)
FossilOrigin-Name: b2415a749ca5352e5bb4ad08df0c947ec8b02d18
2005-08-27 17:23:00 +00:00
drh 0b9693556d Change the wording of the news line for release 3.2.5. (CVS 2633)
FossilOrigin-Name: 70db46d3efa4c7da4b99f7385afff03f778ab9c4
2005-08-27 17:22:11 +00:00
drh c5ee956611 Get the date right. Today is the 27th, not the 25th or the 28th. (CVS 2632)
FossilOrigin-Name: 905b9d6c5e624f35272bf49df0d88ceea2bb73e8
2005-08-27 17:19:33 +00:00
drh f9dc42d870 Increase the version number and update web pages for the next release. (CVS 2631)
FossilOrigin-Name: e6039e909a3fe807e1499fa99265ffe6c5c2008e
2005-08-27 17:06:15 +00:00
drh 2c8997b9a5 Disable synchronous writes to the master journal when PRAGMA synchronous=OFF
for all database files.  Ticket #1375. (CVS 2630)

FossilOrigin-Name: 644b96aa23de7e828280d35785db840a4fa9413d
2005-08-27 16:36:48 +00:00
drh 9cc5abd769 Fix comment in vdbeapi.c. Remove unused structure definition from func.c. (CVS 2629)
FossilOrigin-Name: 51a381345db45967567dd0a18905d352bf1081e0
2005-08-27 13:16:32 +00:00
drh ff8a0983d2 Remove the words "statically linked" from the description of the shell on
the download page.  Ticket #1391. (CVS 2628)

FossilOrigin-Name: ecb9604457d5ab6bcd81b582cc4dd85a8f371b86
2005-08-27 13:11:20 +00:00
drh 77207ab7c6 Remove GNUmake extensions from the makefile. Ticket #1390. (CVS 2627)
FossilOrigin-Name: d0691fed4344869830ea9ec2390bc1e7c1679844
2005-08-27 09:07:14 +00:00
drh 6e4b7cd4ef Do not change fields of stale sqlite3 handles. Ticket #1384. (CVS 2626)
FossilOrigin-Name: 7e05b7ca0ce72b1c6125196f4b21bbb676bc488c
2005-08-27 01:51:44 +00:00
drh e69cc5b742 Widen the opcode column of explain output in the shell. (CVS 2625)
FossilOrigin-Name: dd3b00aa0bf3b847b0b2f20f6df60d4e3a2d81df
2005-08-27 01:50:53 +00:00
drh 87abf5c033 When the left-hand side of an IN operator is constant and the right-hand
side is a SELECT, recognize that the IN operator is not constant.
Ticket #1380. (CVS 2624)

FossilOrigin-Name: fc9e04609b6968fc5039a6f9f808aac681f4fc41
2005-08-25 12:45:04 +00:00
drh 65d415cb72 Fix the --enable-threadsafe option to the configure script. Ticket #1378. (CVS 2623)
FossilOrigin-Name: 76ec0b3d3a6cc82965e4f993375780b954c53dd1
2005-08-24 18:04:51 +00:00
drh 0f77f5dc0b Additional defense against the rowid-fifo overflow problem. (CVS 2622)
FossilOrigin-Name: 881dcf5fb16997830ff347d2eb2610784b415f25
2005-08-24 17:07:37 +00:00
drh 978468d488 Remove a stray C++ style comment causing problems for some compilers. (CVS 2621)
FossilOrigin-Name: aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df
2005-08-24 16:54:05 +00:00
drh 3ca84ba0a0 Fix a bug in DELETE that might cause a segfault when deleting more
than 40940 rows of data all at once. (CVS 2620)

FossilOrigin-Name: 7c599bae33ba4eb10fc486ae3dab76330ce69936
2005-08-24 16:13:51 +00:00
drh 3268f2b10c Version 3.2.4 (CVS 2619)
FossilOrigin-Name: 8cef2c1ae728970a38d794f9903115da5d0fcd55
2005-08-24 11:14:46 +00:00
drh 96c52a9b48 Increase the version number and update the change log prior to release. (CVS 2618)
FossilOrigin-Name: 139a28d231875e72538fd6842168c458441ad1d0
2005-08-24 11:07:19 +00:00
drh 9eb2028fbc After calling realloc() on an array to resize it, be sure not to use pointers
into the old array.  Ticket #1376. (CVS 2617)

FossilOrigin-Name: 9f9a257123274779150cbc290b9f86a09b3b2c03
2005-08-24 03:52:18 +00:00
drh 7681618c18 Allow floating point literals to being or end with a decimal point.
Ticket #1371. (CVS 2616)

FossilOrigin-Name: a715e7001247e84e0982335570593f0802774635
2005-08-23 11:31:26 +00:00
drh 6c8c6cec1f Handle empty blob constants correctly. Ticket #1373. (CVS 2615)
FossilOrigin-Name: 5cada745ac9bf18a65d21705a398b2bb8bd1aaa2
2005-08-23 11:17:58 +00:00
drh 75757853a0 Fix another documentation typo. (CVS 2614)
FossilOrigin-Name: 55f4b14e1958ff3d2b0c99749f0c01192bafbf37
2005-08-23 11:03:02 +00:00
drh 8c154875b1 Fix typos in syntax documentation. Ticket #1374 and a report on the mailing
list. (CVS 2613)

FossilOrigin-Name: 990d1f3a5b13cadc2930334c4bd7007e3645e75b
2005-08-23 11:00:39 +00:00
drh ff1bc76916 Update the download page of the website to handle TEA builds and starkits. (CVS 2612)
FossilOrigin-Name: 1fab599b6f89534152c53b820b5e6ee1ba30c059
2005-08-22 02:10:46 +00:00
drh ad81e87054 Clean up possible locking problem in multithreaded applications that take
a malloc failure. (CVS 2611)

FossilOrigin-Name: 545e702a23c7a6b09e10441d4137efe5a9618a84
2005-08-21 21:45:01 +00:00
drh 03e7954732 Version 3.2.3 (CVS 2610)
FossilOrigin-Name: f620319b440dab9f8a0ad9ada3e6ee5560d5c623
2005-08-21 18:54:48 +00:00
drh 7a22af6a60 Increase the version number and adjust documentation prior to the next release. (CVS 2609)
FossilOrigin-Name: b15ed7db4d5186d8b22c0b51cd44c4d9d7001318
2005-08-21 18:40:20 +00:00
drh 788581d78a Disable malloc tests when not compiled with SQLITE_DEBUG. (CVS 2608)
FossilOrigin-Name: f372682fa375c22213da0e4cd8413eab3c6ac85b
2005-08-21 18:21:50 +00:00
drh 130b9f4040 Do not create an error message if there is no error. (CVS 2607)
FossilOrigin-Name: 3aa47c5587819a5fc3e2cb53a7fbc79ba65f0c3b
2005-08-21 17:48:46 +00:00
drh 992f2d781d Do not overwrite small files (less than 1024 bytes) that are not databases.
Ticket #1370. (CVS 2606)

FossilOrigin-Name: 7f4302686e55f22b281d98a8a3b89300f4ce4eb6
2005-08-21 16:54:25 +00:00
drh f0bce09cdd More test coverage improvements. (CVS 2605)
FossilOrigin-Name: e559e810a51427def6928763ae0d6f7347366d04
2005-08-20 13:47:41 +00:00
drh 85c23c61e2 Increased test coverage. Some malloc tests now fail though this is believed
to be an instrumentation problem not a real error. (CVS 2604)

FossilOrigin-Name: f786f37a5e31f42aaf81b3ad4a734f12855da69e
2005-08-20 03:03:04 +00:00
drh 0bbaa1ba9a Increase test coverage of alter.c to 100%. Fix bugs found in the process. (CVS 2603)
FossilOrigin-Name: b550d04d43a92f33a01438ae03df14678db3cdee
2005-08-19 19:14:12 +00:00
drh f14fd03899 Additional tests for better coverage. (CVS 2602)
FossilOrigin-Name: 4281a838f2f531af24b008d2834e8318798472c5
2005-08-19 03:03:51 +00:00
drh 5eba8c09df Increased test coverage on trigger.c and printf.c. (CVS 2601)
FossilOrigin-Name: 842a80bd8f18d6fd046604f9a057bcd738234f1f
2005-08-19 02:26:27 +00:00
drh fc23314a0b More test coverage enhancements. (CVS 2600)
FossilOrigin-Name: 0b6cd5acc0ede3367623f40ccfaa96116e686824
2005-08-19 01:07:15 +00:00
drh 8b3d990b71 Bring testing coverage of the analyze.c file up to 100%. Bugs found and
fixed in the process. (CVS 2599)

FossilOrigin-Name: 2fe0ac4fa4d5911e266979021fa7e413d96c558d
2005-08-19 00:14:42 +00:00
drh 91124b3545 Comment fixes. No changes to the underlying code. (CVS 2598)
FossilOrigin-Name: b865e243ee772f009dbf466d69525f2cdef78c0e
2005-08-18 18:15:05 +00:00
drh 731c96b412 Fix typo in documentation. (CVS 2597)
FossilOrigin-Name: 32efcd24612908516fb5bc58ab3fe4790586a220
2005-08-16 14:44:48 +00:00
drh ce604012ac Null-terminate the strings array passed to Tcl_GetIndexFromObj. Bug
reported on the mailing list. (CVS 2596)

FossilOrigin-Name: 3a7918a66bf98368c2520f94e505a21a1df3383c
2005-08-16 11:11:34 +00:00
drh c182d16302 General code cleanup resulting in smaller footprint. (CVS 2595)
FossilOrigin-Name: 98338abf9e8cfbf8efa81cff0e40ea37e34fd9b2
2005-08-14 20:47:16 +00:00
drh a2b902d66d Split the sqlite3_complete() API out into a separate source file so that
in static links where it is not used it will not take up space in the
resulting binary. (CVS 2594)

FossilOrigin-Name: 62b87751dea56c565bcc2aca88a2edda7dfc2a57
2005-08-14 17:53:20 +00:00
drh 9abc9c6aff Declare local-use functions as static. Ticket #1363. (CVS 2593)
FossilOrigin-Name: 94efd7908880c7d99c08ebc9a3437cfbefc42f7e
2005-08-14 01:34:19 +00:00
drh 55ef4d9758 The case_sensitive_like pragma added.
Test cases added for the LIKE optimization. (CVS 2592)

FossilOrigin-Name: 72ee21c05e618b6f46f5460f8c85779c72fe32d7
2005-08-14 01:20:37 +00:00
drh 3d94662a06 Provide grave accent quoting of identifiers for MySQL compatibility.
Ticket #1337. (CVS 2591)

FossilOrigin-Name: 6b7a4e97528a4e179e0bbae69469cb1a3d1f794b
2005-08-13 18:15:42 +00:00
drh d645967aaa Give the same access permissions to journal files as is given to databases. (CVS 2590)
FossilOrigin-Name: 7961ec0ccbc99d890689013b9602635941f308a6
2005-08-13 17:17:01 +00:00
drh 8718f52624 Disable an overzealous optimization the omitted sorting on a join if the first
table gave a unique result.  The sort can only be omitted if all tables in
the join are unique.  Ticket #1358. (CVS 2589)

FossilOrigin-Name: 4f07661279fb11a06b3ddffeda672f077c0d306a
2005-08-13 16:13:04 +00:00
drh 531fe87834 Fix a comment in printf. (CVS 2588)
FossilOrigin-Name: 1054685f15095ef147d9e9a32bd56b0eaaf9fa54
2005-08-13 13:40:42 +00:00
drh 3e9aeec03f Additional cleanup and optimization of the printf function. (CVS 2587)
FossilOrigin-Name: 240bb049001b0d1419d72b6ef909236e12bd5949
2005-08-13 13:39:02 +00:00
drh 557cc60f4d Add the "!" flag to the "%g" mprintf conversion parameter to force a
decimal point.  This prevents floating point values from appearing as
integers.  Use this flag when converting floating point to text.
Ticket #1362. (CVS 2586)

FossilOrigin-Name: 4b98dace6b90abf4a6fe1cd51e6392fd213358c4
2005-08-13 12:59:14 +00:00
drh 592ac8cb6c Make the round() function work correctly on numbers with very large exponents.
Ticket #1340. (CVS 2585)

FossilOrigin-Name: 4f47c3c884e38b810450b6127ab33c7b86e6743c
2005-08-13 03:07:47 +00:00
drh 42b9d7c561 Fix a memory leak that occurs when a CREATE TABLE that contains a
DEFAULT VALUE fails due to a name conflict.  Tickets #1356 and #1357. (CVS 2584)

FossilOrigin-Name: 25cfe9390dda79bb2a7740b3d7380f517a4e8d1b
2005-08-13 00:56:27 +00:00
drh 2501eb1df6 3rd argument to sqlite3Error() should always be a format string, never
user-supplied error message text.  Ticket #1354. (CVS 2583)

FossilOrigin-Name: d6146a542aacd10d349d432fe343cc17cc3b3ab5
2005-08-12 23:20:53 +00:00
drh bb7ac00bf0 Improved error message when a #NNN parameter appears on user input.
Additional coverage testing. (CVS 2582)

FossilOrigin-Name: 3c00f5982ae61dfcd26c33ccdb81736628dbfce5
2005-08-12 22:58:53 +00:00
drh d2687b7731 Optimize LIKE and GLOB operators in the WHERE clause. Code passes all
regression tests but still needs additional tests. (CVS 2581)

FossilOrigin-Name: 3edbe8d6217fd1180883e6b9f1e5b9011a39f80d
2005-08-12 22:56:09 +00:00
drh 2db0bbc24b Improve the error message associated with SQLITE_FULL. Ticket #1353.
Also remove error messages for obsolete error codes SQLITE_INTERNAL,
SQLITE_NOTFOUND, and SQLITE_TOOBIG. (CVS 2580)

FossilOrigin-Name: fa7403c7d9948cc4a6c6ed00a614e3d6a3682e78
2005-08-11 02:10:18 +00:00
drh 4dcbdbff40 Add 2005 open source award badge and news announcement. (CVS 2579)
FossilOrigin-Name: 8e007f8c06748c5f02068c1f244bc8e3026e16fd
2005-08-11 01:25:22 +00:00
drh 1cd7f83ef5 Make sure the .import command strips newlines off the end of the last
field in each line imported.  Ticket #1348 (CVS 2578)

FossilOrigin-Name: 73fafd2148b8cd0f92747fca03e3df5778e1070f
2005-08-05 18:50:51 +00:00
drh 7018030d06 Comment out the use of memory high-water marks when not compiling with
SQLITE_MEMDEBUG. (CVS 2577)

FossilOrigin-Name: fb7a258fd35fdf81772b9d47711d30a30dfa4564
2005-08-02 21:42:16 +00:00
drh 45b1ee44a4 Minor refactoring of the new optimizer code. (CVS 2576)
FossilOrigin-Name: 868322f7b7176486dfb4b54d99cf6662b79e639d
2005-08-02 17:48:22 +00:00
drh 586e4b2f30 Update the documentation for the new transaction method on the TCL interface. (CVS 2575)
FossilOrigin-Name: 3dc823a0ac12f640a3c54fe1eb7be878d2738529
2005-08-02 17:38:19 +00:00
drh b5555e7e34 Tests and bug fixes on the new transaction method in the TCL interface. (CVS 2574)
FossilOrigin-Name: 68dd0ed5e312ecd5e98ee0fa1c21b70ff330f711
2005-08-02 17:15:14 +00:00
drh 09d0debf3b Fix a bug in the btree balancer. ticket #1346. (CVS 2573)
FossilOrigin-Name: 3af69a49289f52f321ccd365e92d22b820c3139e
2005-08-02 17:13:09 +00:00
drh 3d21423c65 Add the "transaction" coommand to the TCL interface. Untested. (CVS 2572)
FossilOrigin-Name: a5ce6c58c3bfc0e1c9953fe4ad4991ac56a4fb87
2005-08-02 12:21:08 +00:00
drh 943af3cda1 Fix problems caused by over-agressive optimization of ORDER BY in joins.
Lots more testing needed. (CVS 2571)

FossilOrigin-Name: 1a4e526d46280970b43505a5c8a4090767c63043
2005-07-29 19:43:58 +00:00
drh 2ce99ecf8b Fix authentication so that it works with AS aliases. Ticket #1338. (CVS 2570)
FossilOrigin-Name: cc7ae73ed01f0b89e31dd8de48b913bbd83887b8
2005-07-29 15:36:14 +00:00
drh 6c30be8e51 Optimizer now converts OR-connected WHERE-clause terms into an IN operator so
that they can be used with indices.  There are known problems with the
ORDER BY optimization in this and in several prior check-ins.  This
check-in is not recommended for production use. (CVS 2569)

FossilOrigin-Name: d23c8bf81e508722e92ff1b9c8bc98dc026a31f2
2005-07-29 15:10:17 +00:00
drh ed37800693 The BETWEEN operator in a WHERE clause is now able to use indices. (CVS 2568)
FossilOrigin-Name: cdf8c9584b945212e065e044df801c207aedb675
2005-07-28 23:12:08 +00:00
drh a611040eea Test cases and tuning of the new optimizer code. (CVS 2567)
FossilOrigin-Name: 4b02703dec71aa78e5f8d8cab5b950966a4c6abc
2005-07-28 20:51:19 +00:00
drh 3adc9cedb0 The new optimizer now passes all regression tests. (CVS 2566)
FossilOrigin-Name: a21212843359fb9fdbd60799ae50ad3566f4399a
2005-07-28 16:51:51 +00:00
drh 28c4cf42da More work on the new optimizer. Fewer tests fail now. (CVS 2565)
FossilOrigin-Name: ee3a08e353f563c36e904479393fcb56f96ee975
2005-07-27 20:41:43 +00:00
drh 51147baa6d A new optimizer that breaks a lot of tests. But none of them critically, I
think.  Nevertheless, there is a lot of work ahead to stabilize the code. (CVS 2564)

FossilOrigin-Name: 86ce56ccea8297b1fba2b9ee53b5f1a3f228662f
2005-07-23 22:59:55 +00:00
drh 17a18f2f36 Store the total number of rows as part of the ANALYZE statistics. (CVS 2563)
FossilOrigin-Name: 868279c78e056d27b2d1bea81127fe689b2ce478
2005-07-23 14:52:12 +00:00
drh 497e446d76 The results of ANALYZE are now loaded into internal data structures where
they can be used.  But they are not actually used yet. (CVS 2562)

FossilOrigin-Name: 1996bacfb97180965304e2a6d6784b6ecbbf8575
2005-07-23 03:18:40 +00:00
drh e6e049694d Full-coverage testing and documentation for the ANALYZE command. The
results of analysis are still not loaded or used, however. (CVS 2561)

FossilOrigin-Name: bd7583a5d63412785a9c5de54d25b509da241605
2005-07-23 02:17:03 +00:00
drh ff2d5ea408 First code for the ANALYZE command. Mostly untested. The analysis is
not loaded into the symbol tables and is not used by the optimizer. (CVS 2560)

FossilOrigin-Name: a4886b114d2ccb3841d3d219f6b97f67745b13c2
2005-07-23 00:41:48 +00:00
drh d00ada9a00 Clarify the meaning of the TEMP keyword on CREATE TABLE. (CVS 2559)
FossilOrigin-Name: 1a573619f558d1d67775d17aabb9d704f82ad1a8
2005-07-22 23:56:49 +00:00
drh ed90e26313 Correct the documentation to show that sqlite3_column_text() returns
a NULL pointer (not an empty string) when the column value is NULL.
The same goes for sqlite3_column_blob().  Ticket #1334. (CVS 2558)

FossilOrigin-Name: fd1e013a14710ed2ecabddedc0d110562cfdbfc2
2005-07-22 22:53:15 +00:00
drh e23399fc9c Begin adding code to support multiple IN constraints on the same index. (CVS 2557)
FossilOrigin-Name: 103f8ccb9013689a480766ebffbf570d4aa8bac5
2005-07-22 00:31:39 +00:00
drh 29dda4ae65 Split the OP_Integer opcode into OP_Integer and OP_Int64. This allows
comments to be added to OP_Integer.  Cleanup in the optimizer.  Allow
terms of the FROM clause to be reordered automatically. (CVS 2556)

FossilOrigin-Name: e2f822ac82d0a5a59de0b63cce65d4fd6c178ff1
2005-07-21 18:23:20 +00:00
drh 7ec764a29e Add comments to test cases. Improvements to the query plan test variable. (CVS 2555)
FossilOrigin-Name: ef3a157f469d72cbd2f713f997598ddf47f340d2
2005-07-21 03:48:20 +00:00
drh fe05af87f8 In where.c, split out the code that selects an index into a separate
subroutine. (CVS 2554)

FossilOrigin-Name: c30cbba9ead1b4d07f225b1e8a65d5d5230ea45d
2005-07-21 03:14:59 +00:00
drh 013972052e Extra memory usage instrumentation added. (CVS 2553)
FossilOrigin-Name: ac669f56c0759a7e3eaa6f0018c8fb9d614e7d69
2005-07-20 14:31:53 +00:00
drh e8b9727835 More refactoring in where.c. (CVS 2552)
FossilOrigin-Name: a35bd50af8961133adc66e40c38402e81a02bb56
2005-07-19 22:22:12 +00:00
drh 0fcef5e110 Refactoring of the query optimizer in advance of adding better optimization. (CVS 2551)
FossilOrigin-Name: 57c6bd3760163c174be4a2ece58f414e82b55938
2005-07-19 17:38:22 +00:00
drh 0aa74edd72 Allow an unlimited number of terms in the WHERE clause. The old limit was 100. (CVS 2550)
FossilOrigin-Name: ca69f36832d57775e73ac5cdbe0a32d7b759432b
2005-07-16 13:33:20 +00:00
drh 9042f395cc Fix bugs in the new query plan instrumention logic. (CVS 2549)
FossilOrigin-Name: 578490c91331a386f84652db0b3bfd74c82046e1
2005-07-15 23:24:23 +00:00
drh 84bfda41db Add test instrumentation that will be needed during the development of
forthcoming optimizer enhancements. (CVS 2548)

FossilOrigin-Name: dfd5fd77b0764853f847eeee3c1fe047d60fee7e
2005-07-15 13:05:21 +00:00
drh 4cfb644e5f Add remark in the changelog that mentions 64-bit alignment fixes in 3.2.2. (CVS 2547)
FossilOrigin-Name: ead583cfad7c6ea84c3685d89f40104f4d33bc81
2005-07-09 23:11:22 +00:00
drh c0f2a01926 Fix a comment error. No changes to code. Ticket #1320. (CVS 2546)
FossilOrigin-Name: e050af70adcdac8f9c9d8cffd1658f7fb2ebd362
2005-07-09 02:39:40 +00:00
drh e866fcb923 Use the internal sqlite3_snprintf function instead of sprintf to avoid
cross-platform incompatibilities.  Ticket #1316. (CVS 2545)

FossilOrigin-Name: 431999da7bf0079e0d514483b3bfd9f8471cba7d
2005-07-09 02:38:06 +00:00
drh df3816974c Patch to Makefile.in so that it works with OS X. Ticket #1292. (CVS 2544)
FossilOrigin-Name: 0dfabca641371690027634213632c914ad6f2b8b
2005-07-09 02:23:24 +00:00
drh a4afb65cb7 Make sure there is only one busy counter. Ticket #1315. (CVS 2543)
FossilOrigin-Name: af2a0ba4a38abf208db1ff6f018cf756de2afd5b
2005-07-09 02:16:02 +00:00
drh 57dbd7b324 Allow the IN operator to take a list of arbitrary expressions on its
right-hand side.  The expressions no longer need to be constant.  The
current implementation seems to work but needs more testing and optimization. (CVS 2542)

FossilOrigin-Name: ba56478dd8bc2135749966ff55831fd497883781
2005-07-08 18:25:26 +00:00
drh 9170dd7e1c Change the name of the OpenTemp opcode to OpenVirtual which is more
descriptive of what it does. (CVS 2541)

FossilOrigin-Name: 3bb9ce5f20d0a6bc19df31df9b8e82044c3e6004
2005-07-08 17:13:46 +00:00
drh 392e597c8a Add the EP_OptOnly flag on expressions for WHERE clause
terms that are added by the optimizer but should not be coded. (CVS 2540)

FossilOrigin-Name: f4a66ed04dfd8714746b766b4859682ea18e328f
2005-07-08 14:14:22 +00:00
drh 70031fa396 Add the SQLITE_CASE_SENSITIVE_LIKE compile-time option. (CVS 2539)
FossilOrigin-Name: b72bff81f9937378417a0af0610d8558279b67a7
2005-07-08 13:53:21 +00:00
drh a01f79df49 Replace OP_List with OP_Fifo. This is the first step toward allowing
recursive delete triggers and later foreign keys with cascading deletes. (CVS 2538)

FossilOrigin-Name: 94c120bb782fed53142317d1755e70c858930486
2005-07-08 13:07:59 +00:00
drh 9f18e8a0c4 Add infrastructure for the ANALYZE command. Does not yet actually
do anything. (CVS 2537)

FossilOrigin-Name: 05b6ac9a76fd5765c50e81588f8e71c59fe35ce4
2005-07-08 12:13:04 +00:00
drh 26d0e2a6da Fix a quoting problem in the configure script. (CVS 2536)
FossilOrigin-Name: b34647a2ebec6f915f9914034e9370459873215e
2005-07-06 13:51:27 +00:00
drh 7bac700686 Fix typos in comments. No changes to code. (CVS 2535)
FossilOrigin-Name: d3b03495a46e79a9d82525a61bad99eef9469ad1
2005-07-01 11:38:44 +00:00
drh eb55bd2fe9 Allow the DEFAULT value of a column to be obtained by calling a
function that has constant arguments, such as julianday('now'). (CVS 2534)

FossilOrigin-Name: d273766ef2442eb87971b07f9ecf5682c88298ee
2005-06-30 17:04:21 +00:00
drh 67ce73b466 Check for zero-byte allocations in sqlite3MallocRaw. (CVS 2533)
FossilOrigin-Name: 78cb8a9a17a29bb8d9ffb6298b25cc43f9cbfed9
2005-06-29 17:24:23 +00:00
drh ba336867c4 Make sqlite3Malloc always return NULL when the number of bytes to allocate
is 0. (CVS 2532)

FossilOrigin-Name: 657d74ebc1d91c99e8ac6cd68fdac3864ebd8d71
2005-06-29 15:33:00 +00:00
drh 54f080e82c Update SQL syntax documentation to describe the new CAST expressions. (CVS 2531)
FossilOrigin-Name: d5392866bfd6e06c6d072f649356050b82273a23
2005-06-26 20:00:46 +00:00
drh d1e4733d07 Tcl interface uses Tcl_Objs to implement user-defined functions, thus allowing
BLOB values to be transferred correctly.  Ticket #1304. (CVS 2530)

FossilOrigin-Name: 514aaab3f99637ebb8b6e352f4e29738102579b4
2005-06-26 17:55:33 +00:00
drh 8a15132904 Documentation fixes. Ticket #1306. (CVS 2529)
FossilOrigin-Name: 3dcdb7942ea9a9e5d708a198ba5183103d5075d9
2005-06-25 19:42:37 +00:00
drh df0bddaef3 The TCL interface binds variables as BLOB only if they have a bytearray
representation but no text representation. Ticket #1287. (CVS 2528)

FossilOrigin-Name: 8c99dca60aebee0ec5de9ed11350de864bc76584
2005-06-25 19:31:48 +00:00
drh 487e262f44 Remove the blob(), text() and numeric() functions added in (2524) and
replace them with the standard CAST operator.
Ticket #1287. (CVS 2527)

FossilOrigin-Name: 17631785f9ee8ab280c82677eb53886912e085bc
2005-06-25 18:42:14 +00:00
drh 7f057c9166 NULL values in a row of a unique index cause the row to be distinct.
Ticket #1301.  More testing and optimization needs to be done on this
before closing the ticket. (CVS 2526)

FossilOrigin-Name: 06a71b162b032fc5b56d18919a784d4ee94dde7c
2005-06-24 03:53:06 +00:00
drh 2f47149691 Make sure the String8 opcode always has a non-null P3 argument in
the foreign_key_list pragma.  Ticket #1297. (CVS 2525)

FossilOrigin-Name: bcf62dc7a1e8e7a3180138cf9b8944eb8fbd5490
2005-06-23 03:15:07 +00:00
drh 5708d2deac Add built-in functions numeric(), text(), and blob() that coerce types.
Ticket #1287. (CVS 2524)

FossilOrigin-Name: affb0fa2e8c5ff497838ba3c2994cdb1f6f50c68
2005-06-22 10:53:59 +00:00
drh 288d37f1b4 Allow parameters to be introduced by characters ':', '$' and '#'. This
is an experimental change. (CVS 2523)

FossilOrigin-Name: f3427a139c3bd4faf9134ec6290b3eb829c0a19f
2005-06-22 08:48:06 +00:00
drh edef8fcd73 Fix a bug in an assert found while investigating ticket #1287 but otherwise
unrelated to that problem. (CVS 2522)

FossilOrigin-Name: 60f752ed1817e6710c13c2ce393c3bf51dae76ad
2005-06-22 02:36:37 +00:00
drh 13aebc66f2 Change the documentation to explain that a database handle can only be
used in the same thread in which it was created.  Ticket #1272. (CVS 2521)

FossilOrigin-Name: 59c95731f70ed9b9e135584f62d0a2b0f1a3bb96
2005-06-16 19:48:39 +00:00
drh cf5f58fa3e Fix the THREADSAFE macro in Makefile.in. We really need to rework the
whole autoconf build system.... (CVS 2520)

FossilOrigin-Name: 98a4de76e0593ef1d1d3e8b785d420cd554a08e8
2005-06-16 18:47:38 +00:00
drh bf8f1b3460 Change to Makefile.in to fix a problem with the Borland linker.
Ticket #1291. (CVS 2519)

FossilOrigin-Name: bc25397735c1485e3533507bed507250ea07534a
2005-06-16 16:51:15 +00:00
drh 6eb8577cae Fix to the "make doc" makefile target. Ticket #1289. (CVS 2518)
FossilOrigin-Name: 4713b1e1040f2e0645fa593638e392df44b5bfc1
2005-06-15 18:07:39 +00:00
drh 2b4b5962c4 Changes to the unix OS layer aimed at finding and fixing tickets
#1272 and #1285. (CVS 2517)

FossilOrigin-Name: 006dda3119f025d703da4e0215c378206e20cfd0
2005-06-15 17:47:55 +00:00
drh 8d904f058b Fix an NDEBUG versus SQLITE_DEBUG confusion issue. (CVS 2516)
FossilOrigin-Name: 833c016023e9e17c226fdd722dcb10bc51ab6f9e
2005-06-14 17:47:58 +00:00
drh 556b2a2322 Provide the SQLITE_FILE_HEADER command-line option for changing the text
that appears at the beginning of databases. (CVS 2515)

FossilOrigin-Name: 3d7ee5b92d7e30f90cb7a8b3efd649b36480b61b
2005-06-14 16:04:05 +00:00
drh 3f73708ce4 Fix a bug in the default busy handler for systems that lack usleep().
Ticket #1284. (CVS 2514)

FossilOrigin-Name: a42cb81d1173532537aed4e71091d4cd3f3a88a0
2005-06-14 02:24:31 +00:00
drh 78776ecdb1 Do not record existance the sqlite_sequence table until it is actually
created.  Ticket #1283. (CVS 2513)

FossilOrigin-Name: 95256d953c179372dcc5ead6c407672c8161a8c1
2005-06-14 02:12:46 +00:00
drh 7c3d49c275 Fix documentation typo. Ticket #1282. (CVS 2512)
FossilOrigin-Name: ce6b62fa46bc67085801c48d6a28944d4d373ba9
2005-06-13 00:47:59 +00:00
drh 4fd81a51fa Version 3.2.2 (CVS 2511)
FossilOrigin-Name: 0e190e9d9137e9d29fc53ce6f1136047d578bb55
2005-06-12 23:17:23 +00:00
drh 3d334bcb1f Update the EXPORT definitions list to include the latest additions to the API. (CVS 2510)
FossilOrigin-Name: 44e54b132e03d86e52055dc0a2815b653ec179e8
2005-06-12 23:16:20 +00:00
drh e44d483818 Updates in preparation for the release of version 3.2.2. (CVS 2509)
FossilOrigin-Name: e9602c4a9d2b62a9b3a86b94f47971c56ee6733e
2005-06-12 22:23:40 +00:00
drh 65efb65e46 Fix documentation typos. (CVS 2508)
FossilOrigin-Name: 41049062cdefdc111398589daff464a9a13600aa
2005-06-12 22:12:39 +00:00
drh 51942bc3c3 Documentation updates (ticket #1279). Add the sqlite3_db_handle API.
(ticket #1275). (CVS 2507)

FossilOrigin-Name: 21d44fa5e7163dc658f7147885518d90218347f7
2005-06-12 22:01:42 +00:00
drh f0863fe568 Update older opcode names to be more meaningful in light of the latest
code design. (CVS 2506)

FossilOrigin-Name: 36f2da1f8d8d434f861ecad55c9d86549751c954
2005-06-12 21:35:51 +00:00
drh 4a9f241c37 Elminiate a VM opcode that was no longer needed. (CVS 2505)
FossilOrigin-Name: 97b348a5ad2f090ba7a75467b97c6dfb575df09c
2005-06-12 12:01:19 +00:00
drh 0ccebe7e2d Changes to support linking without a parser and without a disk I/O interface. (CVS 2504)
FossilOrigin-Name: 62a7353d4af4886b1561832e8b36e8e788b38834
2005-06-07 22:22:50 +00:00
drh 80f93bf41f In the documentation, amplify the fact that encodings cannot be changed
on a database that already exists.  Ticket #1277. (CVS 2503)

FossilOrigin-Name: 4704f3a19af73261ec03c0192c74a0416aeba794
2005-06-07 20:07:24 +00:00
danielk1977 db0441b155 Remove SSE vacuum hook. (CVS 2502)
FossilOrigin-Name: 59960a59151ae6c711dee404e60e12d4edaa3dda
2005-06-07 09:21:07 +00:00
danielk1977 cbe21be330 Add "#ifndef OMIT_DISKIO" condition around sqlite3_opentemp_count variable
in test interface code. (CVS 2501)

FossilOrigin-Name: f2ce662e81cea4983f335606ed18a74b97d35609
2005-06-07 07:58:48 +00:00
drh af6df11f8a Add tests to make sure statement journals are only opened when necessary. (CVS 2500)
FossilOrigin-Name: 914d6e6549446a6ddf25e5da57d2fe9446750625
2005-06-07 02:12:30 +00:00
drh 3844990cfc Do not open a statement journal unless absolutely necessary. (CVS 2499)
FossilOrigin-Name: 989573a53b58c1e959ad276119298ba2ea7448e6
2005-06-07 01:43:41 +00:00
drh ed8a3bb108 Reference count Table structures so that they are not deallocated too soon.
Ticket #1210. (CVS 2498)

FossilOrigin-Name: e73d25c7419d580c47925494621df26d2fb9f27e
2005-06-06 21:19:56 +00:00
drh 473d179d8a Return SQLITE_MISUSE when passing a NULL pointer into sqlite3_bind routines.
Ticket #1219. (CVS 2497)

FossilOrigin-Name: 12c32f139bae3cb7ca520451bfc15f9f7d94833d
2005-06-06 17:54:55 +00:00
drh ba0232a0df Any non-zero value is considered TRUE in a WHERE clause. Ticket #1211. (CVS 2496)
FossilOrigin-Name: 0f7af623791d8d2ed35c3978ab12316912d9b6f8
2005-06-06 17:27:19 +00:00
drh 873fac0cae Avoid ambiguous column name errors when the column name is in the USING clause
of a join.  Ticket #743. (CVS 2495)

FossilOrigin-Name: 6a51bdeeff8312fa54fa2b1200f823428f35d605
2005-06-06 17:11:46 +00:00
drh 355ef36114 Naming the join columns in the result set of a natural join does not result
in an "ambiguous column name" error.  Ticket #1217. (CVS 2494)

FossilOrigin-Name: 265fb6079c0a4b7a93f063939436db494ff1d56c
2005-06-06 16:59:24 +00:00
drh d70dc52d79 Honor the full_column_names pragma on * results. Ticket #1263. (CVS 2493)
FossilOrigin-Name: 0d57f851ae4f483985710db149c8f541e45cdb86
2005-06-06 16:34:33 +00:00
drh 7c3d64f151 Do not allow parameters in VIEW definitions. Ticket #1270. (CVS 2492)
FossilOrigin-Name: 0d46289f02aad526f462a3ceceb1bca1b9f6a543
2005-06-06 15:32:08 +00:00
drh 41f5852eea Handle failures of getcwd() without segfaulting. Ticket #1274. (CVS 2490)
FossilOrigin-Name: c1691004d6d81b683a4ca5b1723c0de8b9b4e376
2005-06-06 15:06:39 +00:00
drh defc997230 Fix a bug in the malloc2 tests introduced by checkin (2473). (CVS 2489)
FossilOrigin-Name: fafaa18eea1e7142e1094b5f6d544d20c9df7c0f
2005-06-06 14:45:42 +00:00
danielk1977 a38b4134e7 Omit a couple of test cases if the library is compiled without subqueries. (CVS 2488)
FossilOrigin-Name: 6bc372978364a1a4bfa14732a818a6bba613b1e3
2005-05-29 14:23:12 +00:00
danielk1977 44ee5bf795 Minor changes to help build and test SSE. (CVS 2487)
FossilOrigin-Name: 3ac4a212bd70abb94d24830c73f7121df51125c7
2005-05-27 09:41:12 +00:00
drh 3e1d8e6356 Add an experimental sqlite3_get_autocommit() API used to test whether or not
changes are committed automatically. (CVS 2486)

FossilOrigin-Name: 4a7f1275857602e3841ccb2d43a5c4d3d3e87bff
2005-05-26 16:23:34 +00:00
danielk1977 105afed6a0 Add a -cleanup option to Tcl test proc do_ioerr_test. (CVS 2485)
FossilOrigin-Name: b0a898c05a2285c87d7da4d47dd697c58a0d4d58
2005-05-26 15:20:53 +00:00
danielk1977 5c2d9155de If SSE is enabled, set the P1 field of OP_AggInit instructions to the
number of arguments that will be passed to the aggregate function. (CVS 2484)

FossilOrigin-Name: 7f67b9f0f398583651d226fabf2fafd2635d772a
2005-05-26 14:41:47 +00:00
danielk1977 1f723bd904 Fix minor problems with the SSE hooks. (CVS 2483)
FossilOrigin-Name: 3516ca29da5f28adc1fd4da42ca5551d154b6320
2005-05-26 12:37:29 +00:00
danielk1977 4dade03788 Rearrange code so that SSE can invoke the collation factory. (CVS 2482)
FossilOrigin-Name: ea061d2ed3b25908fcfcb88e35ba612e5832a217
2005-05-25 10:45:10 +00:00
danielk1977 fa256a3306 Split main.c into two files to make building without the parser easier. (CVS 2481)
FossilOrigin-Name: d50915fafbde6859a5c2c3fc5cc9b99553b54e21
2005-05-25 04:11:56 +00:00
drh 97903fef77 Remove the config.h file from the build. Ticket #1224. (CVS 2480)
FossilOrigin-Name: 3e64f1ab417f371e9875915303b898c5b45f0807
2005-05-24 20:19:57 +00:00
danielk1977 fd9a0a45a7 Move a few things around to make building without the parser easier. (CVS 2479)
FossilOrigin-Name: 5fadb464eb77b4b998d8555f83401769960ea904
2005-05-24 12:01:00 +00:00
drh b71090fdfb The REGEXP operator is recognized. It tries to invoke a function named
regexp() which does not exist in the native build.  But users who want to
can add an appropriate regexp() function using sqlite3_create_function(). (CVS 2478)

FossilOrigin-Name: 42a626ace126f730f33ecb6c41ac5679d6766a31
2005-05-23 17:26:51 +00:00
drh 15ccce1c0d Make sure that the use of a double-quoted string literal does not trick
the optimizer into using a correlated subquery when a static
subquery would suffice. (CVS 2477)

FossilOrigin-Name: ef4059e3afa1a61a9e59df00cdfedc57d8df9fec
2005-05-23 15:06:39 +00:00
danielk1977 0bb8f36d05 Retain the error string if an error is generated by SSE during a VACUUM. (CVS 2476)
FossilOrigin-Name: f7b76d02e003faf0310b87949d3cb0f38062853f
2005-05-23 13:00:57 +00:00
danielk1977 7e900abf0a Add pFetch variable (used by SSE) to sqlite3 structure. (CVS 2475)
FossilOrigin-Name: 2a8ac869671b627d4d01655bbce7a781bc74af44
2005-05-23 04:51:01 +00:00
drh eb43e5c7b7 The cache_size pragma should not reset the synchronous pragma. Ticket #1260. (CVS 2474)
FossilOrigin-Name: 2db2b32f269062b006ae5c4a302d116cdab8f9ec
2005-05-22 20:30:39 +00:00
drh 132d8d6ab9 Never user a pointer to standard library routines malloc() and free().
This rule is to
work around limitations of MSVC and the _fastcall calling convention.
Ticket #1256. (CVS 2473)

FossilOrigin-Name: a39c446726099e4915a1ad72c019d3c2cfe065bb
2005-05-22 20:12:37 +00:00
drh edc1cc5b3e Fix a memory leak. Ticket #1259. (CVS 2472)
FossilOrigin-Name: 254ac2213e695ead065ba3807d5d285046212fe1
2005-05-22 19:21:51 +00:00
danielk1977 fd9e1f3179 Add hook to register SSE user-functions. (CVS 2471)
FossilOrigin-Name: 20bd303e8c6f7e69ba82ce1dc3041ea4e02d55cf
2005-05-22 10:44:34 +00:00
danielk1977 3a3f38e090 Allow schema objects beginning with sqlite_ to be created if the
SQLITE_WriteSchema flag is set. (CVS 2470)

FossilOrigin-Name: afc8ce42b6c321463f6451727d0f85c490c8e9ae
2005-05-22 06:49:56 +00:00
drh 3c68582188 Speed improvements as described by tickets #1257 and #1258. These changes
help some but are nowhere near the 23% claimed in the tickets. (CVS 2469)

FossilOrigin-Name: 3fa177c54a8589dcfa0bfad0ca124cb73b363f18
2005-05-21 18:32:18 +00:00
drh fcd35c7b8c More structure rearrangements for additional size reductions. Ticket #1253. (CVS 2468)
FossilOrigin-Name: 6b6e525b294a5bbf8a5e56a2f60aa096865aedbd
2005-05-21 02:48:08 +00:00
drh 6d156e464d Reorder structure fields to reduce code footprint. Ticket #1253. Need
to do more of this. (CVS 2467)

FossilOrigin-Name: 27025613bc2970b0c23e08fbe5251103794ab6cb
2005-05-20 20:11:20 +00:00
drh 1c7880e501 Do not allow the pagesize of :memory: databases to be changed. Silently
ignore PRAGMA page_size=N requests for :memory: databases.
Ticket #1144 and #1252. (CVS 2466)

FossilOrigin-Name: f29a1d882623d8ff14f35a302aef63a16388bcb3
2005-05-20 20:01:55 +00:00
drh e590fbde7c Comment changes in vdbeapi.c (CVS 2465)
FossilOrigin-Name: ab7805fb2fb29abc1311e23a93ba03883db7b30e
2005-05-20 19:36:01 +00:00
danielk1977 562e8d3c3b Fix memory leaks in Tcl user function interface. (CVS 2464)
FossilOrigin-Name: f5d9a8061a6d650f207669b121243abb8dd28be2
2005-05-20 09:40:55 +00:00
danielk1977 1f55c05660 Always use a more specific type (P3_FUNCDEF) instead of P3_POINTER as the
P3 type of a vdbe instruction. (CVS 2463)

FossilOrigin-Name: 79a41674be2c0a1990598428d8b1e9d09d3ea389
2005-05-19 08:42:59 +00:00
drh dd9f8b45ef Fix an array index that is out of bounds. Ticket #1251. (CVS 2462)
FossilOrigin-Name: bcf87e4d1681d6c2856e716aae0135c2b14989d8
2005-05-19 01:26:14 +00:00
drh 8e855770de Provide a compile-time parameter to set the default file creation permissions
under Unix.  Ticket #1247. (CVS 2461)

FossilOrigin-Name: bfa55bec3233eed899606c309773f441857605ae
2005-05-17 11:25:31 +00:00
drh c43e8be80c Fix an uninitialized variable. Ticket #1244. (CVS 2460)
FossilOrigin-Name: 582cb77d72031f78b560f67222a0e6ce5e3ca3f2
2005-05-16 22:37:54 +00:00
danielk1977 5205b40393 Modify documentation to explain default value of "pragma synchronous".
No code changes. (CVS 2459)

FossilOrigin-Name: 453014421e9a739b47d4c28b0342454e4c686199
2005-05-16 02:13:17 +00:00
drh 29f214bdaa Change to the lemon parser suggested by Geert Janssen. Appears to have no
impact on SQLite. (CVS 2458)

FossilOrigin-Name: 6fda60083f258a4943c859d768ea7142de831594
2005-05-11 14:28:14 +00:00
drh 6601e9e898 Fix a typo in the CREATE TABLE documentation. (CVS 2457)
FossilOrigin-Name: 748771a8ad7f175e49f253d0c1ace3fc55814418
2005-05-10 16:11:41 +00:00
drh 68cb6192c1 Timing fix in the default busy handler. (CVS 2456)
FossilOrigin-Name: 76090ed84c73a9b9c7099e2986390ca8967128f4
2005-05-06 22:05:56 +00:00
drh 8d97f1f141 Patch to fix an alignment problem on sparc. Ticket #1234. (CVS 2455)
FossilOrigin-Name: 240cce10d4b9d595a267e392ce322472b10f286d
2005-05-05 18:14:13 +00:00
drh 0405a34d11 Fix a datatype in trigger6.test that changed due to the previous check-in. (CVS 2454)
FossilOrigin-Name: c2af7d2c947bcec507087cc3a1e5b21e6322e4cd
2005-05-05 11:04:50 +00:00
drh c7f269d551 In the TCL interface, user-defined functions preserve the datatype returned
by the Tcl procedure. (CVS 2453)

FossilOrigin-Name: 99dcba1fb1fdaa2b8bc85046b00c14f6af596e8f
2005-05-05 10:30:29 +00:00
drh c96d8530ca Make sure all data structures have 8-byte alignment - necessary for the
sparc architecture and helpful on other 64-bit platforms.  Ticket #1232.
Also update some comments in build.c. (CVS 2452)

FossilOrigin-Name: d9418851cebc1605d8d62aad7987c0d61a905e81
2005-05-03 12:30:33 +00:00
drh 07d183da90 Remove the psAligned value from the BTree structure - the pageSize is now
always aligned to an 8-byte boundary.  Add comments on a confusing bit
of code.  Ticket #1231. (CVS 2451)

FossilOrigin-Name: 535523e1be692adc940d256a7b3d23c62a4cc947
2005-05-01 22:52:42 +00:00
drh 7e62779a58 Prevent a segfault described by ticket #1229. (CVS 2450)
FossilOrigin-Name: 0667eae9a97059125a77bd90452d19dc17c30a12
2005-04-29 02:10:00 +00:00
drh 89dec819d2 Add hooks for the SSE extension. (CVS 2449)
FossilOrigin-Name: 90f4cf2ad57309dbd20954fc7fd60859bc44bcf4
2005-04-28 19:03:37 +00:00
drh 2e66f0b972 Enhancements to allow for extensions. (CVS 2448)
FossilOrigin-Name: 6863703abcb2bf31d65792d4de9ae20aba2eadb5
2005-04-28 17:18:48 +00:00
drh ee570fa498 Fix an array index bug in the default busy callback handler.
Ticket #1198. (CVS 2447)

FossilOrigin-Name: 3cc14b7606681d04eb56003a0996322e3b3bdc73
2005-04-28 12:06:05 +00:00
drh f8db1bc03b Remove some vestigal code. Add the experimental sqlite3_transfer_bindings()
API. (CVS 2446)

FossilOrigin-Name: 88b39436f00d645cdb6333a7413c698c42227d3f
2005-04-22 02:38:37 +00:00
drh b47d45ccbf Correctly store large integers. Ticket #1212. (CVS 2445)
FossilOrigin-Name: 00e20690bb8cc6522c9c48f36f0c3336ae007827
2005-04-15 12:04:34 +00:00
kwel c7e22ee254 Added tests to exercise delete, insert, and update triggers on views (tkt #1169) (CVS 2444)
FossilOrigin-Name: 6cd19ddcba5fbea1be04b44699c911294618e948
2005-04-08 19:48:27 +00:00
kwel d536273abf Fixed stack growth in update trigger on views (tkt #1169) (CVS 2443)
FossilOrigin-Name: 99fcd5561b539010b7e76cad7815bb2350541f00
2005-04-08 16:08:36 +00:00
kwel ae87f0ed25 Fixed stack growth in delete trigger on views (tkt #1169) (CVS 2442)
FossilOrigin-Name: 1a757ba13292577d01bd7b66811bcfd6748b9f7e
2005-04-08 16:07:47 +00:00
danielk1977 55c45f2e1e Apply Tcl 'nullvalue' patch from Stefan Finzel. (CVS 2441)
FossilOrigin-Name: 9906ae37b9be684b615a1190cf8798513baa799a
2005-04-03 23:54:43 +00:00
drh 2b70fb90e1 Documentation updates. (CVS 2440)
FossilOrigin-Name: 7e6f688d468099a6e62e405086c9172459d43e3f
2005-04-01 16:29:12 +00:00
drh 495c09a49a Make the ORDER BY clause return equal elements in the same order they were
seen (a stable sort).  It was returning them in exactly the reverse order. (CVS 2439)

FossilOrigin-Name: e8391491a68018406e30c2a699a4cab9e0de092c
2005-04-01 10:47:40 +00:00
drh 9a7e60865d Add a "const" declaration to a constant. Fix a typo in a comment. (CVS 2438)
FossilOrigin-Name: 67aaa269068ea6b6f784979c09b3deb091928563
2005-03-31 22:26:19 +00:00
drh 4fb90f2bff Update comments and documentation to give the true maximum page size as 32K,
not 64K as was previously (and erroneously) reported.  Ticket #1194. (CVS 2437)

FossilOrigin-Name: 58dd436b6572d38ea67960b8d08a0ca4359602f0
2005-03-31 21:02:45 +00:00
drh f4f8fd51e4 Make sure integer primary keys larger than 2^31 are handled
properly.  Ticket #1188. (CVS 2436)

FossilOrigin-Name: 1d04c2ab299430959b8a193d4679cbc4c0be31a4
2005-03-31 18:40:04 +00:00
drh 3ced14a616 Fix a memory leak in the TCL bindings. (CVS 2435)
FossilOrigin-Name: c31ea6332f53d361be864554b83662d3fc0d52f7
2005-03-31 18:26:20 +00:00
danielk1977 3eb8db90ba Fix a problem with threads and the global database list in main.c. (CVS 2434)
FossilOrigin-Name: 4aa05d2251b0cf6323ea695330de9ccf7e071bed
2005-03-29 23:34:58 +00:00
drh 60625c4c84 Version 3.2.1 (CVS 2433)
FossilOrigin-Name: 844f01af726f5e478a4ef32f39be9f20360a0d96
2005-03-29 13:37:46 +00:00
drh d2d62b31ce Change the date of the 3.2.1 release. (CVS 2432)
FossilOrigin-Name: afa42e2fa4487e4671ee481df09659a447f9c2a8
2005-03-29 13:19:01 +00:00
drh faf60c7a0d Fix minor display bugs in sqlite3_analyzer. (CVS 2431)
FossilOrigin-Name: d89aaba5b0fe6b2787531cadd7806ab5a3fdeb98
2005-03-29 13:18:16 +00:00
drh 19642e5d65 Fix a C++-ism in the code. (CVS 2430)
FossilOrigin-Name: 312587acf9e94e1d12390a9a0206c9464815e8d7
2005-03-29 13:17:45 +00:00
danielk1977 7a5147c5c9 Change 'stack' to the more descriptive 'no-push' in vdbe.c. (CVS 2429)
FossilOrigin-Name: 7e54d3c7289c091d449844d21b923e553f1d1f5f
2005-03-29 13:07:00 +00:00
danielk1977 bc04f8529d Reduce the space allocated for the runtime virtual machine stack. (CVS 2428)
FossilOrigin-Name: 7d6818da33a87076d1faf35ffc15a3aada0533b3
2005-03-29 08:26:13 +00:00
danielk1977 53c0f7480b Add the SQLITE_OMIT_TEMPDB compile time macro. (CVS 2427)
FossilOrigin-Name: c41d55443c2dd532147962b87f542fb7d37075fd
2005-03-29 03:10:59 +00:00
danielk1977 50f059b871 Fix segfault due to exception handler being run with uninitialised variable. (CVS 2426)
FossilOrigin-Name: 78df3d040443414ae5b440eeabc0c8c205ab311d
2005-03-29 02:54:03 +00:00
drh 88b01a13c6 Fix another memory leak in the pager. (CVS 2425)
FossilOrigin-Name: 4ca11ca015d798655170593c1b76d312185d6ed2
2005-03-28 18:04:27 +00:00
drh 6cdc5d0269 Increment version number and update documentation in preparation for
version 3.2.1. (CVS 2424)

FossilOrigin-Name: b0409b93108096a81245170887d60d076d639c60
2005-03-28 16:56:09 +00:00
drh 92fd9d285f Changes to alter3.test to allow it to work with a codec. (CVS 2423)
FossilOrigin-Name: 9e856bab2bbb77004b049827b4a275aa6c48096b
2005-03-28 16:50:22 +00:00
danielk1977 634f298c89 Modifications to reduce memory consumption. (CVS 2422)
FossilOrigin-Name: 0fd5ce4eefdc429ce0493f15d0dba9e8a3a0b0e2
2005-03-28 08:44:07 +00:00
drh dd5b2fa5f2 Fix some memory leaks that occur after a malloc failure. (CVS 2421)
FossilOrigin-Name: bcb5d72ef146b1019c72220701d385c7b0b5d0bd
2005-03-28 03:39:55 +00:00
danielk1977 f0b5792bdc Use SQL function substr() correctly from ALTER TABLE code. Ticket #1182. (CVS 2420)
FossilOrigin-Name: ccb9f4022b3ccb1cc2ab001628fd38becfbf8efe
2005-03-28 00:07:16 +00:00
danielk1977 b3a2cced6b Correctly allocate new columns array in ALTER TABLE .. ADD COLUMN. Ticket #1183. (CVS 2419)
FossilOrigin-Name: 3c86e63389b286a49106d8d7009cc63e3914d40f
2005-03-27 01:56:30 +00:00
drh d960d0641e Fix a typo in vdbeInt.h. This was potentially a serious mistake, but we got
lucky and it is benign. (CVS 2418)

FossilOrigin-Name: f0d64dc8aa65b25af551e6e5f07746bd77c8112a
2005-03-23 01:48:47 +00:00
drh 1d5de64d20 Fix typo in the formatchng.html document. (CVS 2417)
FossilOrigin-Name: 35ace66f3ebefd4cd1455c923199511ab3b72bb6
2005-03-23 01:05:14 +00:00
drh 3ee003d8f7 Version 3.2.0 (CVS 2415)
FossilOrigin-Name: debf40e8ffa35406685ec027ced1f147ef0487df
2005-03-21 19:51:30 +00:00
drh 3d07343c84 Documentation changes prior to the release of version 3.2.0. (CVS 2416)
FossilOrigin-Name: cc5a2c8e5d2ddb87f3bce6efaf3e62d7fa00d9ca
2005-03-21 19:48:00 +00:00
danielk1977 6b456a2b46 Add function to recover from a malloc() failure. (CVS 2414)
FossilOrigin-Name: 1f9d10d7965c95d1e35f64cf4c3f128adabd41f2
2005-03-21 04:04:02 +00:00
danielk1977 e94ddc9e43 Assorted fixes to the handling of various malloc() failures. (CVS 2413)
FossilOrigin-Name: e7844a01c248e8d9204ea9214bec84c81dc07f32
2005-03-21 03:53:38 +00:00
drh 7a8245b525 Update docs to say that the default_synchronous pragma has been removed.
Ticket #1049. (CVS 2412)

FossilOrigin-Name: 21012bba176035ff69f860936794a6c2a8eac9df
2005-03-21 01:31:36 +00:00
drh 6062d8f5f2 fix typo in CREATE VIEW documentation. Ticket #1135. (CVS 2411)
FossilOrigin-Name: 38897a509a98188a06c49c01a71ddf8835c7b607
2005-03-21 01:24:02 +00:00
drh 38fba69135 Fix an infinite loop in the code generator for INSERT. Ticket #1140. (CVS 2410)
FossilOrigin-Name: 876d09d9145775956913e975c29e81d7553839ac
2005-03-21 01:20:58 +00:00
drh 6841f162c6 README file updated to suggest running "make install". Ticket #1168. (CVS 2409)
FossilOrigin-Name: b48784cf65420da5ccdf779504e3c0b5c0f2471d
2005-03-21 00:47:18 +00:00
drh 4cb29b4cfc Allow the character "T" between date and time in ISO-8601 date/time formats.
Ticket #1170. (CVS 2408)

FossilOrigin-Name: 2bf88daa57b01216c7bbe67972f479ee12be1193
2005-03-21 00:43:44 +00:00
drh 09bf0e8d5e Improved support for cygwin. Ticket #1165. (CVS 2407)
FossilOrigin-Name: fcb5cee440ab49e39b62b177cbb04ab0b061a477
2005-03-21 00:36:08 +00:00
drh 47fb54da2e Fix a formatting error in the syntax documentation. Ticket #1145. (CVS 2406)
FossilOrigin-Name: 59892be6a4c344cb6654f76e4b3b9db96d52f132
2005-03-21 00:28:24 +00:00
drh ab34b8f65a Fix for ticket #1167 (CVS 2405)
FossilOrigin-Name: d9aa0aa9ae2ca0dec976ba2ae4cd7047132be45b
2005-03-20 23:18:57 +00:00
drh 8aa60cb746 Do not attempt to read the journal file on windows because manditory locking
on windows will not allow it.  Ticket #1166. (CVS 2404)

FossilOrigin-Name: 1865e0d81c827cc879dde96c6a9f42e740b6a560
2005-03-20 22:54:56 +00:00
drh 9636284e32 More changes for ticket #1171 after additional analysis. (CVS 2403)
FossilOrigin-Name: 0471d6b86fd67c22da832beb280b31305c5aa812
2005-03-20 22:47:56 +00:00
drh 41712ef171 Tentative fix for ticket #1171. More research and testing needed. (CVS 2402)
FossilOrigin-Name: f0a39cee78472b93cce5304fc255285ddea7d2bf
2005-03-20 19:10:12 +00:00
drh c2cb4c10c8 More documentation updates. (CVS 2401)
FossilOrigin-Name: f065b6102db838d48f1a1a9ed68b2a09cd440cf8
2005-03-19 15:10:45 +00:00
drh 47b4b29b12 Preparations for the release of version 3.2.0. (CVS 2400)
FossilOrigin-Name: 90a00e90663749e5d1f8e28709dfbe981f8afc8b
2005-03-19 14:45:48 +00:00
drh 255d448726 Fix typos in documentation. (CVS 2399)
FossilOrigin-Name: aee888ca58a7d059ff3ccb26bf0924550d54ab1c
2005-03-19 03:41:57 +00:00
drh ddba9e54e7 Updates to comments and documentation. No changes to code. (CVS 2398)
FossilOrigin-Name: e53c77268cd16802bd8c6fc4c6cd5280dc12f9c1
2005-03-19 01:41:21 +00:00
drh e29b915e9b Remove unused code from util.c. Enhance the trace output in os_unix.c. (CVS 2397)
FossilOrigin-Name: f2f31919fdd181c79b86f849d46c60f1ed7a0db1
2005-03-18 14:03:15 +00:00
drh 072192dffa Fixed a typo in alter3.test. (CVS 2396)
FossilOrigin-Name: 698be25d3e8f0eb2b5a4c6c7d20343b3c8a06134
2005-03-17 12:33:14 +00:00
danielk1977 37b69a0130 Don't run the tests in alter3.test if SQLITE_OMIT_ALTERTABLE is defined. (CVS 2395)
FossilOrigin-Name: 800fb3bf06f73af53af57f5b172c85406af374ad
2005-03-17 07:00:55 +00:00
danielk1977 c4a41b12f4 Update to keyword list for ALTER TABLE ... ADD COLUMN command. (CVS 2394)
FossilOrigin-Name: 173e26961faec434cd4e4abc1dcb238ab9a942b8
2005-03-17 05:06:28 +00:00
danielk1977 19a8e7e882 Add the ALTER TABLE ... ADD COLUMN command. (CVS 2393)
FossilOrigin-Name: 94185dd4f7e2e941c74a521488d1212a75927218
2005-03-17 05:03:38 +00:00
drh 44dcbda393 Version 3.1.6 (CVS 2392)
FossilOrigin-Name: 6a3f4e4be6f294f756ed882f220f579252735f3f
2005-03-17 04:01:24 +00:00
drh 4ff55083e5 Strengthen an assert() in vdbe.c. (CVS 2391)
FossilOrigin-Name: 3f45cf3516be9919fe2c0673d6f445fa83d42126
2005-03-17 03:52:47 +00:00
drh fb189328de Preparing for the release of 3.1.6. (CVS 2390)
FossilOrigin-Name: 45cbf27e8079754941225e87867711504bf3d60c
2005-03-17 03:33:16 +00:00
drh cb9882a753 Fix a bug in the calculation of the table record header size.
Ticket #1163. (CVS 2389)

FossilOrigin-Name: bf82a04ff7c24a38d45721b3fae69d88d6e83149
2005-03-17 03:15:40 +00:00
danielk1977 d5d565235b Fix some memory leaks that can occur if a memory allocation fails. (CVS 2388)
FossilOrigin-Name: 9a358fc33d726d0b5782bf65b50f61f2bd096d56
2005-03-16 12:15:20 +00:00
drh 165ffe9708 When creating a new database, delete any preexisting journal that might be
left over from a prior database with the same name.  Ticket #1152. (CVS 2387)

FossilOrigin-Name: 856e2ec9688affbfe496cf184f460b18408e3dc0
2005-03-15 17:09:30 +00:00
drh ae8b3615ee Allow the database name in a DETACH statement to be quoted.
Ticket #1151. (CVS 2386)

FossilOrigin-Name: 24e887735256499e58dabe90463524d9e6eb08ce
2005-03-15 02:04:12 +00:00
drh b8ef32c3e8 Be more aggressive about using the busy handler. Ticket #1159. (CVS 2385)
FossilOrigin-Name: 644c6398e52481e5dda87671e1c196b26b1e4990
2005-03-14 02:01:49 +00:00
drh 556927f944 Fix typo in documentation. (CVS 2384)
FossilOrigin-Name: 78012246fc1c1fe844d192cfff69a736e388ce7a
2005-03-12 18:03:58 +00:00
drh 9179fd93ff Documentation updates. Added the "distinctive features" page. (CVS 2383)
FossilOrigin-Name: 33a0191638a4d6b33422f62487bfb9a0089d3cff
2005-03-12 15:55:10 +00:00
drh f580380463 Version 3.1.5 (CVS 2382)
FossilOrigin-Name: b1792ae51666f27bc47cf986937a3caacdd3a9f7
2005-03-11 18:06:53 +00:00
drh 9c2ba47eac Disable GNU readline in the build of the command-line shell for linux since
some systems (ex: SuSE) do not support it. (CVS 2381)

FossilOrigin-Name: baddb06450e6948334faef4afa7cbfba40a2aa0f
2005-03-11 18:06:40 +00:00
drh 70e15d6cbb Updates to the homepage prior to 3.1.5. (CVS 2380)
FossilOrigin-Name: c78611f620587d392b978d4218e3b464ccc74730
2005-03-11 17:55:32 +00:00
drh f30cc9496a Fix bugs discovered in 3.1.4. F_FULLFSYNC not F_FULLSYNC. And a bug in
"make doc".  Also typos in the documentation. (CVS 2379)

FossilOrigin-Name: 3c57a4571fc8463ce9de1cbe5be45538bf2f0de9
2005-03-11 17:52:34 +00:00
drh 05501af78b Version 3.1.4 (CVS 2378)
FossilOrigin-Name: 3d070a9b4d680d952464b53b51e82b95982bbfca
2005-03-11 04:53:17 +00:00
drh 748f763f7a Fixes so that the FULLSYNC changes will build on windows. They do not have
any effect, but neither do they cause errors. (CVS 2377)

FossilOrigin-Name: ace3e30de1cde2e8990d8429b730ca5b68acd714
2005-03-11 04:41:39 +00:00
drh 4835fc5c9b Increase the version number to 3.1.4. (CVS 2376)
FossilOrigin-Name: e438b65cf9606f5564b28857ba9625665d57f1f6
2005-03-11 04:40:23 +00:00
drh a8f9361f1d Documentation updates for version 3.1.4. (CVS 2375)
FossilOrigin-Name: a7261f1590367932db23f5c8d6d785887df1e8dd
2005-03-11 04:39:58 +00:00
drh 6575a222d5 Another case of returning SQLITE_CORRUPT when a corrupt database file
is detected. (CVS 2374)

FossilOrigin-Name: 8710192797b5b22f29b2af90198d03664665bd83
2005-03-10 17:06:34 +00:00
drh 75ea0289cc Fix a problem with crashtest caused by the F_FULLSYNC change. (CVS 2373)
FossilOrigin-Name: f11c6e745200525056ae7cf97b4bdf1c7f1db588
2005-03-10 14:32:24 +00:00
drh b851b2c938 Disable F_FULLSYNC if the sychronous pragma is not set to FULL. (CVS 2372)
FossilOrigin-Name: 58b8733b96165126ee8514f2ce0f88d249792847
2005-03-10 14:11:12 +00:00
drh cca76c2f7e Disable the use of ./crashtest in builds that include a codec. (CVS 2371)
FossilOrigin-Name: 7e4af62238bf8fa3d3cbc79e2c8951e621a0c0b4
2005-03-10 12:58:21 +00:00
drh fec8066734 Disable the alter2 tests if there is a codec compiled into the library. (CVS 2370)
FossilOrigin-Name: 06a48da67b142e92624cdfd46947bd4ccc6842b7
2005-03-10 12:52:47 +00:00
drh 33fa535dca Fix a #ifdef in util.c. (CVS 2369)
FossilOrigin-Name: f426c625c4c3de626b5f5f8b5a6343a7ec3b16e9
2005-03-10 12:35:45 +00:00
danielk1977 5fd057af68 Fix a file corruption bug in CREATE INDEX in auto-vacuum databases. (CVS 2368)
FossilOrigin-Name: 64c4c717d35c8fce9b4be073196c507f6d471188
2005-03-09 13:09:43 +00:00
danielk1977 aee18ef8e2 Support for a future ALTER TABLE command to add columns with default values. (CVS 2367)
FossilOrigin-Name: 9d5abc1ddf6da37563c12d5a0401b89bb4e51c59
2005-03-09 12:26:50 +00:00
drh 97ba4c94fc Print an error message and quit if the regression tests are run as root.
Ticket #1153. (CVS 2366)

FossilOrigin-Name: 9b96078763949a2723482328e7b90c939ba8d2d8
2005-03-02 05:18:57 +00:00
drh d61c443e6a Fix the header comment on experimental.c. (CVS 2365)
FossilOrigin-Name: 0c4d2b11c922b41d0e03bfbd885dfdf52ce7ccab
2005-03-02 05:18:29 +00:00
drh 737b6e83a1 Version 3.1.3.1 (not an official release) (CVS 2364)
FossilOrigin-Name: 957333a7b203373e89030766f693e691f049c66a
2005-02-28 01:52:56 +00:00
drh de4fb7b050 Bump the version number to 3.1.3.1. (CVS 2363)
FossilOrigin-Name: 1ca8bbf749988fd3c88b25c08255c2096f833808
2005-02-28 01:42:23 +00:00
drh bf21627b6f Add the SQLITE_OMIT_FLAG_PRAGMAS compile-time option. (CVS 2362)
FossilOrigin-Name: c167e9054249361d1f464d3840a5c277e6ed44ab
2005-02-26 18:10:44 +00:00
drh ccae6026e6 Fix an assertion fault that can occur while autovacuuming a corrupt database
file.  Add the SQLITE_OMIT_COMPLETE compile-time parameter. (CVS 2361)

FossilOrigin-Name: bb0e7e3857a06347b08d93553ac603e737322262
2005-02-26 17:31:26 +00:00
drh 7530873132 Revised man page from Bill Bumgarner. (CVS 2360)
FossilOrigin-Name: 5c99bea5a480edc7b15ae80be952b212e730d452
2005-02-24 04:51:51 +00:00
drh 51e75cafb0 Remove strcasecmp from shell.c. Tickets #1108, #1122. (CVS 2359)
FossilOrigin-Name: 4ae1a9fc2c484e59ef1e58972aa25772cede1187
2005-02-23 12:35:41 +00:00
drh 29088eb6c9 The script that cross-compiles the windows DLLs now exports the symbols
Tclsqlite_Init and Sqlite_Init used to initialize the TCL extension.
Ticket #1137. (CVS 2358)

FossilOrigin-Name: f18704777407d84f5ba23333e8d4bcdcb09b4a70
2005-02-23 00:26:12 +00:00
danielk1977 3fdf826699 Fix bug reported on the mailing list for WHERE clauses like (rowid<'2'). (CVS 2357)
FossilOrigin-Name: b323f0f2832ac5d225d880db6f56314d2f766a25
2005-02-22 09:47:18 +00:00
drh dcc2b9882b Version 3.1.3 (CVS 2356)
FossilOrigin-Name: 36dbf5e929ede7768e8b63219e54548384a8fab5
2005-02-20 02:25:57 +00:00
drh 30375de10e Prepare for the release of 3.1.3. (CVS 2355)
FossilOrigin-Name: 5b66631fd4820e721fd506b233ca9259360139be
2005-02-19 13:46:25 +00:00
drh 30963453c5 Rework parts of the pragma documentation. Ticket #1081. (CVS 2354)
FossilOrigin-Name: 25141d9e213005940c4e57deca408e09c3e615d1
2005-02-19 13:05:47 +00:00
drh 0ab5fcccc7 Add documentation on the EXISTS expression. Ticket #1082. (CVS 2353)
FossilOrigin-Name: 76cacb4a39d2dd79a27624a8bd1ff65eeedd4ac8
2005-02-19 12:44:15 +00:00
drh e1b4f0374c Remove duplicate word from documentation. Ticket #1103. (CVS 2352)
FossilOrigin-Name: c1fc0a8aa96d2bd615f815b2477b801bda9e9c50
2005-02-19 12:32:57 +00:00
danielk1977 36963fdca8 Support for a future file format that includes 'short' records. (CVS 2351)
FossilOrigin-Name: 173aeb256e2c09098a4392874f8623e8a760d951
2005-02-19 08:18:05 +00:00
danielk1977 25d39a83ac Fix typos in documentation for pragma short_column_names. Ticket #1130. (CVS 2350)
FossilOrigin-Name: fac56fa1e06e15ffd738cb9b780d422a73a743ae
2005-02-18 01:15:23 +00:00
drh 75f86a4b0b Compile-time option to limit the size of AUTOINCREMENT rowids to 32-bits. (CVS 2349)
FossilOrigin-Name: c5366deaf5beca9c99558c0f375ba73f817acd92
2005-02-17 00:03:06 +00:00
danielk1977 46dd62bc69 Clarify that columns are indexed from 0 when using sqlite3_column_XXX() APIs. No code changes. (CVS 2348)
FossilOrigin-Name: d5eb25d8d0d444ab98b26f7f1ac763919e692806
2005-02-16 23:43:33 +00:00
drh b797783d68 Change to configure.ac contributed by a reader. (CVS 2346)
FossilOrigin-Name: 0cd3bf02d25933286085708308ff963c50c8d33d
2005-02-16 03:45:51 +00:00
drh dc30dd3158 Patch the command-line error message printing for lemon. Ticket #1120. (CVS 2345)
FossilOrigin-Name: 97c7aaf1870a86955f0f3a0cbe06187e3c3ccc90
2005-02-16 03:35:15 +00:00
drh 0f68fd1bd9 Get vacuum working on database that used to have autoincrement tables but
where all such tables have been dropped.  Ticket #1121. (CVS 2344)

FossilOrigin-Name: 8f7c639da0f862fa2dd2f55eb7e4d453cd321540
2005-02-16 03:27:04 +00:00
drh 1f01ec1b7a Move the special built-in SQL functions used by ALTER TABLE out of func.c
and into alter.c. (CVS 2343)

FossilOrigin-Name: dbd11a0c581b447bb2f220a1a185d9fd36933ee3
2005-02-15 21:36:18 +00:00
drh d0e4a6c11d Split the logic for the ALTER TABLE command off into a separate source
code file. (CVS 2342)

FossilOrigin-Name: 90d6573c2631fac92b9e572e9e21698ae2480c9d
2005-02-15 20:47:57 +00:00
drh 057cd3a0aa Btree checks the autovacuum flag after locking the database file. (CVS 2341)
FossilOrigin-Name: 6610188f09d08c65c46a140685b403aa74f71a19
2005-02-15 16:23:02 +00:00
drh 39171f390d Append the version number to the directory name in source code tarballs.
Tickets #793, #855, and #1055. (CVS 2340)

FossilOrigin-Name: 138577d0a5c41f3de4f9adc9ab6e312a65ff8888
2005-02-15 16:15:09 +00:00
drh a10da477c2 Fix a hyperlink bug on the homepage. (CVS 2338)
FossilOrigin-Name: 9fd9d9fbeefcc76e7262f488f99ac11eaf58e88e
2005-02-15 13:38:46 +00:00
drh 208bbcbcba Version 3.1.2 (CVS 2337)
FossilOrigin-Name: e9012d917a97a2f62ea58e85afa4879d213558e8
2005-02-15 13:08:09 +00:00
drh 8f4971fcd9 Updates to the script that generates the download page for the website. (CVS 2335)
FossilOrigin-Name: 363590d37fd3a2cdfb4c2887b790395dae2fb97e
2005-02-15 13:07:38 +00:00
drh 08971de9bc Update the change log. (CVS 2334)
FossilOrigin-Name: 94c3f20e8c831aa708955b588a13d54f79f3ef03
2005-02-15 12:56:22 +00:00
drh 1179ee3418 Update the homepage prior to releases 2.8.16 and 3.1.2. (CVS 2333)
FossilOrigin-Name: 603bbe47ddb14105da6a3435ff8f7c6c6f1929a1
2005-02-15 12:51:16 +00:00
danielk1977 1722181328 Ensure a database file is not truncated without an exclusive lock.
Fix for ticket #1114. (CVS 2332)

FossilOrigin-Name: dcbc983355d3207615b52b0724405a024a1a5955
2005-02-15 03:38:05 +00:00
danielk1977 3c407374fc Check that read-only pages are not being modified (disabled by default). (CVS 2331)
FossilOrigin-Name: 8514a4feb2a86e93c4251c491d394e861bb65edb
2005-02-15 02:54:14 +00:00
drh aee128dc20 Make sure that when a CREATE INDEX fails, it does not leave a residue behind
that can corrupt the database.  Ticket #1115. (CVS 2330)

FossilOrigin-Name: cbed92f397ec13b57771ab8b5be74c0cacf35dfd
2005-02-14 20:48:18 +00:00
danielk1977 2b6d46b975 Tighten up the CREATE INDEX syntax accepted by the parser. (CVS 2329)
FossilOrigin-Name: 41d2214b83dd52acdda64a50d0c1ef16009d06d0
2005-02-14 06:38:40 +00:00
drh 802d69a79c Update the version number in preparation for the release of 3.1.2. (CVS 2325)
FossilOrigin-Name: f3c51de7599ed6d3bcdd227e290ad75829840957
2005-02-13 23:34:24 +00:00
danielk1977 a1cb183d04 Fix a problem with sub-queries and the flattening optimization. Also handle an extra case of database corruption. (CVS 2324)
FossilOrigin-Name: f7858d8830cdd0f57b8f9bc73068d29a7062b8ac
2005-02-12 08:59:55 +00:00
drh 8cbd373ca7 Fix a problem with VACUUM that can lead to database corruption. (CVS 2323)
FossilOrigin-Name: 63894baf1b37156fd0b84eba4c9c5e8f43cee3f3
2005-02-12 00:19:30 +00:00
danielk1977 c30f9e7356 Return SQLITE_BUSY if the database is locked reading the schema within
sqlite_prepare(). Ticket #1106. (CVS 2322)

FossilOrigin-Name: c33c02d6069b90f295698a9f35f4aa99dee5f5e9
2005-02-09 07:05:46 +00:00
danielk1977 48af65aeae Add experimental collation_list pragma. (CVS 2321)
FossilOrigin-Name: f73a8aa34afd39e0b7df8f22b5c5d2c8d8979a1b
2005-02-09 03:20:37 +00:00
danielk1977 24c8ab8030 Document SQLITE_DEFAULT_CACHE_SIZE and SQLITE_DEFAULT_TEMP_CACHE_SIZE macros. (CVS 2320)
FossilOrigin-Name: ddcea6f8891b02e64f96591af161feb55c00a72c
2005-02-09 01:40:23 +00:00
danielk1977 4d88778b26 Fix a buggy interaction between "INSERT ... SELECT" processing and optimization (2170). (CVS 2319)
FossilOrigin-Name: c54ad2123693be8777d80343979e3261c4892105
2005-02-08 08:42:27 +00:00
danielk1977 a58fdfb162 Fix for correlated subqueries where the parent is an aggregate. Ticket #1105. (CVS 2318)
FossilOrigin-Name: f0d3ca10c5bccf8fca7143028ebb3e604c0e3f20
2005-02-08 07:50:40 +00:00
drh 7bec505e26 Add the (highly experimental) omit_readlock pragma that disables the use
of readlocks on read-only databases that are connected using ATTACH. (CVS 2317)

FossilOrigin-Name: 2155448d2128119f74241da0ea07d6713b71765c
2005-02-06 02:45:41 +00:00
danielk1977 a2dc3b1a5e Allow expressions (including variables) in LIMIT and OFFSET clauses. Ticket #1096. (CVS 2316)
FossilOrigin-Name: 515e5033a5482f55e7edb66d69ff3da7e234ff2e
2005-02-05 12:48:48 +00:00
danielk1977 99ba19ea08 Add a numeric version number. Ticket #1097. (CVS 2315)
FossilOrigin-Name: a9c33a804d572dd9df15be2029637b10e5a65cc4
2005-02-05 07:33:34 +00:00
danielk1977 ac17178853 Detect database corruption in rootpage flags (see also (2313)). (CVS 2314)
FossilOrigin-Name: 6d91a1e91bf0e8b4a0f5f78d079031f3ee69603b
2005-02-05 06:49:54 +00:00
drh 4e6083cb56 Detect and report a subtle case of database file corruption. (CVS 2313)
FossilOrigin-Name: 9fc0a5cbf892a22eaa950f3b2ed572ab4985c220
2005-02-04 21:13:00 +00:00
danielk1977 6a67fe8edf Remove code for SQL cursors. (CVS 2312)
FossilOrigin-Name: 2eb90870556c90b8d85da3d5eb7554f74ec922c2
2005-02-04 04:07:16 +00:00
drh 62d54916c4 Get AUTOINCREMENT and VACUUM working together. Ticket #1095. (CVS 2311)
FossilOrigin-Name: 332a531d06a610e6597b02105fcda767313f0225
2005-02-03 01:08:20 +00:00
drh f8eb96ab9c Fix the ".dump" command in the shell so that it works with AUTOVACUUM.
This is related to ticket #1095. (CVS 2310)

FossilOrigin-Name: 76c4a96c5a2148f253cc5e034567b16317343be7
2005-02-03 00:42:34 +00:00
drh 4c7f941cfc Make sure the rc variable in OsWrite of os_win.c is always initialized.
Also assert that the amt parameter is always greater than zero.
Ticket #1094. (CVS 2309)

FossilOrigin-Name: 4b399ae7791288e5d44f90da530908d9ca77ff4b
2005-02-03 00:29:47 +00:00
danielk1977 99b214d28e Fix a comment in sqlite3.h. No code changes. Ticket #1093. (CVS 2308)
FossilOrigin-Name: d1ea2fb70be905947c8ff74da8e1f719a8fb85f5
2005-02-02 01:13:38 +00:00
danielk1977 d0a6932f70 Handle "rowid<=X ORDER BY rowid DESC" where X is an integer. Fix for ticket #1092. (CVS 2307)
FossilOrigin-Name: 506088796c846243e24c4cba6be4ce6511fdb345
2005-02-02 01:10:44 +00:00
drh e90b1bd1f1 Version 3.1.1 (beta) (CVS 2306)
FossilOrigin-Name: 2e1c71c4686472c6ee277f8928320095bc27846d
2005-02-01 17:05:13 +00:00
drh 7715643f49 Increment the version number to 3.1.1beta. (CVS 2305)
FossilOrigin-Name: 076f9868a487913a79abddfb3977f05cd88d6cf1
2005-02-01 15:57:07 +00:00
danielk1977 24c9253c43 Space analyzer: Format integer results as integers. Also fix the calculation of average-fanout. (CVS 2304)
FossilOrigin-Name: 52e473b94694cd0991257427d57515ecef93c780
2005-02-01 10:36:40 +00:00
danielk1977 a38432df12 Have debugging code handle sqliteMalloc(n) where n<0 in the same way as production. (CVS 2303)
FossilOrigin-Name: ab85e1d01299e383bda1834664370f04b13634b6
2005-02-01 10:35:06 +00:00
drh 161aba32be More performance tweaking in the parser. (CVS 2302)
FossilOrigin-Name: a3d12726bb7bce72b8266236800c07f22ac5212f
2005-02-01 04:09:36 +00:00
danielk1977 441daf68d2 Fix an error introduced with (2299). (CVS 2301)
FossilOrigin-Name: 22041d5f26355b0fc80eb355bfec897fb50ac1e1
2005-02-01 03:46:43 +00:00
drh 490a73bcde Lemon optimization: When doing a shift following a reduce that pops one
or more elements off the stack, no need to check for stack overflow. (CVS 2300)

FossilOrigin-Name: adcd9a3fa2a86464abd613aa88ae110b4799a241
2005-02-01 03:20:00 +00:00
danielk1977 48d0d866fc Avoid allocating a vdbe in sqlite3FinishCoding() if one has not been allocated already. (CVS 2299)
FossilOrigin-Name: eaf1866e4d10f0ddf5ccc02b7d9aff281ff9efc0
2005-02-01 03:09:52 +00:00
danielk1977 201f7168df Change to sqlite3AffinityType() to remove hex constants. (CVS 2298)
FossilOrigin-Name: d8b4b0ef13dddbf527e7440e7343c458210dceac
2005-02-01 02:13:29 +00:00
drh 74bf02858b Tweaks to the keyword hash generator. Tried to make it a little faster.
If nothing else, the keyword hash table is now a little smaller. (CVS 2297)

FossilOrigin-Name: 4eca6c05abdf3955c5fd7bd3a22c87cd4741d656
2005-02-01 01:40:44 +00:00
danielk1977 b3dff964bd Replace sqlite3AffinityType() with a slightly faster version. (CVS 2296)
FossilOrigin-Name: abe9f5e81f1196f28eec628e898b2a994c4d659d
2005-02-01 01:21:55 +00:00
drh 59f19c15c5 Performance tweaks for sqlite3AffinityType. (CVS 2295)
FossilOrigin-Name: 32b926154aaae9264359fa1e9a7189afd08b0bb7
2005-01-31 23:45:55 +00:00
danielk1977 52a83fbbe9 Move sqlite3HashNoCase to hash.c. (CVS 2294)
FossilOrigin-Name: 5c10ccd8e99cab7e9f8e733dfd1447c2df1d25c1
2005-01-31 12:56:44 +00:00
danielk1977 c60e9b82db Assorted minor changes to speed up loading the database schema. (CVS 2293)
FossilOrigin-Name: dfbd684a913022ad43ce59c3422d3d94f776d547
2005-01-31 12:42:29 +00:00
drh d5b6b38d6f User-contributed chagnes to tclinstaller so that it supports DESTDIR. (CVS 2292)
FossilOrigin-Name: ab8dbcf563b9069ce2049877bba69e5057f5b727
2005-01-30 22:10:00 +00:00
danielk1977 142bdf4051 Respect collation sequences in views. Ticket #1088. (CVS 2291)
FossilOrigin-Name: 9843c0dd795ceda3c260986f95b101a0cbc7cf64
2005-01-30 11:11:44 +00:00
danielk1977 6c18b6e0f4 Have the optimization introduced in (2170) deal with OP_NullRow as well as OP_Column and OP_Recno. Fix for #1086. (CVS 2290)
FossilOrigin-Name: 356d31e03fe856642c5637f5ea5665947ff681fc
2005-01-30 09:17:58 +00:00
danielk1977 0fa388f685 Update to test files to support builds with OMIT macros defined. (CVS 2289)
FossilOrigin-Name: 808e16a7dda048c214df24170da282087042ee3a
2005-01-29 09:14:05 +00:00
danielk1977 494fa66d19 Fix a test bug causing a segfault in bind.test. (CVS 2288)
FossilOrigin-Name: a8b921d45ec9ef4d16ef7b5bf09aabaf02ebc70b
2005-01-29 09:00:49 +00:00
danielk1977 f7c9bfead4 Update ioerr.test to be more deterministic. (CVS 2287)
FossilOrigin-Name: d0b16bae6555f723400821b22916b66609a26b9c
2005-01-29 08:36:45 +00:00
danielk1977 b3bce66232 Modify sub-query handling. Tickets #1083 and #1084. (CVS 2286)
FossilOrigin-Name: b1b50f315873a8614920d1e3af4a07fb29a7ff6a
2005-01-29 08:32:43 +00:00
danielk1977 c9ec413a08 Modification to schema.test so that it works with SQLITE_OMIT_TRIGGER and SQLITE_OMIT_UTF16 defined. (CVS 2285)
FossilOrigin-Name: 95ecb2745f3fc69d370fc3961800db56297acb68
2005-01-29 01:54:18 +00:00
drh b659e9bf7a Make sure the #include of "sqliteInt.h" always comes first in C source files. (CVS 2284)
FossilOrigin-Name: 522c094f799220468780acb77731edb715bf5e3c
2005-01-28 01:29:08 +00:00
danielk1977 e63739a868 Fix a warning introduced by (2280). (CVS 2283)
FossilOrigin-Name: dc1b8106c4ce0ab378ee26324df4537ffe68a940
2005-01-27 00:33:37 +00:00
drh 52f159e040 More changes to improve propagation of SQLITE_CORRUPT errors. (CVS 2282)
FossilOrigin-Name: e4b5c16858db3b17a13cb572896bfd3dc08b88c1
2005-01-27 00:33:21 +00:00
danielk1977 81e9674ba6 Test that it is ok to execute ALTER TABLE immediately after opening a database connection. (CVS 2281)
FossilOrigin-Name: 1d5ebb1146cc6e59d8b419b3fa4796552111606d
2005-01-27 00:30:52 +00:00
danielk1977 33a5edc3a4 Have REINDEX handle missing collation sequences correctly. (CVS 2280)
FossilOrigin-Name: 1c1904f44310fa0e327d8f0a77f1cf97599b630a
2005-01-27 00:22:02 +00:00
drh 536065afef Propagate detected database corruption up through the call stack. (CVS 2279)
FossilOrigin-Name: 2c54aba5ba781f4da1f14ed7a3986b6dc17728d7
2005-01-26 21:55:31 +00:00
drh 5742b63e4a An optimization to sqlite3VdbeSerialType(). (CVS 2278)
FossilOrigin-Name: db36773830cc81c38b78d1776a495d49475523be
2005-01-26 17:47:02 +00:00
danielk1977 f87d01abe9 Add an entry to faq.tcl regarding SQLITE_SCHEMA errors. (CVS 2277)
FossilOrigin-Name: 12defe8cd6a0d7434c8f74b88169155d47299079
2005-01-26 10:39:58 +00:00
danielk1977 e257300f2e Allow GROUP BY on non-aggregate queries. Ticket #1064 (CVS 2276)
FossilOrigin-Name: 0642d3e3d6636a5f922f75c05252c9c1372d3936
2005-01-26 03:58:35 +00:00
danielk1977 9636c4e102 Prevent collation sequences and user functions from being deleted or changed while SQL statements are executing. (CVS 2275)
FossilOrigin-Name: cabab62bc10568d435806a7059fad7274f0dd4c8
2005-01-25 04:27:54 +00:00
danielk1977 86c4948198 Clarify documentation of DEFAULT CURRENT_TIME etc. (version 3.1.0 and greater only). (CVS 2274)
FossilOrigin-Name: 557eb2ec9d825c0a2830d3355d0d27b4b5937de2
2005-01-24 23:27:31 +00:00
danielk1977 bfb9e35b30 More test cases to do with invalidating precompiled statements. (CVS 2273)
FossilOrigin-Name: b243681a0e328ee0bbf1140abfb60d65d2102ad5
2005-01-24 13:03:32 +00:00
drh 190765c470 Use the cache with loading a large table in select2-2.0. (CVS 2272)
FossilOrigin-Name: bd65b1805c116a9073a01164d77e2bfd4ab3b447
2005-01-24 12:46:14 +00:00
danielk1977 a21c6b6fe0 Modifications and bugfixes so that the test suite passes with the TCL statement cache turned on. (CVS 2271)
FossilOrigin-Name: d5233e0747789dea04d35a8350b408321d23a64d
2005-01-24 10:25:59 +00:00
drh d5a71b5de3 Flush the TCL statement cache before each lock_status pragma. (CVS 2270)
FossilOrigin-Name: 8beae3ff8cbe23f20eb242187edbdb72133a24c3
2005-01-24 01:38:32 +00:00
drh fb7e7651ca Change the TCL interface so that it can cache VMs and reuse them without
recompiling.  But for now leave the cache turned off by default. (CVS 2269)

FossilOrigin-Name: 8db6bfef52c1f35afdb8b60cba34f6807a5917f4
2005-01-24 00:28:42 +00:00
danielk1977 4af00c6cee Modification to shell.c to avoid a compiler warning on some compilers. (CVS 2268)
FossilOrigin-Name: 0778383b6f9e6f58202ca20e74b399f8dce90ec4
2005-01-23 23:43:21 +00:00
danielk1977 940fac9dc5 Minor changes to avoid warnings on some compilers. (CVS 2267)
FossilOrigin-Name: 4daf1d1f9d4d32397d785d660394c5579c296b1f
2005-01-23 22:41:37 +00:00
drh f4d173ae14 Fix a bug in change counting that comes up when sqlite3_finalize() is
called right after sqlite3_reset(). (CVS 2266)

FossilOrigin-Name: 1a64295e055d083539e05f069df6f1bea12e14b2
2005-01-23 19:04:42 +00:00
drh 178286b5df ATTACH and DETACH cause prepared statements to expire.
sqlite3_finalize() can now be called right after sqlite3_reset(). (CVS 2265)

FossilOrigin-Name: 6c631b86e5e166f650d3f7d53c773aa859391c2b
2005-01-23 13:14:55 +00:00
danielk1977 32554c10d0 Test script changes: Bug fix and cleanup on ioerr tests. Also, don't use TCL "file copy" command on windows. (CVS 2264)
FossilOrigin-Name: 764b55adb5dff944db36d0d19ce5e7cc758b3a9e
2005-01-22 03:39:39 +00:00
drh d89bd007ba Add the experimental sqlite3_expired() API. (CVS 2263)
FossilOrigin-Name: df648d50c0696cf7ada2fe5973d285b494891964
2005-01-22 03:03:54 +00:00
drh 52370e2c95 Add <stddef.h> to sqliteInt.h. (CVS 2262)
FossilOrigin-Name: fede252d19cce6a88f6baff3362b057ab3b8af4b
2005-01-21 21:31:40 +00:00
drh 1ba1e6e0b9 More documentation changes. Allow SQLITE_DEFAULT_CACHE_SIZE to set the
default cache size for the pager at compile-time. (CVS 2261)

FossilOrigin-Name: 2ddb6748751c0135a42e6d0bcc303d06d8e17cf3
2005-01-21 21:22:52 +00:00
drh 80fc58bf99 Version 3.1.0 (alpha) (CVS 2260)
FossilOrigin-Name: 45094abe38c3d35b0528fc28503aff604e9087f8
2005-01-21 18:28:55 +00:00
drh e425464be5 Documentation updates prior to 3.1.0. (CVS 2259)
FossilOrigin-Name: fc4f1f13d053f861b6be0ceba29bd9e62554252f
2005-01-21 18:19:27 +00:00
drh 842b864118 Initialize the random number generator from /dev/urandom, if available. (CVS 2258)
FossilOrigin-Name: aab8e7f8d81ffa786d5fae5a13963c6e58a8eefc
2005-01-21 17:53:17 +00:00
drh 0602c2e4a5 Change to mkopcodeh.awk to accomodate windows systems. (CVS 2257)
FossilOrigin-Name: 39786aa894d620480661ed8867961f9f1ef33e40
2005-01-21 17:07:22 +00:00
drh 54a83b4d5a Update change log for version 3.1.0. (CVS 2256)
FossilOrigin-Name: 4d9b858746084c2636ba618108775b9be2eff0a5
2005-01-21 17:03:50 +00:00
drh 7bf5661068 Final preparations for the 3.1.0 alpha release. (CVS 2255)
FossilOrigin-Name: 17122c7e8e9cae36f1ffa7b42bd69d702980ac6a
2005-01-21 15:52:32 +00:00
danielk1977 576ec6b32a Improve test coverage for minimum feature builds. (CVS 2254)
FossilOrigin-Name: 9c4d0e13e8c5f3fc4d7fd8f495898372293f7fad
2005-01-21 11:55:25 +00:00
danielk1977 93758c8dcc Exclude a few more lines of code using OMIT macros. (CVS 2253)
FossilOrigin-Name: c6fc49e61033419e78b6b10638d57f4942087961
2005-01-21 08:13:14 +00:00
danielk1977 e61b9f4f3c Modify test scripts to work when SQLITE_OMIT_SUBQUERY (but no other OMIT macros) is defined. (CVS 2252)
FossilOrigin-Name: d4e19efcef68d834c55c7d496cdb3696d63a31a2
2005-01-21 04:25:47 +00:00
danielk1977 3e8c37e7f8 Modify test scripts to work when SQLITE_OMIT_SUBQUERY (along with other OMIT macros) is defined. (CVS 2251)
FossilOrigin-Name: bb0254ab14417f0ab40f10f37cb63a60507f070a
2005-01-21 03:12:14 +00:00
drh 801845fb2d Add a new test file for subqueries. (CVS 2250)
FossilOrigin-Name: de8ee3a29e1aafcfa05841cb44da0a05f0579596
2005-01-21 02:34:44 +00:00
danielk1977 83715c3edd Change the implementation of ALTER TABLE so that it does not use the IN() operattor. (CVS 2249)
FossilOrigin-Name: 06887afb323fa1fb6988a136f96a456467cf7b2f
2005-01-21 00:44:22 +00:00
drh 4eec4c1b0c Fix a segfault that occurs on a corrupt database. (CVS 2248)
FossilOrigin-Name: d1166472fd17960eb3016f3d5d3bf44afc9f5bc8
2005-01-21 00:22:37 +00:00
drh 279d477939 Fix comment typo in mkopcodec.awk. (CVS 2247)
FossilOrigin-Name: 6177148260c5e3e28df6ea1c486ba3642a745a01
2005-01-20 23:23:29 +00:00
drh fe2093d73e Bug fixes and enhancements entered while on jury recess. (CVS 2246)
FossilOrigin-Name: 38401dfbd5e3b50dd4e7a11562a7770347cebdf4
2005-01-20 22:48:47 +00:00
drh 51522cd34a Added the SQLITE_OMIT_SUBQUERY compile-time option and the EXISTS operator.
Regression tests are currently failing with an assertion fault. (CVS 2245)

FossilOrigin-Name: d30fdf0f2c24cb74b48fab9b83fba4e4b2fe878a
2005-01-20 13:36:19 +00:00
danielk1977 5338a5f74d Remove a few more lines of code when SQLITE_OMIT_** macros are defined. (CVS 2244)
FossilOrigin-Name: 417bbba93ad7ed5c03d9db6afc12e170155bd152
2005-01-20 13:03:10 +00:00
danielk1977 b84f96f854 Extend the influence of a couple of SQLITE_OMIT_** macros a little bit. (CVS 2243)
FossilOrigin-Name: 5b1a9bf6aa5a5c466b88f649e322e81b8466851f
2005-01-20 11:32:23 +00:00
danielk1977 1ad7f64aac Changes so that crash.test works when SQLITE_OMIT_PAGER_PRAGMAS is defined. (CVS 2242)
FossilOrigin-Name: f0add0a60e0afb833202e42cdba97bafe6a59dfc
2005-01-20 05:24:32 +00:00
danielk1977 4489f9bdec Fix some test scripts so that they work with a minimal build configuration. (CVS 2241)
FossilOrigin-Name: d267fb3ca3f31ee138c9613cb84e873ede7f141a
2005-01-20 02:17:01 +00:00
drh 1bd3644f27 Turn SQLITE_OMIT_CURSOR on by default. (CVS 2240)
FossilOrigin-Name: 2d3ab1ab5ae08fe21f4662b171f04362c1326eb0
2005-01-20 02:14:30 +00:00
drh 3119bc421a Expression generator bug fix. (CVS 2239)
FossilOrigin-Name: 39cf97a902523b1e3953da8fca6983119700d682
2005-01-20 01:51:25 +00:00
danielk1977 6d32959693 Minor fix for sqlite3_clear_bindings(). (CVS 2238)
FossilOrigin-Name: ff5b338cfbd4a957c8ea5e72d6340df25be68a6f
2005-01-20 01:17:44 +00:00
danielk1977 600dd0ba33 Add the experimental sqlite3_sleep() and sqlite3_clear_bindings() APIs. (CVS 2237)
FossilOrigin-Name: 9480209e8600bf411975b3950c407d60c800e5c6
2005-01-20 01:14:23 +00:00
drh 1398ad3639 Continued refactoring of the name resolution logic and query optimizer. (CVS 2236)
FossilOrigin-Name: d8b2a7e09187564fe66a2b4bf0992c6a017146cf
2005-01-19 23:24:50 +00:00
danielk1977 76b047d957 Another fix along the same lines as (2234) (CVS 2235)
FossilOrigin-Name: 27cf83224c69e661c19f9a09f39bfdae75e3b0a4
2005-01-19 03:52:54 +00:00
danielk1977 ca6707145d A few test cases were failing on windows due to mandatory locking. Omit them on that platform. (CVS 2234)
FossilOrigin-Name: 441316f1af076fef42055d6abe524f2a8c5ced63
2005-01-19 03:47:15 +00:00
drh 030530de9b Make sure USING and NATURAL work on joins even if the columns are renamed
using an AS phrase.  Ticket #523. (CVS 2233)

FossilOrigin-Name: c06add57bf0ce17503181b584ea4197b39b9e538
2005-01-18 17:40:04 +00:00
drh 79d5f63fa2 CREATE TABLE ... AS ... uses short names for columns. Ticket #1036. (CVS 2232)
FossilOrigin-Name: b1d4c42d2be07adda68d31c570ba7cf8b115c3ad
2005-01-18 17:20:10 +00:00
drh 47a6db2bfd Column names coming back from a SELECT are now just the name of the
source column without the "table." prefix. In other words,
"PRAGMA short_column_names=ON" is now the default.
This makes the names of columns behave more like other SQL engines.
The old behavior can be restored by setting "PRAGMA short_column_names=OFF". (CVS 2231)

FossilOrigin-Name: 9295050af1bf2d9d4dc63adc225a2848d67cbe17
2005-01-18 16:02:40 +00:00
drh 9b3187e113 Continue refactoring name resolution. Fix for ticket #1047. (CVS 2230)
FossilOrigin-Name: 88d4834fec7583a9b6400a1ce5b928c1f8a390dd
2005-01-18 14:45:47 +00:00
drh 73b211abed Refinements to the name resolution logic. Change the name of the
keywordhash.c file to keywordhash.h. (CVS 2229)

FossilOrigin-Name: 0142ae6f0004bf18a1c2d8e49c09d2a9a27d6369
2005-01-18 04:00:42 +00:00
drh 626a879a25 Infrastructure changes to handle name resolution differently. This is needed
to fix various long-standing problems with column names in joins.  It will
also make the implementation of correlated subqueries easier. (CVS 2228)

FossilOrigin-Name: 4a7534396a72ccb300303df28798bb2c50293782
2005-01-17 22:08:19 +00:00
danielk1977 3719d7f9c4 Fix a bug reported on the mailing list concerning a conflict between "INSERT INTO ... SELECT" statements and the "SELECT max(x) FROM tbl" optimization. (CVS 2227)
FossilOrigin-Name: 5a9da62ae303800ded99942aed30eadeb3863da3
2005-01-17 08:57:09 +00:00
danielk1977 5558a8a697 Fix some memory leak problems with corrupt.test and auto-vacuum databases. (CVS 2226)
FossilOrigin-Name: 6244252915fa312a6c4d192464023d95aaef4661
2005-01-17 07:53:44 +00:00
drh f10519b45a Add incomplete, preliminary drafts of new documentation. (CVS 2225)
FossilOrigin-Name: a01159e8cb93199763d191b739da2a43ec88aab3
2005-01-17 03:42:52 +00:00
danielk1977 3c9cc8d095 Fix a memory leak that occurs as a result of an IO error. (CVS 2224)
FossilOrigin-Name: 1edfdcbf142b380172a26d094e6e4a3900db8463
2005-01-17 03:40:08 +00:00
danielk1977 fdb7cdb4b1 Change some assert()s that could fail if the database is corrupt to return SQLITE_CORRUPT instead. (CVS 2223)
FossilOrigin-Name: 2d58c0afa769d49c8819ea4982bc20ae39516f97
2005-01-17 02:12:18 +00:00
danielk1977 2683665406 Have sqlite3pager_get() return SQLITE_CORRUPT for a page number greater than 2^31. (CVS 2222)
FossilOrigin-Name: feb49d10e83ecc186024d4e96b64ef92cf876715
2005-01-17 01:33:13 +00:00
drh 615ae553fc Turn on quick-balance by default. (CVS 2221)
FossilOrigin-Name: d0356dee55bd43f361ede1344e90d1ba6b5cde1e
2005-01-16 23:21:00 +00:00
drh 0d477437ac Drop support for MAC OS9. SQLite 3 has never worked for that OS because
the developers do not have access to a machine running it and nobody from
the community has stepped forward to provide a port.  By moving the
os_mac.c file into the attic, we make the lack of support official. (CVS 2220)

FossilOrigin-Name: de9ad673d037f7bfca3a2d439259a63c9ed954db
2005-01-16 20:47:40 +00:00
danielk1977 aac0a38d1f Changes to make sure tests work when SQLITE_DEFAULT_AUTOVACUUM is defined. (CVS 2219)
FossilOrigin-Name: 6237c294d1211d5848bafb1310574e2486a43757
2005-01-16 11:07:06 +00:00
danielk1977 4e17d14c63 Fixes so that compiling and testing works when SQLITE_OMIT_AUTOVACUUM is defined. (CVS 2218)
FossilOrigin-Name: fe548561a0e7a696fd453372f4427cf3e3f19d20
2005-01-16 09:06:33 +00:00
danielk1977 79a40da6d7 Move duplicate code to update pointer-map wrt overflow pages into a function. (CVS 2217)
FossilOrigin-Name: a5c2121410476ee1bf81881fdf5917e3e16f0399
2005-01-16 08:00:01 +00:00
danielk1977 ac11ee6766 Enhance the performance of auto-vacuum databases by reducing the number of pointer-map entries written during tree balancing. Also fix bugs in balance_quick(). (CVS 2216)
FossilOrigin-Name: 0ae29538ccccfc237904cbcfb4507074db0f5905
2005-01-15 12:45:51 +00:00
drh 018d1a4929 Test coverage improvements. (CVS 2215)
FossilOrigin-Name: 92f9d2b2f480fccfa6e8b70a1d19058b92a4ea8f
2005-01-15 01:52:31 +00:00
drh 8b07c7178a Improved test coverage for update.c. (CVS 2214)
FossilOrigin-Name: 3ef95d5fe98e7451f8b87b3f5259163f3e7d0289
2005-01-15 00:40:42 +00:00
drh 39df51b269 Improved coverage for insert.c. (CVS 2213)
FossilOrigin-Name: 997d8afff9b316aef4c5e2127c2207758ff4a703
2005-01-15 00:36:36 +00:00
drh f222e712a4 Add comments to the new balance_quick() routine. (CVS 2212)
FossilOrigin-Name: 183c42eac82b41da7905e44a43913f04acc46ade
2005-01-14 22:55:49 +00:00
danielk1977 ac245ec5af Experimental patch to balance() (use -DSQLITE_BALANCE_QUICK). (CVS 2211)
FossilOrigin-Name: c550d80c25ec88fceb20acabd00c21faa2d552f5
2005-01-14 13:50:11 +00:00
drh d6fe961ef4 Improved test coverage on insert.c. (CVS 2210)
FossilOrigin-Name: c772f75166d55192132e732e8a0ddda5926f00f2
2005-01-14 01:22:00 +00:00
drh 3b93bc8cb1 Need SQLITE_MEMDEBUG instead of SQLITE_DEBUG in tclsqlite.c. (CVS 2209)
FossilOrigin-Name: 6e905270a933fd4c99f6db6707ed79166f6484ee
2005-01-13 23:54:32 +00:00
drh 8d65973d93 Fix a bug in lemon that does not effect SQLite. Ticket #1068. (CVS 2208)
FossilOrigin-Name: 7113b5ed8d51718356ce1cc51896a3070875a7e2
2005-01-13 23:54:06 +00:00
danielk1977 c08d405d2e Tidy up malloc.test a bit. (CVS 2207)
FossilOrigin-Name: 94cf91cc5dc0d656636211d23350a1ec29aced8a
2005-01-13 13:35:57 +00:00
danielk1977 6b77a36abf Fix typo in shell .help. Ticket #1071. (CVS 2206)
FossilOrigin-Name: 2c7a1a1698851914de705a0a942ebaaad5545fbc
2005-01-13 11:10:25 +00:00
danielk1977 aca790ace3 Test cases to improve coverage of pager.c. (CVS 2205)
FossilOrigin-Name: 0428a1480126f7e73dc1e24b6fbfa185d2d83dd3
2005-01-13 11:07:52 +00:00
danielk1977 2c3365493b Fixes to 'configure' build system. Also extra coverage for main.c. (CVS 2204)
FossilOrigin-Name: 8378455f32c3010ccc28181048c746ecb8a9fa67
2005-01-13 02:14:23 +00:00
danielk1977 656152c2e3 Fix a test bug introduce with the previous commit. (CVS 2203)
FossilOrigin-Name: 1c19e8bdca24484fcb9f068b38ebfbce3e24ada5
2005-01-12 13:04:54 +00:00
danielk1977 4397de57ce Tests to improve coverage of main.c. (CVS 2202)
FossilOrigin-Name: 4e28c82adabb58ad9f79ed829734a2ff569a7c05
2005-01-12 12:44:03 +00:00
danielk1977 8b60e0f142 Tests to improve coverage of vdbeaux.c. (CVS 2201)
FossilOrigin-Name: 2b3e21ce2e8126ec2851751546094c3a2c831942
2005-01-12 09:10:39 +00:00
danielk1977 b5402fbf05 Tests to improve coverage of vdbemem.c. (CVS 2200)
FossilOrigin-Name: 319bb4a9064deb062a888fdc31067619c9b749bb
2005-01-12 07:15:04 +00:00
drh c8f9079c61 Fix a bug in tclsqlite.c. (CVS 2199)
FossilOrigin-Name: 50f1e229652610b386745bb39fed45549cc74aa7
2005-01-12 00:08:24 +00:00
drh ac931eb93b Fix for ticket #1062: Correctly handle redundant terms in a WHERE clause. (CVS 2198)
FossilOrigin-Name: 1bee1bb91d39ff8a33efe662b6cab6dbd2d50e3c
2005-01-11 18:13:56 +00:00
drh a0d1f663e1 Allow '$' in the middle of identifiers. Ticket #1066. This is an
experimental change.  It might be backed out at a later date. (CVS 2197)

FossilOrigin-Name: 00a352ea79e0e1e855282c54d0e470161215f25e
2005-01-11 17:59:47 +00:00
drh 48e5aa2769 Test coverage improvements on tokenize.c. (CVS 2196)
FossilOrigin-Name: 5767850ccadb3b53d14bca547e50f65de1d3092e
2005-01-11 17:46:41 +00:00
drh c5cdca613a Improved test coverage for vdbeaux.c. (CVS 2195)
FossilOrigin-Name: 3f46cd7767cf7c48dd1de7ae1c4104d6d1a609be
2005-01-11 16:54:14 +00:00
drh cacb208e4e Improved test coverage for util.c. (CVS 2194)
FossilOrigin-Name: ad451a2ddc7993035768f2801d590311807f4397
2005-01-11 15:28:33 +00:00
danielk1977 01427a6214 Test cases to improve coverage of vdbe.c. (CVS 2193)
FossilOrigin-Name: a6b45722071bde543c4ea28a432339d8708a5cac
2005-01-11 13:02:33 +00:00
danielk1977 1400b52838 Remove a C++ style comment that went in with the previous commit. (CVS 2192)
FossilOrigin-Name: ce8e4e885a46cec35b64a81925eb330048ea5cbb
2005-01-11 11:08:22 +00:00
danielk1977 62e05d8feb Test cases to improve coverage of btree.c (and minor bugfixes). (CVS 2191)
FossilOrigin-Name: a37e0108dea4896d8aaf84cc590b5cecbdefee6c
2005-01-11 10:25:06 +00:00
danielk1977 2812956b18 Test cases to improve coverage of btree.c (and minor bugfixes). (CVS 2190)
FossilOrigin-Name: 8ced491588764b1e1066787d0abf3cde8b60970b
2005-01-11 10:25:06 +00:00
danielk1977 7701e817ba Extra test cases to improve coverage of btree.c (CVS 2189)
FossilOrigin-Name: a461988661368bce799ef3d498a18e88559e14c7
2005-01-10 12:59:51 +00:00
danielk1977 307a777932 Update some documentation for version 3.1. (CVS 2188)
FossilOrigin-Name: 5b7a5a4d69be425163135698d889797d15f56492
2005-01-10 06:39:56 +00:00
danielk1977 cc6bd38380 Fix an assertion failure due to interaction between the count_changes pragma and triggers. (CVS 2187)
FossilOrigin-Name: 6c7bec1b3aee0287e30f43c1d6a7b67b1c47e774
2005-01-10 02:48:49 +00:00
drh 49766d6cd0 Tcl interface does as sqlite3 or as sqlite. A compile-time option allows
duel linking.  Also fix a bug in the pragma change from earlier today. (CVS 2186)

FossilOrigin-Name: ad10953799f3aa15fde41cbbd5911a3b56c326ec
2005-01-08 18:42:28 +00:00
drh 268283bc7f Fixes to the temp_store_directory pragma. (CVS 2185)
FossilOrigin-Name: 0a90eaf398aa4a689cd8326cd017951513ca748a
2005-01-08 15:44:25 +00:00
drh 4b238dfb80 Fix a comment. (CVS 2184)
FossilOrigin-Name: 26fbac8f031b305fe98add4422ab606ed116844a
2005-01-08 15:43:18 +00:00
danielk1977 42741be968 Fix a problem with auto-vacuum databases and the VACUUM command. Also add "pages read" and "pages written" statistics to the pager layer. (CVS 2183)
FossilOrigin-Name: fb3bf68d0e83b463c7e2f95b4502ba6f8158c074
2005-01-08 12:42:39 +00:00
danielk1977 59adfaa6ce Minor test script changes to allow all.test to run when SQLITE_DEFAULT_AUTOVACUUM=1 is defined. (CVS 2182)
FossilOrigin-Name: 5023b1dba2e61bb10d1b488874e3d3eea3973145
2005-01-08 02:35:44 +00:00
danielk1977 d9c847dcd1 Reset the temp_store_directory each iteration of tests in all.test. (CVS 2181)
FossilOrigin-Name: 7373a5d4cf2db921b33132c736ad62ab702d7cde
2005-01-07 10:42:48 +00:00
danielk1977 a3ad5e7d9f Fix a read of invalid memory that could occur in btree.c. (CVS 2180)
FossilOrigin-Name: 929745c1833e7f4323884a1bc0c632f5b319da35
2005-01-07 08:56:44 +00:00
danielk1977 dcd7c471ce Remove incorrect assert() and add extra option to account for non-standard 'sort' program in some linux versions. (CVS 2179)
FossilOrigin-Name: bf14387697459d8d348a35ca50e2ee9407dcf1e1
2005-01-07 01:56:17 +00:00
tpoindex 9d9f76c0b6 add --enable-debug to configure options, controls -DNDEBUG flag (CVS 2178)
FossilOrigin-Name: 9d674d1dc09f72c64ef7f37cd9838c7a9c50b746
2005-01-03 21:28:56 +00:00
tpoindex 7a9b161587 add comment that table is accessed by primary key (CVS 2177)
FossilOrigin-Name: 707690c5f2e1340bbbb4cb06e6b2b76a2a3b5f0d
2005-01-03 18:13:18 +00:00
drh 49d642dba8 Allow GROUP BY on aggregate queries only. Ticket #1039. (CVS 2176)
FossilOrigin-Name: 8ef2c644ebce851d7a3e0db3b2266fc2519485cd
2005-01-03 02:26:54 +00:00
drh c89b91beee Fix typos in comments in test code.
(Oops.  This check-in also picked up some unrelated
changes to documentation.) (CVS 2175)

FossilOrigin-Name: 586acc85b170f84d6e0dbd2e293da19551242f5a
2005-01-03 01:32:59 +00:00
drh 7465a80899 Fix a typo in a comment. No code changes. Ticket #1052. (CVS 2174)
FossilOrigin-Name: 9fb1402f0835b214c9174866653e95416b32f860
2005-01-03 01:28:51 +00:00
drh acf3b988f6 Fix comment typos. no code changes. (CVS 2173)
FossilOrigin-Name: 4165217e5114f5377f0823c63ff2aba879927ce7
2005-01-03 01:27:18 +00:00
drh e6f85e71e9 Fix ticket #1046 by removing code and simplifying the query optimizer.
Remarkably, this simplification also makes the optimizer do a better job.
Ticket #1051 was fixed as a side-effect. (CVS 2172)

FossilOrigin-Name: 5fd1f4711885e3dd6fb2c2700287f78bb0ea178a
2004-12-25 01:03:13 +00:00
tpoindex 9a09a3caed Add PRAGMA 'temp_store_directory'. Added os_*.c function
sqlite3OsIsDirWritable(), split pragma.c changeTempStorage() function into
invalidateTempStorage(). (CVS 2171)

FossilOrigin-Name: 772e22cbd69463be41c2e73b4fd4eb33946193c4
2004-12-20 19:01:32 +00:00
drh 9012bcbc0a The optimizer now uses only the index and ignores the table if it can get
away with doing so, thus saving a single BTree search per row of result.
This could potentially double the speed of certain queries.  The
code passes all regression tests but new tests to exercise the new
functionality are yet to be added. (CVS 2170)

FossilOrigin-Name: e5aa489453bf31126da6473ef93c89ec27935cde
2004-12-19 00:11:35 +00:00
drh 51669863a8 Improvements to the query optimizer. This is a work in progress. (CVS 2169)
FossilOrigin-Name: 9b86993ff721b577b920c7c67fb41d3d4355fe88
2004-12-18 18:40:26 +00:00
drh 9ee3cdcba7 Fix a C++-ism in the previous change to tclsqlite.c. (CVS 2168)
FossilOrigin-Name: b49b8fdd11a5a4aac15ceda58a28bbc852f6f239
2004-12-17 20:48:06 +00:00
tpoindex 1067fe1104 Add 'copy' method for tcl interface. Behaves similar to shell .import or COPY statment in 2.x. (CVS 2167)
FossilOrigin-Name: a9311d9df054a91e231d4e4332df0d661675744d
2004-12-17 15:41:11 +00:00
drh be5fd4906d Make sure LIMITs are handled correctly on UNION operators. Ticket #1035. (CVS 2166)
FossilOrigin-Name: ece0085f86bd715c95a6c59f41b4a97de2555faf
2004-12-16 21:09:16 +00:00
drh 23bf66d6af Minor code and comment cleanup. (CVS 2165)
FossilOrigin-Name: d012628a78edaa8d3cb438a7dcc3770b2eb8588b
2004-12-14 03:34:34 +00:00
drh 6a8903c3fc Factor the test for zName==NULL out of the loop. Ticket #1032. (CVS 2164)
FossilOrigin-Name: 7f38f67c7b427ea46db2e95fdfadc1aae064c704
2004-12-10 18:00:04 +00:00
drh daa28ff326 Fix a problem with the automatic generation of the opcode name table. (CVS 2163)
FossilOrigin-Name: 9eefabc92d3924bcaa2ae0f425fe5635824c64ec
2004-12-10 17:17:18 +00:00
drh 93468367fe Back out the USE_TCL_STUBS changes because it breaks the build. I think
the strategy needs to be to abandon libtool and use tcl.m4 to figure out how
to build our own shared libraries.  Ticket #1034. (CVS 2162)

FossilOrigin-Name: 7f4679b92ec764bf5c11a0f19876073a94742092
2004-12-10 03:08:12 +00:00
drh b571b457fa Improvements to the --help option to configure. Ticket #1033. (CVS 2161)
FossilOrigin-Name: 3032cc2b88800e7226e6fab8f5ca7a7e8dbac36e
2004-12-10 02:20:27 +00:00
drh 8671e6d784 Add a -DUSE_TCL_STUBS to the standard Makefile. This might help with
ticket #1034.  Or maybe not. (CVS 2160)

FossilOrigin-Name: 4c30c373ef674505d275e4a1e8868c9f72a3a1ef
2004-12-10 02:08:41 +00:00
drh 10fb11da9e Enhance sqlite3_bind_parameter_index so that is does not segfault if
you call it incorrectly by passing NULL in place of the parameter name.
Ticket #1032. (CVS 2159)

FossilOrigin-Name: bf81aabff1303b66f12d28b730d19b7cbdb2de6a
2004-12-09 18:29:13 +00:00
drh 2530378003 Only evaluate expressions once for UPDATE and INSERT statements that
have BEFORE triggers.  Fix for ticket #980. (CVS 2158)

FossilOrigin-Name: 4852186aca3be6ea40069b6831079197e5fa757a
2004-12-07 15:41:48 +00:00
drh dca7684141 Simplify the trigger logic for DELETE, INSERT, and UPDATE. (CVS 2157)
FossilOrigin-Name: 8e164ab27771aced9a592ea4b7c27e9f184181a5
2004-12-07 14:06:13 +00:00
drh 81db88e630 Remove the unused sqlite3_context.isStep element. (CVS 2156)
FossilOrigin-Name: 7b20f2b71f679e72b6cb3b78ccb31b4e7c4bd48b
2004-12-07 12:29:17 +00:00
drh 32c0d4f17b Updates to API documentation and comments in sqlite3.h. (CVS 2155)
FossilOrigin-Name: 46584348f3cc10c0c6e9ba42110a6c03caf1497e
2004-12-07 02:14:51 +00:00
drh 61212b69c1 Get the build of sqlite3_analyzer working with Makefile.in. (CVS 2154)
FossilOrigin-Name: f7415a0d6433980ff6c25cf2238f5e9881c38873
2004-12-02 20:17:00 +00:00
drh 4b2266ae4c Disable the cursors. "make install" now builds and installs a TCL package
for SQLite if TCL is installed on the system. (CVS 2153)

FossilOrigin-Name: d75014c299496a02f6850545beb0ab669802bf87
2004-11-27 15:52:16 +00:00
drh 7b5717e1a1 The configure script now automatically detects tclConfig.sh and builds the
Tcl extension only if tclConfig.sh is present.  The Tcl extension can be
disabled using --disable-tcl. (CVS 2152)

FossilOrigin-Name: 12424bef7770f3d256d386251477a1da78be2bde
2004-11-25 13:50:01 +00:00
drh 3b7b78b312 Fix a memory leak in pager.c. (CVS 2151)
FossilOrigin-Name: 0ad4ed87ce1112663ca94805dea167372485396a
2004-11-24 01:16:43 +00:00
drh 251b067ccd fulltest runs now, but still finds a memory leak. (CVS 2150)
FossilOrigin-Name: 5944d51e6c164270301b57e4351add4cb6137be6
2004-11-23 22:16:39 +00:00
danielk1977 8b840013da Fix a memory leak in ALTER TABLE. (CVS 2149)
FossilOrigin-Name: ba71716ce21ae99b10b2d0b61092497872770ef7
2004-11-23 16:31:16 +00:00
danielk1977 1d54df88e3 Add authorization callbacks for REINDEX. (CVS 2148)
FossilOrigin-Name: 9f0d744ee4d99f44e88c6f799821791c3b5f31b6
2004-11-23 15:41:16 +00:00
danielk1977 78583d2440 Include the 'FOR' keyword in builds that include cursors but not triggers. (CVS 2147)
FossilOrigin-Name: 3053d82d7192ff77ff5f1fee143d784d5d51772a
2004-11-23 12:24:13 +00:00
danielk1977 11cf9fbcf2 Make the test suite pass when SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS is defined. (CVS 2146)
FossilOrigin-Name: ff20c623c64d67b19c13c4fd3afe8ea137bb8a0b
2004-11-23 11:16:42 +00:00
danielk1977 c7b4a44cda Ensure the test suite runs with SQLITE_OMIT_PAGER_PRAGMAS defined. (CVS 2145)
FossilOrigin-Name: 2d1f0b923d3c5a669959a03a4344fddcb69c7a98
2004-11-23 10:52:51 +00:00
danielk1977 27188fb5f0 Have tests pass when SQLITE_OMIT_SCHEMA_PRAGMAS is defined. (CVS 2144)
FossilOrigin-Name: 6ccb589bd94fc7d33e07caa39e011c3628563e9b
2004-11-23 10:13:03 +00:00
danielk1977 ae82558bd0 Fix a bug involving balance_shallow() and the sqlite_master table. (CVS 2143)
FossilOrigin-Name: 557be3ff5b1c46a3f3836ea3a9d9dede5dc46998
2004-11-23 09:06:55 +00:00
drh e4e7207248 More work on the implementation of cursors, but they are still not
functioning. (CVS 2142)

FossilOrigin-Name: 8b61d1ae1ca469b80f2b344d550c3b363448b193
2004-11-23 01:47:30 +00:00
drh b6c29897eb Add initial infrastructure for cursors. In where.c, optimize out clauses
of the form "ORDER BY rowid" if a table scan is being performed.  Do a
reverse table scan if "ORDER BY rowid DESC" is present. (CVS 2141)

FossilOrigin-Name: fc8c1393c86017a816beb52725b68af3b973f979
2004-11-22 19:12:19 +00:00
drh 8237d45ed8 Fix a long-standing bug in btree.c in the sqlite3BtreePrevious() routine.
The problem has gone unnoticed before now because it only occurs when you
use the OP_Prev opcode on a B+Tree. (CVS 2140)

FossilOrigin-Name: 3d2536c479c943b3a55047898068625f91c872ae
2004-11-22 19:07:09 +00:00
danielk1977 d8702b4d40 Fix a couple of extra test-suite problems with SQLITE_OMIT_VIEW. (CVS 2139)
FossilOrigin-Name: 894c142d115b31506b6b8212e1b850ea28c4ca11
2004-11-22 15:05:58 +00:00
danielk1977 27c774388a Ensure tests pass when SQLITE_OMIT_COMPOUND_SELECT is defined. (CVS 2138)
FossilOrigin-Name: 007be591b7829f9ff38e4b14ba5a5043796c2ff3
2004-11-22 13:35:41 +00:00
danielk1977 81650dc6c8 Ensure tests pass when SQLITE_OMIT_TRIGGER is defined. (CVS 2137)
FossilOrigin-Name: 53894988ac1ad44ec65a1e1c420e2a26eb4c2efd
2004-11-22 11:51:13 +00:00
danielk1977 125254784d Fix a test-suite error made in check-in (2132) (CVS 2136)
FossilOrigin-Name: 48c7eb7fb9fbc2166aaa7dbdb7c7e92c68f8eff3
2004-11-22 10:20:13 +00:00
danielk1977 aecc8ba904 Back out changes allowing writes to tables that have open cursors. (CVS 2135)
FossilOrigin-Name: ec6b48f4b2abea231b050a8a9d18c2ab12579c8e
2004-11-22 10:02:23 +00:00
danielk1977 12b13002ce Back out changes allowing writes to tables that have open cursors. (CVS 2134)
FossilOrigin-Name: af635cab8a1d761c469e35208dda08a29f0964a1
2004-11-22 10:02:21 +00:00
danielk1977 299b187d76 Back out changes allowing writes to tables that have open cursors. (CVS 2133)
FossilOrigin-Name: 91acd87e52509a8f78894d0f4b625b54376cac21
2004-11-22 10:02:10 +00:00
danielk1977 0fa8ddbdec Modify test suite to work when SQLITE_OMIT_VIEW is defined. (CVS 2132)
FossilOrigin-Name: 711e8d7695dfc74b3f1ee00591dcdda2cd7fc7d5
2004-11-22 08:43:32 +00:00
danielk1977 03aded4924 Have tests pass when SQLITE_OMIT_MEMORYDB is defined. (CVS 2131)
FossilOrigin-Name: 9df837c03939cdcb31856ac17b2425a6dd92d7b2
2004-11-22 05:26:27 +00:00
danielk1977 215e64da5e Fix auth.test to work when SQLITE_OMIT_ALTERTABLE is defined. (CVS 2130)
FossilOrigin-Name: 27a8379b54d6a1169b89e540ba44f4f94d006fb7
2004-11-22 03:34:21 +00:00
drh f856582562 AUTOINCREMENT documentation added. Improvements to lang.html. (CVS 2129)
FossilOrigin-Name: ac72a1d5518f7b505ae2a1bd3be3d71db461ae7e
2004-11-21 01:02:00 +00:00
drh 60404f46c1 Fix to the documentation on sqlite3_create_function. Ticket #899. (CVS 2128)
FossilOrigin-Name: 4ab1d012f0f365c46bcabe67eace891eeaa78d70
2004-11-20 21:02:13 +00:00
drh b9ecf6fa8e Avoid excess heap usage when copying expressions. Ticket #979. (CVS 2127)
FossilOrigin-Name: d10560c75244daebe55da5630ef7e7b84ba7f77a
2004-11-20 20:44:13 +00:00
drh 42cac6dacb Correct use of usableSize versus pageSize in btree.c. Ticket #1010. (CVS 2125)
FossilOrigin-Name: 5a4013ec9cabb2c933cbf45495f5d1e8b3b20da5
2004-11-20 20:31:11 +00:00
drh b08153d0fb Better error message on an SQLITE_RANGE error. Ticket #991. (CVS 2124)
FossilOrigin-Name: accd432e4d9626353e555e63298fb7a56a41e53d
2004-11-20 20:18:55 +00:00
drh bf128941d0 Rename source file sqlite.1 as sqlite3.1. Ticket #995. (CVS 2123)
FossilOrigin-Name: 297559c6d1a8c1172bb0c35cf538f6f2958c7820
2004-11-20 19:55:18 +00:00
drh 6c90fecc96 Omit the maximum loop count on the random name chooser in the VACUUM command.
Add a comment to explain why this is safe and does not result in an
infinite loop.  Ticket #1009. (CVS 2122)

FossilOrigin-Name: 1241086f23a2ef7aef85139817f0c1b90140481d
2004-11-20 19:18:55 +00:00
drh 4693423b09 Rig the sqliteMalloc() routine so that we can make it fail multiple times
in a row.  Modify the malloc.test procedure to make malloc fail in this
way and verify that the failures are still handled correctly. (CVS 2121)

FossilOrigin-Name: 519bc9d9975bbdb4ba056799534d5c465e0cd042
2004-11-20 19:18:00 +00:00
drh 73c42a1386 Fix segfaults that might occur after a malloc failure. (CVS 2119)
FossilOrigin-Name: 368774487e7a0266465f5a1c2701c9b14573d26c
2004-11-20 18:13:10 +00:00
danielk1977 f9c852bfd5 Documentation for REINDEX and ALTER TABLE commands. (CVS 2118)
FossilOrigin-Name: aceaa5f6e97c93962f5d6d14de8a490efa619db4
2004-11-20 08:17:18 +00:00
danielk1977 2097e949f6 Add a documentation page for compilation options. Still some work to go. (CVS 2117)
FossilOrigin-Name: 5efa2d2a602c3b7249c4e6701e97b16b5ad0280d
2004-11-20 06:05:56 +00:00
danielk1977 cd45ab2d6f Split up the lang.html page into a seperate page for each command. (CVS 2116)
FossilOrigin-Name: ea315668e5833befe296fc94c67f914061d2ffb2
2004-11-19 11:59:23 +00:00
danielk1977 023f41762c Ensure ALTER TABLE respects the system table convention - "sqlite_*". (CVS 2115)
FossilOrigin-Name: f635b6aae661ac85eec49b197f3bb4b85172a457
2004-11-19 08:41:34 +00:00
danielk1977 aacd732b11 Update the sqlite_sequence table when a table is renamed with ALTER_TABLE. (CVS 2114)
FossilOrigin-Name: 6e971868808e3c3f77fa521de626f1510ba9644a
2004-11-19 08:02:14 +00:00
danielk1977 4d36b81ea0 When dropping a table, update the sqlite_sequence table first, as auto-vacuum mode may need to move sqlite_sequence when the btree table is dropped. (CVS 2113)
FossilOrigin-Name: 0514107bff970ab1e5ce96c8b1fa13dcbf75cb71
2004-11-19 07:07:30 +00:00
danielk1977 343e92610e Fix bugs in ALTER TABLE related to (a) whitespace in table defn, (b) temp triggers. (CVS 2112)
FossilOrigin-Name: 1fd8e835a3656799c23f4ef6ea1311fecf5a15cb
2004-11-19 05:14:54 +00:00
danielk1977 d641d646ff Handle triggers correctly in ALTER TABLE. (CVS 2111)
FossilOrigin-Name: c61b7de107cea76b561d0d6cd90c752b62c5df95
2004-11-18 15:44:29 +00:00
drh 20fc0887f5 Speed improvement on the LIKE command. (CVS 2110)
FossilOrigin-Name: 85d56beb7494ce63e70ab1ffc3797c2ee4c36749
2004-11-18 13:49:25 +00:00
drh e854c5607b Fix an obsolete comment that resulted in incorrect documentation.
Ticket #1003. (CVS 2109)

FossilOrigin-Name: c93a9e18d2bf53690f577a901e0defd8a449d56a
2004-11-18 02:10:55 +00:00
drh 4f1f8705f6 Clarify the documentation of the sqlite3_create_function API.
Ticket #1004. (CVS 2108)

FossilOrigin-Name: ae45ad863b0854b96da31321c500e3168ef103ad
2004-11-18 02:04:09 +00:00
danielk1977 7c6303c042 Add the ESCAPE clause to the LIKE operator. Not fully tested yet. (CVS 2107)
FossilOrigin-Name: 49268c2b7a84c4c618214dac8bef0f541440fe6b
2004-11-17 16:41:29 +00:00
danielk1977 c7dc75334f Extra tests and resulting bugfixes for btree cursors. (CVS 2106)
FossilOrigin-Name: e1530854c9004c25f5ffa21f9cfb9c44c83cc7f0
2004-11-17 10:22:03 +00:00
drh 602479eae8 Clarify the LIMIT clause in the documentation. Ticket #1002. (CVS 2105)
FossilOrigin-Name: e05f52d907e267b4f9ea204427229e7d7ef58641
2004-11-16 23:21:56 +00:00
danielk1977 ed326d7047 Perform deletes in a single pass. (CVS 2104)
FossilOrigin-Name: a2e1c35b327e33684ab19e5f65727c42c7b2949c
2004-11-16 15:50:19 +00:00
danielk1977 6a43f9b3ff Allow btree cursors to persist through BtreeDelete() calls. (CVS 2103)
FossilOrigin-Name: 6ad5fc8e1a119b750a82fc1426704164a2042d57
2004-11-16 04:57:24 +00:00
drh 670fb032ab Fix a typo in the header comment to the MakeRecord opcode so that the
documentation generator will actually see the opcode description.
Ticket #1001. (CVS 2102)

FossilOrigin-Name: 33c9b647aa70d1a9dab0e999daf853aa71d7df37
2004-11-15 23:42:27 +00:00
drh 7b4e7268f1 Add test cases for escape characters in the GLOB operator. (CVS 2101)
FossilOrigin-Name: bb2d9ff881e4c6fe0cf60a13609d39426346fa9d
2004-11-15 01:40:47 +00:00
drh 6c62608fc6 The SQLITE_OMIT_UTF16 macro now removes lots of code and all tests still pass. (CVS 2100)
FossilOrigin-Name: 98c7a55478f7c465b219edc1a33eee222586fd65
2004-11-14 21:56:29 +00:00
drh 5436dc2d97 Changes toward reducing code size when SQLITE_OMIT_UTF16 is enabled. (CVS 2099)
FossilOrigin-Name: 59a0a8b7cebc011731654bd0545cf8d19612ca8e
2004-11-14 04:04:17 +00:00
drh 13d7042a73 More compile-time options for removing components. (CVS 2098)
FossilOrigin-Name: dcbc0c22cf269e2f67002aa3f1bc0c66aaeff5f1
2004-11-13 15:59:14 +00:00
danielk1977 ce9a7b1e57 Code toward having btree cursors persist when their table is written too. Doesn't work properly yet. (CVS 2097)
FossilOrigin-Name: 5eaa18d43f2996a9d354bb4fb9c81e267e98be29
2004-11-13 13:19:56 +00:00
drh 8040bc8b57 Fix the keyword generator so that it works with SQLITE_OMIT_ALTERTABLE. (CVS 2096)
FossilOrigin-Name: 60ace9985d4ea2ef0fd245027fab2fffc32014b6
2004-11-13 03:59:25 +00:00
drh f338814455 Autoincrement is now working and has regression tests. (CVS 2095)
FossilOrigin-Name: 10c712a21961dbc3bff89c49d5ec3b84b9187c80
2004-11-13 03:48:06 +00:00
danielk1977 b92b70bb0a Change pragmas schema_cookie and user_cookie to schema_version and user_version. (CVS 2094)
FossilOrigin-Name: 5e058318441bb5043c609cc8fba1653995e90efb
2004-11-12 16:11:59 +00:00
danielk1977 1c8c23cc36 Add authorization callbacks to ALTER TABLE. (CVS 2093)
FossilOrigin-Name: c4115aa3a1b010704af76c5ae9f6dcbfa4038df8
2004-11-12 15:53:37 +00:00
danielk1977 9fd2a9a028 Add the "ALTER TABLE xxx RENAME TO yyy" command. (CVS 2092)
FossilOrigin-Name: a1b2cc63e604785bd51e358ff72c485d858752e3
2004-11-12 13:42:30 +00:00
drh 2958a4e6a5 Autoincrement code installed. Simple smoke-testing only. No regression
tests developed yet. (CVS 2091)

FossilOrigin-Name: 8fde833c812b91c5a574208a70b5f92b9d4b0a87
2004-11-12 03:56:15 +00:00
drh 817c60bd66 Website updates. (CVS 2090)
FossilOrigin-Name: 60fb0cef093b9827ac2d36b8a94e37f4b79dd2ea
2004-11-11 19:32:40 +00:00
danielk1977 dae2495b1f Add the schema_cookie and user_cookie pragmas. (CVS 2089)
FossilOrigin-Name: d28d1d68e5104726e6088361dfa7bf2cdd9985c7
2004-11-11 05:10:43 +00:00
danielk1977 2df9fabf3c Add documentation for DEFAULT CURRENT_TIME & co. (CVS 2088)
FossilOrigin-Name: c85f13f8f252faf423f12a3804f1fe2f950da660
2004-11-11 01:50:30 +00:00
danielk1977 45901d622c Ensure the test suite can run with either SQLITE_OMIT_AUTOVACUUM or SQLITE_DEFAULT_AUTOVACUUM=1 defined. (CVS 2087)
FossilOrigin-Name: 0747b55882cf218c03b443e1eadec9eb19889554
2004-11-10 15:27:38 +00:00
danielk1977 ae381aa1b6 Fix expr.test so that it works when the date-time functions are compiled out of the library. (CVS 2086)
FossilOrigin-Name: 540ce7de1b3f1882c40d4e20d3986775e1dcf77a
2004-11-10 12:34:20 +00:00
danielk1977 e6efa74b9f Ensure tables cannot be created/dropped when btree cursors are open. (CVS 2085)
FossilOrigin-Name: 8e5c2e5df8b824f7efb27e776240f005c6f1f0ff
2004-11-10 11:55:10 +00:00
danielk1977 2a03c3a326 Add user documentation for the "pragma auto_vacuum" command. (CVS 2084)
FossilOrigin-Name: fe200eaf373998574cc059086bfc93d6c44ec5a3
2004-11-10 05:48:57 +00:00
danielk1977 752e679a1e Have "DEFAULT CURRENT_TIME" & co. work even if SQLITE_OMIT_DATETIME_FUNCS is defined. (CVS 2083)
FossilOrigin-Name: f81b9c1c022772378aad32ec45d0027beeb36574
2004-11-09 16:13:33 +00:00
danielk1977 7977a17f06 Port the "DEFAULT CURRENT_TIME" etc. functionality from an earlier fork of sqlite. (CVS 2082)
FossilOrigin-Name: 0d27c8ff48f327ad82dd5b5b3b47b8d221f119b7
2004-11-09 12:44:37 +00:00
danielk1977 0ba87cb85d Refactor the space-analysis script for readability. (CVS 2081)
FossilOrigin-Name: 63f2ee22e20ed7e520fd9230acc5c6db43b69d13
2004-11-09 07:42:11 +00:00
danielk1977 16254450f4 Update the space-analyzer tool to support auto-vacuum databases. (CVS 2080)
FossilOrigin-Name: 1cb8086612c7dec170da0910cf0cbe4e48c417f8
2004-11-08 16:15:09 +00:00
danielk1977 8f5a31b50f A few more auto-vacuum tests. (CVS 2079)
FossilOrigin-Name: 9d4a60bbd67704ff3a9503678db94498dc700ccc
2004-11-08 12:32:50 +00:00
danielk1977 e0830e8e03 Check in the file autovacuum_crash.test that should be part of the previous check-in. (CVS 2078)
FossilOrigin-Name: 9d7cd1f732ba6f9d69fc30100a4608b74f212b76
2004-11-08 09:51:09 +00:00
danielk1977 94daf7fdff Test auto-vacuum mode for crash-proofness. Also fix a bug related to the same. (CVS 2077)
FossilOrigin-Name: 839ad771a6e781426c0fd624a4d1c91a5fcf8546
2004-11-08 09:26:09 +00:00
danielk1977 599fcbae56 Auto-vacuum: Account for the page reserved for windows locking (PENDING_BYTE). (CVS 2076)
FossilOrigin-Name: d6335698696c7b651bbc436c5177d87eb57a8934
2004-11-08 07:13:13 +00:00
drh e497f0051f Reindex tests added and bugs fixed. (CVS 2075)
FossilOrigin-Name: ad433ec2b6bd34e33dfe119668f38fbb978e889d
2004-11-07 13:01:49 +00:00
danielk1977 ef73ee9a46 Auto-vacuum: Ensure pages to be removed by database truncation are in the journal file. Also fix an sqlite3pager_movepage() bug. (CVS 2074)
FossilOrigin-Name: 081676e491760a45325e2349b177d6382faab9f5
2004-11-06 12:26:07 +00:00
drh eee46cf35c Compile and pass the quick regression tests with autovacuum disabled. (CVS 2073)
FossilOrigin-Name: 89b9026a5371f1c5589f04e3b69171ec1f605b7b
2004-11-06 00:02:48 +00:00
drh 4343fea20f First cut at a REINDEX command. Basic testing only. No documentation. (CVS 2072)
FossilOrigin-Name: 11dba47e61279bdf3be6f64a6259b877f3bf6155
2004-11-05 23:46:15 +00:00
drh b17131a084 Use sqlite3NestedParse to implement DROP INDEX. (CVS 2071)
FossilOrigin-Name: 0f81aa5b057eab908b46b70ea9e9a42bc2ee8c21
2004-11-05 22:18:49 +00:00
drh 063336a55e Use sqlite3NestedParse to implement CREATE INDEX. (CVS 2070)
FossilOrigin-Name: 47d8ebdaaddcb7a05e1917dd1dee2029c34228a4
2004-11-05 20:58:39 +00:00
drh 4794f73524 Create table now works with sqlite3NestedParse. This changed uncovered
a latent bug in xprintf which is also fixed. (CVS 2069)

FossilOrigin-Name: b0506bdd701339d63166ada065445776dd499588
2004-11-05 17:17:50 +00:00
danielk1977 d761c0c9fd Do not truncate a database file until after fsync() has been called on the journal. (CVS 2068)
FossilOrigin-Name: cfee7f4a004c5e57d58edcf9de3ded0a199940a3
2004-11-05 16:37:02 +00:00
danielk1977 951af8050b Make auto-vacuum a run-time option (default determined by SQLITE_DEFAULT_AUTOVACUUM macro). (CVS 2067)
FossilOrigin-Name: b9d5f007fc32d4f471e0e11cc4baadb100612878
2004-11-05 15:45:09 +00:00
danielk1977 87a6e7318f Auto-vacuum bug: Don't set meta(3) to a pointer-map page number when deleting a table. (CVS 2066)
FossilOrigin-Name: 44a015b3a3bbecc4ec1e02bb371d3274e2b6edf3
2004-11-05 12:58:25 +00:00
danielk1977 cb1a7eb0df Fix allocation of tables in an auto-vacuum database when the required root-page is on the free-list. (CVS 2065)
FossilOrigin-Name: 4e2433378e06210f0274c317c6d12b48236211fe
2004-11-05 12:27:02 +00:00
danielk1977 63e3e9f81a Don't code an OP_Statement within sqlite3NestedParse(). Also a correction
to the UPDATE statement used within destroyRootPage(). (CVS 2064)

FossilOrigin-Name: fdcc31f0c6106dacfed6612b173fe4be3c02546a
2004-11-05 09:19:27 +00:00
danielk1977 e7de6f25a8 When using sqlite3NestedParse() to modify the sqlite_master table, do not code OP_Callback. (CVS 2063)
FossilOrigin-Name: 296a298c484aac981e7e490a0cb4159717fc4ea4
2004-11-05 06:02:06 +00:00
drh 7a638581b2 Another bug fix from two check-ins ago. (CVS 2062)
FossilOrigin-Name: c46eef2f6d32b8546e1441e7e6f103e6ad97f1f4
2004-11-05 05:23:59 +00:00
drh 958390005b Fix a bug in the previous check-in. (CVS 2061)
FossilOrigin-Name: 9d259d48defda57ab0bd66460bd2ba7f3a2695e9
2004-11-05 05:20:40 +00:00
drh 4e0cff6080 More use of sqlite3NestedParse. This version of the code does not work. (CVS 2060)
FossilOrigin-Name: ac2d5a605c873cac68bfde4bbe3797608a47b21e
2004-11-05 05:10:28 +00:00
drh f197484617 Begin using sqlite3NestedParse() to generate sections of code. (CVS 2059)
FossilOrigin-Name: 2d302931a69d1add1dae9f820133872b4fefe93e
2004-11-05 03:56:00 +00:00
danielk1977 a64a035f7e Fix bug introduced with (2057). (CVS 2058)
FossilOrigin-Name: aed2e623ec9c4044696dc2d6f7f4c53216b45479
2004-11-05 01:45:13 +00:00
danielk1977 467d4707ff Pop the value pushed by OP_Destroy if SQLITE_OMIT_AUTOVACUUM is defined. (CVS 2057)
FossilOrigin-Name: b0c103340ad27533d3e5b2f1b18557fd9c8b55df
2004-11-05 01:24:12 +00:00
drh 205f48e635 Incremental check-in of changes that will ultimately lead to a
working autoincrement. (CVS 2056)

FossilOrigin-Name: 10c3d88305e404b9e4cc4eef0b8e5dc7864a5937
2004-11-05 00:43:11 +00:00
drh 40e016e492 All tests pass when SQLITE_OMIT_INTEGRITY_CHECK is defined. (CVS 2055)
FossilOrigin-Name: 158a2d16a8630e3b5892120f6ea68f2b0dc47eb3
2004-11-04 14:47:11 +00:00
danielk1977 a0bf265269 Support root-page allocation/deallocation in auto-vacuum databases. Still a few problems. (CVS 2054)
FossilOrigin-Name: 1da361fae82d420be63c53f8e3efaccac24f348a
2004-11-04 14:30:04 +00:00
drh 798da52ce7 All tests pass even if OMIT_TRIGGER is defined. (CVS 2053)
FossilOrigin-Name: c33b3a613751057e8a46fdcd428b8448329d414d
2004-11-04 04:42:28 +00:00
drh bf8aa33bba Fix a #ifdef in util.c. Ticket #984. (CVS 2052)
FossilOrigin-Name: da045bd183335a112f9a6c805c12efe12d0a25ca
2004-11-04 04:34:14 +00:00
danielk1977 003ba061da Add support for table allocation (not deallocation) in auto-vacuum databases. (CVS 2051)
FossilOrigin-Name: 571de52376f52999268ba5e0cd05c6c6eff1ebbf
2004-11-04 02:57:33 +00:00
drh 6bf895708c Update tests to work even if some features of the library are disabled. (CVS 2050)
FossilOrigin-Name: b11fc9b3f3a2711f98e7e45724aa1d30081197f3
2004-11-03 16:27:01 +00:00
drh a71aa00102 More work on optionally removing unused features at compile-time. (CVS 2049)
FossilOrigin-Name: a82980fd70285820c64b42393ef85a9e21addc5d
2004-11-03 13:59:04 +00:00
danielk1977 a19df67c58 Auto-vacuum bug: Deallocate pointer-map pages when shrinking a database file. (CVS 2048)
FossilOrigin-Name: bec6a65acaa8bfd8fe2cb475ba2e992a1993e4e7
2004-11-03 11:37:07 +00:00
danielk1977 1be29eb6be Comment the autovacuum.test script. No code or test-case changes. (CVS 2047)
FossilOrigin-Name: 2eacd38620f7270467b16e9e2f350aa0b4869a10
2004-11-03 09:30:54 +00:00
danielk1977 f5fdda8208 Auto-vacuum bug: Correctly manipulate page cache hash-table entries in sqlite3pager_movepage(). (CVS 2046)
FossilOrigin-Name: 719c1b79671c8cd7c5a6b5967ad4265b65e433d3
2004-11-03 08:44:05 +00:00
drh 52fb6d71f5 The makefile now runs mkkeywordhash.c. Keywords that are unused are
omitted from the keyword hash table. (CVS 2045)

FossilOrigin-Name: 007aec11333432e08d1091b728773011e9078bc3
2004-11-03 03:59:57 +00:00
danielk1977 4fa03bde07 Auto-vacuum bugfix: Do not attempt to move a pointer-map page during auto-vacuum. (CVS 2044)
FossilOrigin-Name: bd50fbb5fecd1829c87e8ca72c458c71f590274b
2004-11-03 03:52:37 +00:00
danielk1977 e80463bc7d Fix an auto-vacuum bug that occurs when a btree cell is promoted to the parent page during a delete. (CVS 2043)
FossilOrigin-Name: b7d953e1195897de4869ec241a65e8a3d1320efb
2004-11-03 03:01:16 +00:00
drh 7041e17e9c Fix a problem in the pragma.test script. (CVS 2041)
FossilOrigin-Name: a2c9c45c803350f45911a72eb61efa9c3089f8ca
2004-11-02 18:15:49 +00:00
drh cfe4a990ce Get btree.c to compile with -DNDEBUG=1. (CVS 2040)
FossilOrigin-Name: 8378c144c1e1cedb7deea271fa274182d08198b8
2004-11-02 18:05:09 +00:00
danielk1977 f78fc0818c Fix an auto-vacuum bug for btree entries that span more than one overflow page. (CVS 2039)
FossilOrigin-Name: 40249ed19cd53cb61f9575d8165316faf2627479
2004-11-02 14:40:32 +00:00
drh 06f502170e Require that the page size be a power of 2. (CVS 2038)
FossilOrigin-Name: c33b34dbe9657b151b9ab00a6b50a255fae623f8
2004-11-02 14:24:33 +00:00
danielk1977 687566d786 Code to auto-vacuum the database if all root pages happen to be in the right place. Not active by default and largely untested. (CVS 2037)
FossilOrigin-Name: d12481f09cbe51c7ea499bc22afec5de3af14ad4
2004-11-02 12:56:41 +00:00
drh a82ffef115 Updates to the support.html page. (CVS 2036)
FossilOrigin-Name: 5515accee348c6364cd58903a19029519797e123
2004-11-01 16:03:11 +00:00
danielk1977 afcdd02f6a Add code to create/update the btree 'pointer-map' for auto-vacuum mode. (CVS 2035)
FossilOrigin-Name: bebd967f3627220c3ce0352c8ca9c7c17b722ce6
2004-10-31 16:25:42 +00:00
drh b7f9164e98 Insert #ifdefs that can optionally remove features at compiletime resulting
in a database engine with a smaller footprint. (CVS 2034)

FossilOrigin-Name: be661acfa849bb0d5692797dd221f5a8a457f8ad
2004-10-31 02:22:47 +00:00
drh 27d258a3ec Begin adding the ability to remove unused features at compile-time and still
have all the tests pass. (CVS 2033)

FossilOrigin-Name: 2aa506ccb003a25555b414772002d0130db93052
2004-10-30 20:23:09 +00:00
drh 2536ee480b Move affinity.html into the attic. (CVS 2032)
FossilOrigin-Name: 87a3c668f0dcd43f5d9b38d92a75a4ac38d49057
2004-10-26 16:34:37 +00:00
drh 9c35cda6b1 Mark the affinity.html file as obsolete. (CVS 2031)
FossilOrigin-Name: 09de96b6b2e877282be0815ba76c10f18839ff6b
2004-10-26 16:33:14 +00:00
drh 0b2110c9f5 Fix a bug in the ".databases" command of the command-line shell.
Ticket #973 (CVS 2030)

FossilOrigin-Name: 507d8e6f5cff308116289b27b3138e5bbfd55352
2004-10-26 00:08:10 +00:00
drh 722e95ac65 Minor optimizations in the pragma module. (CVS 2029)
FossilOrigin-Name: 63efd50a1608eb4ccac44a233c0f77c3956f9fa0
2004-10-25 20:33:44 +00:00
drh 40f20f7d2a Tighter encoding of the keyword hash table in the tokenizer. (CVS 2028)
FossilOrigin-Name: 7b9886f8d4db366bc7dbf25495f0d3b907d25689
2004-10-23 05:10:18 +00:00
drh f404083e56 Add the experimental and scary pragma "writable_schema". (CVS 2027)
FossilOrigin-Name: 39f7870a54d90d5163fcad3f08cd63699c4bb567
2004-10-22 20:29:21 +00:00
drh 887dc4c275 Fix alignment problems in btree and pager and allow page sizes that are
not a multiple of 8. (CVS 2026)

FossilOrigin-Name: 0539c2d2b8e16efcbe4db3afeae9c7b426e11b05
2004-10-22 16:22:57 +00:00
drh 6138df56e7 Reinsert code deleted by (1998) that we thought was unused but was in fact
needed.  Fix for ticket #966. (CVS 2025)

FossilOrigin-Name: 370ca539506a431dbe77dcb644215886760f34e9
2004-10-19 16:40:59 +00:00
drh 63afe89499 Fix a typo in the quickstart document. (CVS 2024)
FossilOrigin-Name: 55b03c560d2f66c55d64c3e9f9577e33f8c63195
2004-10-19 01:31:20 +00:00
drh b45bb9f17d Fix typos in the names of some regression tests. Ticket #962. (CVS 2023)
FossilOrigin-Name: 77542beb31349b85bdf404c46980da346dde3266
2004-10-18 21:34:46 +00:00
drh 44c6d46480 Fix typo on homepage. Ticket #956. (CVS 2022)
FossilOrigin-Name: 552ec6770a942fa014242b10fab87b58210dcf08
2004-10-12 02:38:09 +00:00
drh 13f52c77dc Version 3.0.8 (CVS 2021)
FossilOrigin-Name: 7dd66d7653adf5cdd6b3b0fb9053815ab199d6cc
2004-10-12 00:56:08 +00:00
drh 093031f6b0 Updates to the README file (CVS 2020)
FossilOrigin-Name: d3d0d7a8bb63842739fb470f7843db1ffbdc7d4f
2004-10-12 00:50:33 +00:00
drh 81d01352c3 Increment the version number. Prepare for release of version 3.0.8. (CVS 2019)
FossilOrigin-Name: ff04d7d48b8f9cdfa9b5bb720511c6f4490796e7
2004-10-11 22:26:00 +00:00
drh 270c856eba Fix typo on the homepage. (CVS 2018)
FossilOrigin-Name: 7f190f85e2722edf198423d2b71a1524afe5a32d
2004-10-11 21:49:06 +00:00
drh 1043afaeaf Fix typo in the lockingv3.html page on the website. (CVS 2017)
FossilOrigin-Name: a31b647727052495073fec86f52367bc10264723
2004-10-11 21:48:27 +00:00
drh a1d65d0221 The mkopcodeh.awk script removes \r for use with msys. Ticket #954. (CVS 2016)
FossilOrigin-Name: c4fb44fd5f89960ec09c9ed64aeb037b5ca55ea2
2004-10-10 19:11:35 +00:00
drh 0fe0b01ed9 Documentation updates (CVS 2015)
FossilOrigin-Name: a4546c09d7a42f9086e63a38008a87df030b4374
2004-10-10 18:00:46 +00:00
drh 3500b7c2d4 Typos and spelling errors in documention. (CVS 2014)
FossilOrigin-Name: 16e2ace2db5c051aefe7f72504ad6c1cc5e7a0f4
2004-10-10 17:24:53 +00:00
drh 757028e6ea New links on the common header page of the website. (CVS 2013)
FossilOrigin-Name: 6d6246f150f27042b8ede0fe73ecca1aefd2c3e4
2004-10-09 15:54:32 +00:00
drh 57790b8fca Sort the output of glob in test script attach2.test. Ticket #948. (CVS 2012)
FossilOrigin-Name: 3d04eef9b7decd21acc30d47af1bb1386333c351
2004-10-07 22:22:39 +00:00
drh 2090a0ed48 Optimizations to the tokenizer. (CVS 2011)
FossilOrigin-Name: e5540ce047e0215904005bc9df4ff0d1d0a3c1d1
2004-10-07 19:03:01 +00:00
drh 74ad7fe980 Additional parser optimizations. (CVS 2010)
FossilOrigin-Name: 618dee121e41d8e5c9b4d5c167475b11ddcda2d7
2004-10-07 03:06:28 +00:00
drh 8e64d1caad In the command-line shell in CSV move, put strings in C-style double-quotes.
Ticket #911. (CVS 2009)

FossilOrigin-Name: 1376a0bb8d864de755c614b2ecce4342155fd09b
2004-10-07 00:32:39 +00:00
drh 1e284f4558 Fix naming conflict between sqlite.h and sqlite3.h. Ticket #946. (CVS 2007)
FossilOrigin-Name: 30370412630970a76aafb9715106911b716256db
2004-10-06 15:52:01 +00:00
drh 5719628afb Convert many constants to have type "const". (CVS 2006)
FossilOrigin-Name: d790c84c5a889928d07f5394fffef0cbb8d5f214
2004-10-06 15:41:16 +00:00
drh b327f77358 Move some work out of the makefiles and into awk scripts in separate files.
Ticket #940. (CVS 2005)

FossilOrigin-Name: 4d0f29d54c0ccb153abd77d9b62b6461ec1e978f
2004-10-06 15:03:57 +00:00
drh 2e3a1f16b6 Size optimization in the parser. (CVS 2004)
FossilOrigin-Name: 8e2ae2449882f70fe4e77c100193c053d7669ae6
2004-10-06 14:39:28 +00:00
drh 36d4e97e94 Fix the ".import" command of the command-line shell so that it ignores
\n and \r at the end of a line.  Ticket #939. (CVS 2003)

FossilOrigin-Name: dcbf4817a7a3ce18a2d5ed008346933a36acd543
2004-10-06 14:39:06 +00:00
drh 86f43308d6 Rearrange memory allocation in sqlite3VdbeMakeReady to try to work around
some byte-alignment problems on Sparc. (CVS 2002)

FossilOrigin-Name: f623d6e74fb5f6f70a22c06278b2bb1b4b7f9b85
2004-10-05 17:37:36 +00:00
drh 2783e4bc0e Use the database name supplied to table_info() and related pragmas. (CVS 2001)
FossilOrigin-Name: 0415af325739fd4e0bd4761c889719355a1ec4ff
2004-10-05 15:42:53 +00:00
drh 684917c269 Add support for DEFERRED, IMMEDIATE, and EXCLUSIVE transactions. (CVS 2000)
FossilOrigin-Name: 81ff8107ad63113782cf5a9ba7a512496114ba08
2004-10-05 02:41:42 +00:00
drh 9a43267ba2 More changes to take advantage of the TK_ and OP_ alignments to avoid
unnecessary translations. (CVS 1999)

FossilOrigin-Name: e8e972ba65fc36171f6b685e8a8f67f93452e031
2004-10-04 13:38:09 +00:00
drh f2bc013c70 Save about 800 bytes of code space by aligning TK_ and OP_ constants so that
we do not have to translate between them. (CVS 1998)

FossilOrigin-Name: 4c817e3f293a9c1365e632f7dc13ae440263332a
2004-10-04 13:19:23 +00:00
drh 9c105bb990 Fixes to the OsUnlock() interface. Correctly leave a SHARED lock behind
when requested.  Honor the error code that OsUnlock() returns.
Ticket #913 and #938. (CVS 1997)

FossilOrigin-Name: c4697503d0ad080290b91e96dfc9a1a63f2df7e6
2004-10-02 20:38:28 +00:00
dougcurrie 0924bba36c make diskfull test work on Windows; see check-in (1994) (CVS 1996)
FossilOrigin-Name: 4493e287809874fabeddf5ca9045065a30790f2f
2004-10-01 18:21:43 +00:00
drh 047d4836ff Additional code to test the SQLITE_FULL return when the disk is full. (CVS 1994)
FossilOrigin-Name: 44e56f0bba61245d342d6e75510d6c35785efd49
2004-10-01 14:38:02 +00:00
drh ededaa59bd Fully release exclusive locks in the Unlock primitive of Unix.
Ticket #913. (CVS 1993)

FossilOrigin-Name: 11a37a74b101b9e37dcf1c3e57e45fbcd39a1c21
2004-10-01 03:02:48 +00:00
drh eb206256f1 Use type i64 instead of off_t for file offsets since off_t is giving
portability problems.  Ticket #924. (CVS 1992)

FossilOrigin-Name: 8972c004dc825f668d952e7d082a89046b9260f1
2004-10-01 02:00:31 +00:00
drh a3f70cbc31 Strict prototype on sqlite3_libversion(). Ticket #936 (CVS 1991)
FossilOrigin-Name: 1d3c6f735101d8fc582871c0370805596d975001
2004-09-30 14:24:50 +00:00
drh 596bd23554 Correctly parser column typenames that contain more than one identifier.
Ticket #934. (CVS 1990)

FossilOrigin-Name: 85ad18712d2bd2b4322ceb617f33c265c1933240
2004-09-30 14:22:47 +00:00
drh c60d04464f Allow functions to be created when there are outstanding VMs.
(Ticket #926)  Fix problems with sqlite3_errcode().  Add tests for
sqlite3_errcode(). (CVS 1989)

FossilOrigin-Name: d0f1dc5898382258b283308c2cce55a8bc378ee4
2004-09-30 13:43:13 +00:00
drh 44f87bdc56 Comment changes in btree.c. No changes to code. (CVS 1988)
FossilOrigin-Name: b15abf984fa06ae968d92fa9533dab20dcebd323
2004-09-27 13:19:51 +00:00
drh 3127653b1c Bug fix in btree.c in cases where usableSize!=pageSize. Ticket #925. (CVS 1987)
FossilOrigin-Name: cb3e12372d96f5a24f5a5d79645c705775bc63ff
2004-09-27 12:20:52 +00:00
drh 10e8266b91 Remove unused CLUSTER keyword from the parser. (CVS 1986)
FossilOrigin-Name: 54ee1664aaaa1a3380009b5206a0fa79cd286fc5
2004-09-25 15:29:09 +00:00
drh aa756b0978 Optimizations in the tokenizer. (CVS 1985)
FossilOrigin-Name: 26898c57cb2419d4200803f79fdd821c3093cba2
2004-09-25 15:25:26 +00:00
drh ae29ffbe23 Code cleanup: get rid of the sqlite3SetNString utility function. (CVS 1984)
FossilOrigin-Name: 9ef4c24a9acc2128891303de1ffd2ef4509d779c
2004-09-25 14:39:18 +00:00
drh 94a11211f5 Code simplifications and size reductions. (CVS 1983)
FossilOrigin-Name: cb631a135da92fd689ee40a8b7e2695a510eb765
2004-09-25 13:12:14 +00:00
drh 5e2517e1f3 Size optimizations in vdbeapi.c. (CVS 1982)
FossilOrigin-Name: b2f3d4bb8e24212d3cef7615c24da13f29c1440c
2004-09-24 23:59:12 +00:00
drh b8dd3155e0 Save a few bytes in utf.c. (CVS 1981)
FossilOrigin-Name: 8154d545e8ae3d22490b49ce4f327605883accaa
2004-09-24 23:20:51 +00:00
drh 76ff3a0e09 Optimizations to vdbeaux.c and printf.c (CVS 1980)
FossilOrigin-Name: eabc77c99b3e78b4c620a1736d9acfa6cb1e7b67
2004-09-24 22:32:30 +00:00
drh 59c98a6f2b Improvements to the debugging code. (CVS 1979)
FossilOrigin-Name: bdc3bb070f7f29713b7bb9a6454a7ecbee6cf36d
2004-09-24 19:39:26 +00:00
drh 3b584fa6c5 Fix typo in ".help" output from the shell. Ticket #914. (CVS 1978)
FossilOrigin-Name: 1ee3a787ada5abd460200d5812474161bfd1cc71
2004-09-24 12:50:03 +00:00
drh 971a7c87bc Avoid a segfault in sqlite3_bind_parameter_index when there are
unnamed parameters.  Ticket #918. (CVS 1977)

FossilOrigin-Name: 49f25ddf8382d588e00bf927e2acae93e332e4d4
2004-09-24 12:48:12 +00:00
drh 670404626d Simplification of the trigger code. (CVS 1976)
FossilOrigin-Name: 9fa904d94ec1787bc8b97ec06a5423248fcb67fb
2004-09-24 12:24:36 +00:00
drh 145716b323 Fix for tickets #912 and #922. Problem introduced by check-in (1973). (CVS 1975)
FossilOrigin-Name: 9001e2220d2e35b81a9b7dc70c012f94bb6db679
2004-09-24 12:24:06 +00:00
dougcurrie 65623c78e8 Pthread is now conditionally included in makefile, see ticket #910 (CVS 1974)
FossilOrigin-Name: a35e52276998f8db2407115b07f30bd490982944
2004-09-20 14:57:23 +00:00
drh ad6d94607f Add comments to unused P3 fields of selected instructions when NDEBUG is
not defined.  This makes VDBE program dumps more readable during debugging. (CVS 1973)

FossilOrigin-Name: 4871c77f8fce36ff230e1f026f4e4e49492515e9
2004-09-19 02:15:24 +00:00
drh 344737f60a Merge the ListPush and ListPop VDBE opcodes into ContextPush and ContextPop. (CVS 1972)
FossilOrigin-Name: eb9b501ad8b0fa0fd63a67ece05fe142d6a19114
2004-09-19 00:50:20 +00:00
drh c2316c3931 Fix typo on homepage. (CVS 1971)
FossilOrigin-Name: 5d3b3a96bcc459a797bd723025f2d38efcfeb6fa
2004-09-18 18:51:09 +00:00
drh 1a9d17fe77 Version 3.0.7 (CVS 1970)
FossilOrigin-Name: d82ded9543fdd77f3613bac5e263f658dc3fd236
2004-09-18 18:45:57 +00:00
drh 2d7c0609ed Up the version number and prepare documentation files for the 3.0.7 release. (CVS 1969)
FossilOrigin-Name: 63e4ed3cc698d660867c297cbedfc25f9eb7c40d
2004-09-18 18:00:23 +00:00
drh cc01bc037f Always include -lpthread on link lines even if it is not needed. (CVS 1968)
FossilOrigin-Name: 46a96890f7008157bc3784fa7c8680edf6266673
2004-09-17 21:35:30 +00:00
drh 8d45ec079d Make use of $(libdir) in the Makefile.in. Ticket #904. (CVS 1967)
FossilOrigin-Name: 10b5e5173339cc7f052aace1b4056a057afe3e66
2004-09-17 21:07:34 +00:00
drh d2f397f9f3 Create directories using "mkdir -p". Ticket #903. (CVS 1966)
FossilOrigin-Name: 02de1cf95e0cf230aeebdb0c4684e486b1424810
2004-09-17 20:47:16 +00:00
drh 31f33e1369 Close stray statements prior to finishing trace.test, to avoid a file
descriptor leak. (CVS 1965)

FossilOrigin-Name: 8bb0221da8ab49d766db7cd2f815ba2a305e15de
2004-09-17 20:46:54 +00:00
drh d900a46be0 The page_size pragma preserves the reserved area at the end of each page. (CVS 1964)
FossilOrigin-Name: c34f3209e5028e008ea9e2c43f1e0d97d6db01d3
2004-09-17 20:25:24 +00:00
drh 31f11f6923 Get VACUUM working on databases that have reserved bytes at the end
of each page. (CVS 1963)

FossilOrigin-Name: 90bb3af6cd827fcf731ba3d641a00ae426d6baca
2004-09-17 20:02:42 +00:00
drh f7a8362920 Fix a bug in the test3.c module that was causing failures in btree5.test. (CVS 1962)
FossilOrigin-Name: cd200cf8332be2c99a0a312b5f7dcd582a93fd18
2004-09-17 19:39:23 +00:00
drh a42707b234 The INSERT code generator does a better job of detecting if the table
being written into is used in the SELECT on the right-hand side.
ticket #901. (CVS 1961)

FossilOrigin-Name: 709bb22d6ddbd713029059180aaf77ac483b5bb8
2004-09-17 17:23:15 +00:00
drh c16a03b54b The callback on sqlite3_trace() is invoked the first time sqlite3_step()
is called after sqlite3_prepare() or sqlite3_reset().  Ticket #900. (CVS 1960)

FossilOrigin-Name: 0cc2f40e6afa157ead45140c4e28a9a33c469b73
2004-09-15 13:38:10 +00:00
drh fd241b0ea4 Remove the encode/decode from the version 3.0 source tree. (CVS 1959)
FossilOrigin-Name: c1f1320be5ce0b6e52491577078ba2b939882fbd
2004-09-13 13:46:01 +00:00
drh 90b6bb1995 The TCL interface responds correctly to "break", "continue", and "return"
inside of the script of an eval statement. (CVS 1958)

FossilOrigin-Name: dd62224ae8d1047db388acdc4b91eb56fb9e966a
2004-09-13 13:16:31 +00:00
drh 94a98365a6 Fix an uninitialized variable bug in nullif(). Ticket #898. (CVS 1957)
FossilOrigin-Name: ee335b501cf45727929aac12c0b74547dd54729e
2004-09-13 13:13:18 +00:00
drh 2aa6ca45c1 In lemon, allows open() using the "b" option to avoid \r problems on windows.
Ticket #897. (CVS 1956)

FossilOrigin-Name: b5b2e3db09831fe808f9f2692a836eef716df1c5
2004-09-10 00:14:04 +00:00
drh 9db55dfb98 Fix lemon so that inserted code always ends in a newline. Ticket #895. (CVS 1955)
FossilOrigin-Name: 13fba17e3f75c08142db6acc8884a78ac0bcdfd6
2004-09-09 14:01:21 +00:00
drh 5689123ca6 Fix a segfault in the authorizer when it is given a SELECT statement with
no FROM clause.  Ticket #896. (CVS 1954)

FossilOrigin-Name: 97d63b9290ef88b3cd8012c71fdd5b3c74eebc8f
2004-09-09 13:55:50 +00:00
drh 6aff507e73 Trying to get some tests in printf.test to pass on 64-bit systems. (CVS 1952)
FossilOrigin-Name: b12fc46dcd5aa901fc781a17d49f8f110fed5b8d
2004-09-09 00:35:29 +00:00
drh ed6b3eb076 Update the makefile so that util.c gets the -DSQLITE_DEBUG=1 flag when
building the test fixture. (CVS 1951)

FossilOrigin-Name: 8d0c9a8d94930056817a99d9504e804a200eda73
2004-09-08 21:12:50 +00:00
drh 217a416cec More changes directed at getting things to work on 64-bit platforms. (CVS 1950)
FossilOrigin-Name: 5a3f823c1430376ed127d627d408ab284815c1a4
2004-09-08 20:13:04 +00:00
drh fe63d1c98b More changes directed at getting things to work on 64-bit platforms. (CVS 1949)
FossilOrigin-Name: 39755d216608e9d12e1055433549f820f63608a7
2004-09-08 20:13:04 +00:00
drh 03c8988076 Always cast 0 to (char*)0 when it is an argument in a varargs function. (CVS 1948)
FossilOrigin-Name: a1f532520c16a1f4b4285cd522774669292fb234
2004-09-08 15:09:40 +00:00
drh 95380fae3c Add new APIs to sqlite3.def: sqlite3_bind_parameter_name and
sqlite3_bind_parameter_index. (CVS 1947)

FossilOrigin-Name: ff256fb5281e8f01c0acc3963c59399e949cc991
2004-09-08 13:07:44 +00:00
drh 916d68efea Documentation updates. (CVS 1946)
FossilOrigin-Name: 799f5383c0c72a74c7b29f9f40fc949f3248a499
2004-09-08 13:06:21 +00:00
drh fa6bc0000f Wildcards with the same name map into the same variable number. New
api sqlite3_bind_parameter_index() added to map wildcard names into
wildcard index numbers.  Support for "?nnn" wildcards. (CVS 1945)

FossilOrigin-Name: 435b3f301fbb6953adc974c7f03589b06e9114c3
2004-09-07 16:19:52 +00:00
drh 1807ce37b8 Fix the onecolumn method in the TCL interface so that it works the same
as the eval method in all ways except for returning just the first value
in the result set. (CVS 1944)

FossilOrigin-Name: f323e4f86a08fe6448cbd4ff7cab459e8039d9f1
2004-09-07 13:20:35 +00:00
drh af805ca035 Lemon escapes backslashes in filenames in #line directives it generates.
Ticket #892. (CVS 1943)

FossilOrigin-Name: d53047cbbc4e618c7bb5161b6f82876bb113db25
2004-09-07 11:28:25 +00:00
drh 12057d54ef Fix more name collisions. Allow sqlite.h and sqlite3.h to both be included
in the same C/C++ source file. (CVS 1942)

FossilOrigin-Name: 23e5bed1c5062f0f639751f89873bf1a277547bd
2004-09-06 17:34:12 +00:00
drh 9bb575fd72 Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3
connection now *must* be called "sqlite3".  You cannot call it "sqlite".
This might break existing code. (CVS 1941)

FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
2004-09-06 17:24:11 +00:00
drh 873cdcb2ce Comment changes and minor code cleanup. (CVS 1940)
FossilOrigin-Name: dfa9ea89c473e1fea804ad07e8e58a9af1e92f6c
2004-09-05 23:23:41 +00:00
drh f2a611c988 Make VACUUM work when the page size is different than the default 1024.
Ticket #890. (CVS 1939)

FossilOrigin-Name: fa82becae7e41c47a6387061932f692c6f9f472e
2004-09-05 00:33:43 +00:00
drh ad3e010547 Fix a comment. (CVS 1938)
FossilOrigin-Name: af44ddeea110576bf9c475b5e6e3540ee50c5edf
2004-09-03 23:32:18 +00:00
drh 2e38c32b67 Modify btree.c so that is allocates big data structures using malloc()
instead of allocating from the stack.  Stack allocations cause problems
for embedded systems and pthreads implementations that only allocate a
limited amount of stack space. (CVS 1937)

FossilOrigin-Name: 4595292f936bdbec10734f42682824e91ff71d11
2004-09-03 18:38:44 +00:00
drh 2c7e56798b More tests of sqlite3_step() and SQLITE_BUSY added. (CVS 1936)
FossilOrigin-Name: 9e6645dd781cb8e422e371ca23766dc1b689481e
2004-09-03 00:27:56 +00:00
drh 6ad3326fd5 Fix a typo in the "News" on the homepage. (CVS 1935)
FossilOrigin-Name: 45d7158878a9648708d8ed47944707169a7f7f1c
2004-09-02 16:53:12 +00:00
drh bc58e70e90 Version 3.0.6 (beta) (CVS 1934)
FossilOrigin-Name: c190b95c30981d2a6026e501e21af675ff8a2d13
2004-09-02 16:45:58 +00:00
drh d1b03577ec Update version number and documentation for version 3.0.6. (CVS 1933)
FossilOrigin-Name: 67370926e374180b2de6e9ab60e5c9ddab4b1317
2004-09-02 16:36:03 +00:00
drh c44af71c08 Address some minor 32/64 bit issues. (CVS 1932)
FossilOrigin-Name: 6c9be972c1c289b657ba87db8db08fceb89b0171
2004-09-02 15:53:56 +00:00
drh 32fc1a5c51 Fix a bug in the pagesize test script. (CVS 1931)
FossilOrigin-Name: 1cf05bc607c88a3c0b81e82ee2d4fc761f08901a
2004-09-02 15:49:07 +00:00
drh 51a6ec4892 Fix VACUUM so that it works on files whose name contains '. Ticket #873 (CVS 1930)
FossilOrigin-Name: 8dd938e48048ffeb11181db9d98112ea2adbcfa6
2004-09-02 15:27:41 +00:00
drh 5bb7ffe1ea Fix a problem with EXPLAIN on pragmas that return single integer values.
Ticket #886 (CVS 1929)

FossilOrigin-Name: 8ce3d730b0bf1a9b9472ff38c58c462ebc3566e3
2004-09-02 15:14:00 +00:00
drh 92f02c31d4 Transactions commit on the last sqlite3_step(), not on sqlite3_finalize().
This allows the sqlite3_step() to return SQLITE_BUSY if the commit is
blocked by a lock.  Ticket #885. (CVS 1928)

FossilOrigin-Name: d1b29156558f1c576002cdb2544dffaa693da39b
2004-09-02 14:57:08 +00:00
drh 66cbd1543b Work around a bug in the Borland C++ compiler. Ticket #881. (CVS 1927)
FossilOrigin-Name: 18af6ba580a5ad50a20955bfe2ebce8e30b1d39e
2004-09-01 16:12:25 +00:00
drh 91bb0eedd1 Optimizations on the SELECT code generator. (CVS 1926)
FossilOrigin-Name: 9c411c3c8dde2061c98513a413ef58c5c2de45af
2004-09-01 03:06:34 +00:00
drh c8d7441eb4 Changes to support compiling under windows. (CVS 1925)
FossilOrigin-Name: 68a712f3728587ee20f6f15900e9826eeeaaa0de
2004-08-31 23:41:26 +00:00
drh 855eb1cf02 Simplifications and optimizations. Also: disable the corrupt.test for now. (CVS 1924)
FossilOrigin-Name: 8fd65e704888a8e2f4a712a94fd0e3f866c10ef3
2004-08-31 13:45:11 +00:00
drh 4e5ffc5f8d Combine the implementation of LIKE and GLOB into a single parameterized
function. (CVS 1923)

FossilOrigin-Name: 0a47c8f86d1649e9ae7edd4c49a6fe5f5272351e
2004-08-31 00:52:37 +00:00
drh ee696e2218 Better detection and handling of corrupt database files. (CVS 1922)
FossilOrigin-Name: 8f5b199e845fa7ae3444ef69bd840716d305cf73
2004-08-30 16:52:17 +00:00
drh 57ee3cc2ce Documentation updates (CVS 1921)
FossilOrigin-Name: 9322c439c5727f0d65548efdf4de4d7b89b4be66
2004-08-30 14:58:11 +00:00
drh 7f4680c92e Remove the \001 character that lemon inserts automatically in its
output file.  The need for this character has expired and it creates
confusion for users.  Ticket #877 (CVS 1920)

FossilOrigin-Name: acfc59186ac7452c0a74dc4ef8df9a1c94fc4f46
2004-08-30 14:22:31 +00:00
drh dd3d4598bf Modify the sqlite shell program so that the ".dump" command does not give up
if it encounters an SQLITE_CORRUPT error.  It tries to keep going in order
to extract as much information as it can from the corrupt database. (CVS 1919)

FossilOrigin-Name: d3f3acb77f4e9f597af5afac565916b9c5e1c5d6
2004-08-30 01:54:05 +00:00
drh effd02bcbe Change the name of the global variable to sqlite3_temp_directory to
avoid a naming conflict with version 2.8. (CVS 1918)

FossilOrigin-Name: 431f7436a680b7c520aa559b0bf8619d7faba8c1
2004-08-29 23:42:13 +00:00
drh 208f80a7d4 Fix a bug in the NOCASE collating function. (CVS 1917)
FossilOrigin-Name: 32c2974af67abbbfa75c46afdab59ea6d5c15beb
2004-08-29 20:08:58 +00:00
drh 7cdc3e6578 Version 3.0.5 (beta) (CVS 1916)
FossilOrigin-Name: f3fe8c9fa63ed50e033f6caf7927cc3a998bcaa1
2004-08-29 18:14:39 +00:00
drh d271df0569 Adjustments to the download.html page generator script. (CVS 1915)
FossilOrigin-Name: a6dc1331396569a3d7c3fad27b98577918d7219d
2004-08-29 18:14:18 +00:00
drh 37e012846c Increase the version number and update the change log in preparation for
the release of version 3.0.5. (CVS 1914)

FossilOrigin-Name: 69922aabb5c0065eb551fe20065c866e6abad434
2004-08-29 17:52:40 +00:00
drh f298718005 Back out an optimization that was causing problems in UTF-16 databases. (CVS 1913)
FossilOrigin-Name: 988cb064ab2d3c9b64c075265a8cb4402a604332
2004-08-29 17:30:49 +00:00
drh 8cdbf83690 Corrections to transient table handling in compound select statments.
Tickets #826 and #875. (CVS 1912)

FossilOrigin-Name: 9cc765be4611a248cfcce1243fd1bbeaf5202968
2004-08-29 16:25:03 +00:00
drh fbc4ee7b70 Progress toward fixing iproblems with compound selects. (CVS 1911)
FossilOrigin-Name: 307478593d5d96b79386da222c7742ea2eaa5467
2004-08-29 01:31:05 +00:00
drh 6f3a3efe03 Add prototype in sqlite3.h for the sqlite3_libversion() function. (CVS 1910)
FossilOrigin-Name: d50c47b4995bd9b58e1293aa6513361cffc6babe
2004-08-28 18:21:21 +00:00
drh febe1060f9 Memory handling fixes and optimizations in the VDBE. Ticket #862. (CVS 1909)
FossilOrigin-Name: 5f8d246852c7cefd5941b8c7bb22177dfc7157c5
2004-08-28 18:17:48 +00:00
drh 4aec8b65c7 Add the sqlite3_libversion() API (ticket #834). Fix the build scripts to
correctly build the shared libraries with version 8.4 of Tcl. (CVS 1908)

FossilOrigin-Name: 6db26a19ea7ac77be41a7416dedaef1b9dfd9e16
2004-08-28 16:19:00 +00:00
drh 1bcdb0c0b2 Add new defenses against misuse of the C API. Ticket #870. (CVS 1906)
FossilOrigin-Name: 6ef1f662d71c75bdb7f61b2fff03f5b1b41e5586
2004-08-28 14:49:46 +00:00
drh 3d2efea4fa Add sqlite_temp_directory to the windows driver. (CVS 1905)
FossilOrigin-Name: f5b0e5b0b2f17d179c23c7e4542dbbb452096056
2004-08-28 01:12:56 +00:00
drh db06183c22 Update the TCL binding documentation to describe the newly added ability
to specify TCL variable names in the body of an SQL statement. (CVS 1904)

FossilOrigin-Name: b3b9e58103dd6c65c55caf9a25bc1c257b37df88
2004-08-26 01:12:13 +00:00
drh 1d895039e2 Protect Tcl_Obj pointers from change using Tcl_IncrRefCount() while
executing SQL statements in the TCL bindings. (CVS 1903)

FossilOrigin-Name: 6199f2f243514bbd4befbf768a7e03aec775bed2
2004-08-26 00:56:05 +00:00
drh 2c6674cf7e Host parameter names conform to SQL-2003. (CVS 1902)
FossilOrigin-Name: fd584d1ccf6643b723c2ff0a7a16c2aea3f1142c
2004-08-25 04:07:01 +00:00
drh 9d74b4c516 Fix a bug in the parsing of wildcards that begin with '$'. (CVS 1901)
FossilOrigin-Name: 054dd8901dbfe64a8f61e7b99e23512057bad99a
2004-08-24 15:23:34 +00:00
drh fdb38064b0 Fix a pager bug that might have made multi-database commits non-atomic
if a power failure occurred at just the wrong moment. (CVS 1900)

FossilOrigin-Name: b6eb4bf8c7763ef73723fc3d3697af435c19bae4
2004-08-21 19:20:42 +00:00
drh 290c19482e Optimizations to the code generator. (CVS 1899)
FossilOrigin-Name: bd6649c5aae1bf182610eb267b546c297a34481d
2004-08-21 17:54:45 +00:00
drh 92febd92ad Tcl interface transfers values directly between SQLite and Tcl_Objs, without
at translation to strings. (CVS 1898)

FossilOrigin-Name: e97c331362545ce21117776c7b61d3488668f2bf
2004-08-20 18:34:20 +00:00
drh 895d747226 Add support for named wildcards in SQL statements. (CVS 1897)
FossilOrigin-Name: d3be0b7c5a39c02b9b2d6d85f1595d591984a569
2004-08-20 16:02:39 +00:00
drh e8cf2cacb1 Optimizations in the hash table module. (CVS 1896)
FossilOrigin-Name: d5b0269e0dd7c310460a7ffc4120ed45db823ce9
2004-08-20 14:08:50 +00:00
drh 7ac25c7510 Enhance lemon so that a @X instead of just X in the code expands to the
major token value rather than the minor token value.  Use this to make
the parser a few hundred bytes smaller. (CVS 1895)

FossilOrigin-Name: 28215096e0748b5b02776ddb4c964e0161bc0f16
2004-08-19 15:12:26 +00:00
drh 2889ae7248 Add the SQLITE_BUSY_RESERVED_LOCK compile-time option. (CVS 1894)
FossilOrigin-Name: 25fe7a42ec2e06e659d7a0a6664789114c007e17
2004-08-19 13:29:15 +00:00
drh cb4c40ba0e Make sure the database file is correctly truncated after a ROLLBACK that
occurs after a statement abort. (CVS 1893)

FossilOrigin-Name: 6afe467d146828d67ad17af21604c2e691aa5dff
2004-08-18 19:09:43 +00:00
drh 2b74d70a38 Better debug logging of the pager. (CVS 1892)
FossilOrigin-Name: 1cc0323f2597584b3f3239e8948ac3ff3db8da03
2004-08-18 16:05:18 +00:00
drh 34f4732b06 Be more agressive about not creating or opening the TEMP database if there
are no TEMP tables. (CVS 1891)

FossilOrigin-Name: 6b2b6b2dbd821070a2781685c4b63a50bc8f5cae
2004-08-18 15:58:22 +00:00
drh dc3ff9c34c Avoid creating a TEMP database unless it is absolutely necessary. (CVS 1890)
FossilOrigin-Name: 5914a11caa4c6e778cd7ca010427897c8f971552
2004-08-18 02:10:15 +00:00
drh 181fc99332 Fix a typo in a comment. (CVS 1889)
FossilOrigin-Name: 9af1d4d1456d32c2e15f73f79928572f3bfba6ae
2004-08-17 10:42:54 +00:00
drh ae15787643 If meta(3)>0 then make the database readonly for now. This allows the current
database to interact with future releases that might include autovacuum. (CVS 1888)

FossilOrigin-Name: 7619bf4771781005da23a3e9d7b00de405e27a64
2004-08-14 19:20:09 +00:00
drh 22ac46d15d Fix a bug that was preventing "PRAGMA temp_store=MEMORY" from working. (CVS 1887)
FossilOrigin-Name: bb55894521848b6a9d8b516a3c7eeb3482936d7e
2004-08-14 18:34:54 +00:00
drh 472cbf6b9e The command-line shell should avoid writing changes into string constants. (CVS 1886)
FossilOrigin-Name: 6b8178de9936e48ed69d1546218b5def6665b459
2004-08-14 18:18:44 +00:00
drh ab3f9fea05 Add the ability to specify a alternative temporary file directory using the
"sqlite_temp_directory" global variable. (CVS 1885)

FossilOrigin-Name: fce56ba6a3c53843fabdfad4f545e35a83a01aa9
2004-08-14 17:10:10 +00:00
drh 458b8fc8bc Version 3.0.4 (beta) (CVS 1884)
FossilOrigin-Name: 98edbdd5176704a3a8cbcb19614b51c59d748fda
2004-08-09 00:26:57 +00:00
drh b78825070e Prepare for the release of version 3.0.4. (CVS 1883)
FossilOrigin-Name: 72fb719bdd627694d89ea523dda3cf44537463a9
2004-08-09 00:04:04 +00:00
drh 71c697ef4d Fix problems in the handling of malloc failures. (CVS 1882)
FossilOrigin-Name: 81d91d14cf2352fc7981b361ac9af99b3cbbc9e8
2004-08-08 23:39:19 +00:00
drh 4c755c0f53 Make sure the argument to ctype.h macros is always an unsigned character.
Ticket #839. (CVS 1881)

FossilOrigin-Name: b065973898c06a81c69b70b3fa91c79334bd9b9a
2004-08-08 20:22:17 +00:00
drh 8dcd7cab83 Attempting to open a locked table for writing should fail immediately.
Ticket #842. (CVS 1880)

FossilOrigin-Name: fc879a9b1d05ddb8f8c552c1d334597e41b29b27
2004-08-08 19:43:29 +00:00
drh 1d64fc1a5e Do not invoke the busy callback when trying to promote a lock from SHARED
to RESERVED.  This avoids a deadlock. (CVS 1879)

FossilOrigin-Name: d33771a303d9c20dd477b1a973024ff763203211
2004-08-07 23:54:48 +00:00
drh 00afe0b374 Fix a bug in the logic that converts numbers into strings inside the VM.
Ticket #844 (CVS 1878)

FossilOrigin-Name: 863540be248d3079e1a997349be6c74199149511
2004-08-06 17:00:40 +00:00
drh b860bc97d5 In the command-line shell: importments to the "help" message and better
error checking in the new .import command. (CVS 1877)

FossilOrigin-Name: ed489f776aed2de2f16e5c4b93ec6bc872118fb2
2004-08-04 15:16:55 +00:00
drh a9600bc692 Separate P4 timing asm code out of the SQLITE_DEBUG macro so that SQLITE_DEBUG
can be used on non-x86 machines and with compilers other than GCC.
Ticket #838. (CVS 1876)

FossilOrigin-Name: add266ccc3146fa56572d109e84c8a79dc3df2ca
2004-08-04 14:44:33 +00:00
drh d2f0a72331 Separate the ifdefs for INTPTR_TYPE and UINTPTR_TYPE in sqliteInt.h. (CVS 1875)
FossilOrigin-Name: 4e7953c13fd2cb32e5c97737c4b2f99b1b1edc9b
2004-08-04 14:29:22 +00:00
drh db2d9a0bbb Fix a memory leak when the auxiliary data of a database structure is used. (CVS 1874)
FossilOrigin-Name: 7ecff04a6153aa200233e6c0846a65e0213c3179
2004-08-01 03:52:17 +00:00
drh feac5f8dbc Add the ".import" command to the command-line shell. (CVS 1873)
FossilOrigin-Name: b56afe640f7f3f2837120e3dd923c529c4a3123a
2004-08-01 00:10:45 +00:00
drh 9796ef5804 Additional test case to cover ticket #831. (CVS 1872)
FossilOrigin-Name: a62129af99b4a576a48eb4931f417af257f510c7
2004-07-27 13:38:47 +00:00
drh adfa3daf49 Honor the ORDER BY clause in a subquery that is the right-hand side of an IN
operator.  Ticket #827. (CVS 1871)

FossilOrigin-Name: 76fe68cff6ce75dada510544b063dc1069eb2e0e
2004-07-26 23:32:26 +00:00
drh cced337e35 Get VACUUM working with UNIQUE indices. Ticket #829. (CVS 1870)
FossilOrigin-Name: 88a19a4386708c3c10448740d2bbe149055bcc6e
2004-07-26 23:07:51 +00:00
dougcurrie d89fd07dc3 add sqlite3_get_auxdata sqlite3_set_auxdata C API exports (CVS 1869)
FossilOrigin-Name: 15bfb2d153b9ffbb6b59146e1288d0e2e4cdf66f
2004-07-26 15:31:21 +00:00
drh 1211de3709 Fix problems for 64-bit machines and when SQLITE_OMIT_AUTHORIZATION is defined. (CVS 1868)
FossilOrigin-Name: e3cad1ab6226089265b4d15c6fc67cc33a31425f
2004-07-26 12:24:22 +00:00
drh be5c89acd0 Various size optimizations. (CVS 1867)
FossilOrigin-Name: 1186e3ce0b660f1cf8d03a275b0331da64d21f1b
2004-07-26 00:31:09 +00:00
drh 956bc92cde Prepared statements now work with CREATE and DROP. All tests pass.
No memory leaks. (CVS 1866)

FossilOrigin-Name: ebdb661e0eefe123c422d3c1c371e325bb6cf673
2004-07-24 17:38:29 +00:00
drh 3f7d4e49d8 Fix more problems with deferred execution of CREATE. Still need to do DROP.
There is now a memory leak. (CVS 1865)

FossilOrigin-Name: 6db3f122aad25b5226670ce682b7263d55c0d301
2004-07-24 14:35:58 +00:00
drh 234c39dff7 Progress towards getting prepared statements and CREATE and DROP to play
nicely together.  Work is incomplete.  Some tests are known to fail. (CVS 1864)

FossilOrigin-Name: 49b991492496e104f5eca620a5d465a742b7ff3a
2004-07-24 03:30:47 +00:00
drh 3e27c02625 First cut at a analysis tool for version 3.0 databases. (CVS 1862)
FossilOrigin-Name: 7c7f698b2eda7b1b34f5ca7fe104145d8bbd8f56
2004-07-23 00:01:38 +00:00
drh 8ea1a04ff8 Home page updates. (CVS 1861)
FossilOrigin-Name: 15774aab7d20eb4dfcb47378c8255e26b8cbbe19
2004-07-22 19:06:31 +00:00
drh ad19857f5a Version 3.0.3 (CVS 1860)
FossilOrigin-Name: 068b15ae2a5187d9fc1e88c8c3fd21d647733788
2004-07-22 18:54:04 +00:00
drh 20753fb2d0 Updates to the publish.sh script and the download.html webpage. (CVS 1858)
FossilOrigin-Name: 23c2ec459101d45c17e6e4cc6a20ed1b981cfd35
2004-07-22 18:53:17 +00:00
drh 8685a946b8 Fixes to the publish.sh file for version 3.0. (CVS 1857)
FossilOrigin-Name: cc82288b9fff13ae1dc0ae61dfc6be1ac0e603f7
2004-07-22 18:44:23 +00:00
drh 91551097ea Update changes log for 2.8.15. Add new architecture images. (CVS 1853)
FossilOrigin-Name: 8dd9b4de278570e8a741d28752724117e8c5fae0
2004-07-22 16:12:19 +00:00
drh 1b06fbcd72 file join4_28.test was initially added on branch version_2. (CVS 1852)
FossilOrigin-Name: dc3caba7f0c8f1decb20e57915278acb8388fdd9
2004-07-22 16:08:38 +00:00
drh 7dcc2c9e27 file join3_28.test was initially added on branch version_2. (CVS 1851)
FossilOrigin-Name: ee5c2cff810511b8f457c5c5af0791fc7f05d6c4
2004-07-22 16:08:38 +00:00
drh f8c3a21022 Update VERSION and changes.html in preparation for the next release. (CVS 1848)
FossilOrigin-Name: 428f80239e68671a258ed3d1a00f42b32e4ea0c9
2004-07-22 15:47:28 +00:00
drh 1dba027428 Change sqlite* to sqlite3* in the API reference for version 3.0. Ticket #818. (CVS 1847)
FossilOrigin-Name: 7c96daddb6b857f904f0ea72d6bad21ab7dc3f16
2004-07-22 15:45:15 +00:00
drh 25d6543de5 Fix bugs associated with the codec. (CVS 1846)
FossilOrigin-Name: b0a3becd82b9a4203c23f35dc5a5fd725e046f21
2004-07-22 15:02:25 +00:00
drh 89aa31e509 Changes in support of using a codec. (CVS 1845)
FossilOrigin-Name: 58505bf9be8e7f9d33a7a52f0d2ac167448f7b3a
2004-07-22 02:40:38 +00:00
drh 2011d5f5e5 Changes in support of using a codec. (CVS 1844)
FossilOrigin-Name: b77bec35742f07d79da3e85baee09a90c1494415
2004-07-22 02:40:37 +00:00
drh 90f5ecb39d Initial implementation of variable page sizes and the temp_store pragma. (CVS 1843)
FossilOrigin-Name: 4cf6e9db757931aba2f300b7869305434d6f2d2b
2004-07-22 01:19:35 +00:00
drh 900dfba8ef Updates comments in sqlite.h.in that describe the destructor parameter
to sqlite3_bind_.... (CVS 1842)

FossilOrigin-Name: 166eb60614d958674469d6661c694aa5955ada7b
2004-07-21 15:21:36 +00:00
drh a4aac81cdf Update the TCL API documentation. (CVS 1841)
FossilOrigin-Name: df306ad9ee522b20f017be0be83d9e071d525f8e
2004-07-21 14:54:49 +00:00
drh 422b3024e2 Updates to the C-language API documents for version 3.0. (CVS 1840)
FossilOrigin-Name: 814c58d470922d77cfcc6c4d5d26c1ec4c28ca60
2004-07-21 14:07:57 +00:00
drh 17c402944a Minor coding enhancements. (CVS 1839)
FossilOrigin-Name: 65c3af74c16c9fe0341b1e7e6d029927503f7404
2004-07-21 02:53:29 +00:00
drh 193bd777aa Simplify the where.c logic by flipping expression over so that the controlling
variable is always on the left. (CVS 1838)

FossilOrigin-Name: ec8bfa3891dbf0f3172e31cf322974c03f9af59a
2004-07-20 18:23:14 +00:00
drh 0bb132bedc Lemon collapses common destructors and reduce actions into a single case. (CVS 1837)
FossilOrigin-Name: 3c5aa850eeec5c75c5200a3707852cc5fc9e780b
2004-07-20 14:06:51 +00:00
drh 6d08b4d647 Add the '%ifdef' capability to lemon. Other minor changes. (CVS 1836)
FossilOrigin-Name: 522ff721ccc33c4b89072fed4e451f0df82e8140
2004-07-20 12:45:22 +00:00
drh cf55b7aef7 Handle quotes on the table name in TABLE.* terms in SELECT statements.
Ticket #680. (CVS 1833)

FossilOrigin-Name: 826b6797a9f08c69b9378cb403d746e91a54dcde
2004-07-20 01:45:19 +00:00
drh 6458e39c12 Report an error when attempting to open a directory as a database.
Ticket #687. (CVS 1832)

FossilOrigin-Name: 4d77037be34b357d24d18d1e13b5f0df580b83ff
2004-07-20 01:14:13 +00:00
drh 78d153eecd Add test for creating indices with quoted names. Ticket #695. (CVS 1831)
FossilOrigin-Name: 7e72c5b7b5e355e41c30d4ef47268e11f4c97425
2004-07-20 00:52:44 +00:00
drh fd1f394af2 Comment out all of date/time functions with SQLITE_OMIT_DATETIME_FUNCS.
Ticket #784. (CVS 1828)

FossilOrigin-Name: 4e2ad572ea1800a2da1ea18548415c6fbf396259
2004-07-20 00:39:14 +00:00
drh 2c61c070d2 Correct handling of views on tables with quoted column names. Ticket #756. (CVS 1826)
FossilOrigin-Name: 8ac5a8ad5eec381585adb6812fc39a1a30aee4c1
2004-07-20 00:20:23 +00:00
drh bab39e1358 Refinements to the LIMIT patch (1823) for ticket #749. (CVS 1825)
FossilOrigin-Name: 9d4f43f030438b3e7358032de2e04132b80e04a8
2004-07-19 23:38:11 +00:00
drh ea48eb2eef LIMIT occurs after DISTINCT. Ticket #749. (CVS 1823)
FossilOrigin-Name: e6bc8aa80824a9156e78fc99b5ac7045b97d29c3
2004-07-19 23:16:38 +00:00
dougcurrie 88215bdfde more uses of sqlite3.pc (CVS 1822)
FossilOrigin-Name: a0f107ca66f825cc1fd10b15157b22fd9cc0f95c
2004-07-19 22:28:43 +00:00
drh d5b447d9ac The OsFile under Unix records a pointer back to the pager. This is intended
to be used for an externalized locking patch. (CVS 1821)

FossilOrigin-Name: 511ee6392472d250b542961d1f715cc7453598e6
2004-07-19 22:08:09 +00:00
drh 8d7e24f1d3 Remove debugging code that was accidently left in join4.test. (CVS 1819)
FossilOrigin-Name: e36e59f02eec166ef2c4e0991c97ceb536e3c3f3
2004-07-19 19:28:44 +00:00
drh 2ffb11855a Fix for ticket #813. (CVS 1818)
FossilOrigin-Name: 88e4bfa154e33c627ff2abb15cc55a100359d370
2004-07-19 19:14:01 +00:00
drh c275b4ea91 Store schema cookies on the TEMP database. Ticket #807. (CVS 1817)
FossilOrigin-Name: c6c13dc460094e6adea2b14849edf9f485238b99
2004-07-19 17:25:24 +00:00
dougcurrie 27438cf186 use -lsqlite3 in .pc file (CVS 1816)
FossilOrigin-Name: b36e6e4907716e048fb21903e234578596c7333d
2004-07-19 04:25:47 +00:00
dougcurrie 12b3444483 Use 'sqlite3.pc' instead of 'sqlite.pc' (CVS 1815)
FossilOrigin-Name: 991b6108e7cac3837d39fd9a5adbd72b082a4983
2004-07-19 03:24:59 +00:00
dougcurrie 6f137d44e7 Use 'sqlite3.pc' instead of 'sqlite.pc' (CVS 1814)
FossilOrigin-Name: 7525a1a9106f492d288676fd8aa00b470db2dc4b
2004-07-19 03:23:12 +00:00
drh 8feb4b1d9e Correctly handle joins of more than 32 tables. Ticket #806. (CVS 1812)
FossilOrigin-Name: 880644097004cba1e215a5697d0553b3b98c9884
2004-07-19 02:12:14 +00:00
drh 755b6ba9f0 A failed ATTACH leaves the database in a consistent state. Ticket #811. (CVS 1811)
FossilOrigin-Name: c22f9feb1bb00d1d54a8a87b557195573463fda9
2004-07-19 00:56:23 +00:00
drh 5f6a87b3dd When comparing two expressions do not apply affinity to either operand.
Ticket #805. (CVS 1810)

FossilOrigin-Name: 88a4e400f916d7af088b39a9653d6452b3666577
2004-07-19 00:39:45 +00:00
drh 83ca160a33 Unsuccessful attempt to reproduce ticket #807. (CVS 1809)
FossilOrigin-Name: d7e9772c74a2b9377f17149cc1baa3b2d0dfbfb8
2004-07-18 23:47:53 +00:00
drh 8cd9db004a Use only unsigned characters for upper() and lower(). Ticket #708. (CVS 1808)
FossilOrigin-Name: 2464f79e5ddf65e90ed84ccd793995fc2f713400
2004-07-18 23:06:53 +00:00
drh 1020d49a31 The %W date specifier in strftime should be measured from the first Monday
of the year.  Ticket #758. (CVS 1805)

FossilOrigin-Name: 50b016b00470e6303ede1173d0447d8239563263
2004-07-18 22:22:43 +00:00
drh 1af3fdb4dc An improved fix for the min() problem of ticket #800. (CVS 1804)
FossilOrigin-Name: b6e8b7a13cd9f90e2f7d963d9ddbe591571f3a27
2004-07-18 21:33:01 +00:00
drh 9eb516c0eb min() ignores NULL values. Ticket #800. (CVS 1802)
FossilOrigin-Name: 166234a2b61e1d6a501e48dde1caec0a02bec90b
2004-07-18 20:52:32 +00:00
drh e29b1a05a7 mprintf() correctly handles "%s","". Fix for ticket #812. (CVS 1800)
FossilOrigin-Name: 4f56db1149f65dc2edf6626fa20ae255a5f5280c
2004-07-17 21:56:09 +00:00
drh dd809b087f Use the F_FULLFSYNC fctrl if it is available. Record the name of files
that are opened in the OsFile structure. (CVS 1799)

FossilOrigin-Name: 1d30d0dd46c2bd12ce3f7dc06492f3e27ab6bcee
2004-07-17 21:44:57 +00:00
drh 4ebfef14e3 Added tests for sqlite3_changes after a DELETE. (CVS 1798)
FossilOrigin-Name: c01f13267f592dc2678e78ea45dadddcdc154f82
2004-07-15 20:08:39 +00:00
drh 75f6a032c4 Implement the experimental sqlite3_bind_parameter_count() API in support
of DBD::SQLite.  Also fix the sqlite3.def export list. (CVS 1797)

FossilOrigin-Name: c44943e6fe0c88830102253591a501dc7d724d2f
2004-07-15 14:15:00 +00:00
drh 939a16d622 Make SrcList.nSrc a signed quantity to avoid problems in AIX. (CVS 1796)
FossilOrigin-Name: f2bb83cfd7e6b7ff853099897a24346a2991bc57
2004-07-15 13:37:22 +00:00
drh 2b735010f5 Fix the return type on sqliteStrICmp when the input strings are not
equal.  Ticket #804. (CVS 1794)

FossilOrigin-Name: 660b89a0fc031e798ce14f25273468e85e038efa
2004-07-15 13:23:21 +00:00
drh ee4a1872c5 Bug fixes in the windows build process within the publish.sh script (CVS 1792)
FossilOrigin-Name: cda795a1d5549231b767114febd9980c9c70d4d2
2004-07-01 11:25:35 +00:00
drh 5efb145d6e Version 3.0.2 (Beta) (CVS 1791)
FossilOrigin-Name: 26a559b65835d3da4c853ed87ccdc6bfdf37461c
2004-06-30 23:59:00 +00:00
drh b733c18436 Add -DNDEBUG to the default makefile. (CVS 1790)
FossilOrigin-Name: f5ab04dae88c68543a2264a39006a435469bfaa8
2004-06-30 23:17:05 +00:00
drh 070aaad8e8 Omit the "LL" literal qualifier as it causes problems for some compilers. (CVS 1789)
FossilOrigin-Name: 2010ed8040a0956f57f4ca594973ad93c0551f64
2004-06-30 23:04:32 +00:00
drh 49d55ac3f5 Add a Credits section to the version3.html document. (CVS 1788)
FossilOrigin-Name: 750ec96172e200f67cbd64659a87a1633edd544e
2004-06-30 22:54:06 +00:00
drh 76d7f8b385 Do not use "new" as a variable name - some compilers think it is a keyword. (CVS 1787)
FossilOrigin-Name: 8a6e4ea79e5f4333fbc767832d5e55c77da204e1
2004-06-30 22:43:21 +00:00
drh 7acde5a33b Up the version number to 3.0.2 and make changes to the website in
preparation for the first beta release. (CVS 1786)

FossilOrigin-Name: 0b73b7a074896f45573e612992d08a22124fc485
2004-06-30 22:35:06 +00:00
drh 93d648d4b4 Specify ASCII versions of Win32 API functions. (CVS 1785)
FossilOrigin-Name: 48b31540db5f0212a7e37e4833b760615afe13a3
2004-06-30 14:28:59 +00:00
danielk1977 7dca81b84c Fix a typo in capi3.tcl. (CVS 1784)
FossilOrigin-Name: 982389b25d26201116fdfd390aa4b9964b5adf69
2004-06-30 13:28:32 +00:00
danielk1977 25b3363d2c Have the debug version of sqliteRealloc() return partially uninitialised
memory in the same way as the non-debug version can. (CVS 1783)

FossilOrigin-Name: e78b0ff30fb630bc9835a7545525eea64924bafc
2004-06-30 12:49:46 +00:00
danielk1977 5b59af85c7 Fix a memory allocation problem in os_test.c (CVS 1782)
FossilOrigin-Name: ed511c2ea9581933ca504ce4b43d863503c6cc22
2004-06-30 12:42:59 +00:00
danielk1977 13073931a3 Coverage improvements for malloc and vdbemem.c (CVS 1781)
FossilOrigin-Name: a98dd004c4d328eb44a71fecdbf8c5ab416dc524
2004-06-30 11:54:06 +00:00
drh 376deb182a Add the crashtest target to Makefile.in. Add LL suffix to long long constants
in the vdbe.  Comment changes to vdbeaux.c. (CVS 1780)

FossilOrigin-Name: 42553001954356c942b874e95277efe235ef7692
2004-06-30 11:41:55 +00:00
drh 3ea64406fc Skip bigfile.test on Mac OS X. Darwin does not handle large sparse files
efficiently and so this test takes a really long time. (CVS 1779)

FossilOrigin-Name: a3c38a6d286ab37a9cdcc8b2243ea3258cc61ff0
2004-06-30 11:28:13 +00:00
drh 91b48aa1af When a statement causes a ROLLBACK due to an ON CONFLICT clause, other active
VMs abort. (CVS 1778)

FossilOrigin-Name: 0fedf74e30026afe2c8caacff3d62cf5c1b1f528
2004-06-30 11:14:18 +00:00
danielk1977 05056307fd Make sure vacuum.test closes all files. (CVS 1777)
FossilOrigin-Name: 4077f9a30b0c30a8749a596031aa4f7adc3a4891
2004-06-30 10:54:29 +00:00
danielk1977 96fb0dd55a Coverage tests for vacuum.c (CVS 1776)
FossilOrigin-Name: 152e9940b919a53fcd0da4091dbf75ab8ef15b38
2004-06-30 09:49:22 +00:00
danielk1977 bc6ada4103 Fixes for compiler warnings. Also more coverage. (CVS 1775)
FossilOrigin-Name: fa19c77bf045787faa4cdc40bcfbd9eeae8594ae
2004-06-30 08:20:16 +00:00
danielk1977 46c43edd39 Add some tests for overlapping SELECT, COMMIT and ROLLBACK commands. (CVS 1774)
FossilOrigin-Name: d256c14943968e7adf4b73988cac6af941c9b12d
2004-06-30 06:30:25 +00:00
drh 9d213ef022 Improve test coverage of util.c (CVS 1773)
FossilOrigin-Name: 68ac32213766c5e83de54373b90030a458538017
2004-06-30 04:02:11 +00:00
drh cc19587998 Improved test coverage of func.c and hash.c. (CVS 1772)
FossilOrigin-Name: 0c999f28137bd82ba24dd263bab30d22329eed73
2004-06-30 03:08:24 +00:00
danielk1977 5b809e3198 Allow strings that look like integers to be inserted into IPK columns in a
UTF-16 database. (CVS 1771)

FossilOrigin-Name: e5e39764038311cbb3555b5bd41de2563a89113e
2004-06-30 02:43:38 +00:00
danielk1977 93cd039570 Minor fixes for UTF-16 databases. (CVS 1770)
FossilOrigin-Name: 6c5c11e07e157c15cf99078fce2a1bc478e287ce
2004-06-30 02:35:51 +00:00
drh 54bbdf4f7f Some extra tests for the OP_MustBeInt opcode. (CVS 1769)
FossilOrigin-Name: b9d5858ca171e11afaeb9712efa0fc1a0e79102b
2004-06-30 02:29:03 +00:00
drh db96db107c Remove some pointless asserts from btree.c. (CVS 1768)
FossilOrigin-Name: 73eec675059f6d2178c6175268e80750378bf07b
2004-06-30 01:07:01 +00:00
danielk1977 2d1f92a13d Run tests in UTF-16 mode. (CVS 1767)
FossilOrigin-Name: 822bee3a4eb88054cc573a7b2d7f15ea2547bc1a
2004-06-29 23:52:48 +00:00
danielk1977 7939aa87e3 Fix capi3.test so that it works with production (as well as debugging ) builds. (CVS 1766)
FossilOrigin-Name: 9cf371d85d99235771f173572265c5e4dd5ab273
2004-06-29 14:03:58 +00:00
drh 4230e2c7f3 Fix TRACE7 in os_common.h. (CVS 1765)
FossilOrigin-Name: 76e0b74961af3ff285757ac428b82fe7eaffc025
2004-06-29 13:54:50 +00:00
danielk1977 c8c1158be2 Ensure the tcl interface returns an error when sqlite3_create_function()
fails. (CVS 1764)

FossilOrigin-Name: 357a82cd224e33e11870ad7c2f934c27af682881
2004-06-29 13:41:21 +00:00
danielk1977 312d6b36e3 Test cases intended to improve coverage of main.c. (CVS 1763)
FossilOrigin-Name: 15a084e9ea14d093f75c54a321f146c18f4453d7
2004-06-29 13:18:23 +00:00
drh 779c6a0647 Improved test coverage of table.c and printf.c. (CVS 1762)
FossilOrigin-Name: ba87834d863cb50f3016ccb04f790be5fa4070c6
2004-06-29 13:04:32 +00:00
drh 0f14e2ebed Improved test coverage of tclsqlite.c (CVS 1761)
FossilOrigin-Name: 008e57dcd5e16886ed732fe1e9797a3c00e8c579
2004-06-29 12:39:08 +00:00
drh b97759ed11 Add testing for sqlite3_trace() and fix a bug. (CVS 1760)
FossilOrigin-Name: 7a15391079ae9ce5360fa13e8779c8872885e789
2004-06-29 11:26:59 +00:00
drh fd69dd6b3d Comment out unused routine in os_unix.c. (CVS 1759)
FossilOrigin-Name: 20db8124ace5fbfa99035ae28e5c98f4c5fcde00
2004-06-29 11:08:19 +00:00
drh ef0715c20a Do not set new error messages after a malloc failure. (CVS 1758)
FossilOrigin-Name: f46251ee0a654e9aa927df31968f7792f771caa9
2004-06-29 10:53:54 +00:00
danielk1977 8a41449ecc Fix error reporting path for errors that occur while reading the database
schema. (CVS 1757)

FossilOrigin-Name: 157db33e09399f31bcdaf58ea90fe618fefcd9bd
2004-06-29 08:59:35 +00:00
danielk1977 2b444853e0 Bug-fixes to get the two threadtest C programs working again. (CVS 1756)
FossilOrigin-Name: ffd3312b66e2657c3431eab814aadec254af2403
2004-06-29 07:45:33 +00:00
drh 5fdae7711a Try to get threads working again on Linux. (CVS 1755)
FossilOrigin-Name: a8417cb83e9d070f46e7505f92a95f057b992658
2004-06-29 03:29:00 +00:00
danielk1977 f46188911d More coverage testing. (CVS 1754)
FossilOrigin-Name: 332921041040b343b6b568685ff55d21a624f502
2004-06-28 13:09:11 +00:00
drh 2ec81649a5 Get all tests working under win2k. (CVS 1753)
FossilOrigin-Name: 168112c8b76af132c675a6508d3ee7764ef7a845
2004-06-28 11:52:45 +00:00
danielk1977 489468cf26 Add a simple test case for inter-process locking. (CVS 1752)
FossilOrigin-Name: b0fcc99d227c061203fb1e0f4583b66723033159
2004-06-28 08:25:47 +00:00
danielk1977 8191bff0c2 Fix some problems with multi-file transaction rollback. (CVS 1751)
FossilOrigin-Name: 06e8e30b249c10512a225d6c7a5fcb5c666595e6
2004-06-28 04:52:30 +00:00
danielk1977 c3e8f5ef52 A few more warning fixes. (CVS 1750)
FossilOrigin-Name: 81e4994045697470bcfd692a794731c8291a8a30
2004-06-28 01:16:46 +00:00
danielk1977 e0d4b060db Fix a bunch of harmless warnings. (CVS 1749)
FossilOrigin-Name: fae7c6e004aa4752fd3db09a42bfdb900861b3c0
2004-06-28 01:11:46 +00:00
danielk1977 55e0af4653 Fix a seg-fault caused by a malloc() failure. (CVS 1748)
FossilOrigin-Name: e28d42cb5e274b871f54add0e046d6e153060e21
2004-06-28 00:17:32 +00:00
danielk1977 fe587031cf Fix unitialised variable in sqlite3VdbeFinalize(). (CVS 1747)
FossilOrigin-Name: 9501587944f1009aa0b4fa431bb19e7ec993a077
2004-06-27 23:50:21 +00:00
drh 6a179ea796 Remove unused routines from vdbeaux.c. Improve test coverage. (CVS 1746)
FossilOrigin-Name: 792b3c75e7764bab1473c0d6efc76f1164c943bf
2004-06-27 21:31:39 +00:00
drh 6a6124e27a Fix a bug in the handling of Mems inside of vdbe.c. (CVS 1745)
FossilOrigin-Name: ad65c6e24e15966d5fd15d60f81487ff97788da4
2004-06-27 01:56:33 +00:00
drh 5260f7e925 Coverage testing of pragma.c. (CVS 1744)
FossilOrigin-Name: 0f9c0f0aa9188c46c65cb92203687f37884f685a
2004-06-26 19:35:29 +00:00
drh b089c0b722 Fold in a 64-bit change that came from the PHP people. (CVS 1743)
FossilOrigin-Name: b69b4fe8adff83a26e3566613bea8b477a26e8a4
2004-06-26 14:46:39 +00:00
danielk1977 b5548a8b20 Fix a problem where a file was not being closed after a malloc() failure. (CVS 1741)
FossilOrigin-Name: 3c8512bc549e10ee131cb7f2d4e74d96e9de74a0
2004-06-26 13:51:33 +00:00
drh 3dea76474c Add news about the break-in to the homepage. (CVS 1740)
FossilOrigin-Name: 5cda1cda63bef554f8b3436bd958014f453087c2
2004-06-26 12:40:06 +00:00
danielk1977 b2c7f5b31e Fix error message returned when a database cannot be opened. (CVS 1739)
FossilOrigin-Name: 440bfd2ac57d228d10913aca81ca8c6d7f38aa61
2004-06-26 10:02:16 +00:00
danielk1977 e35ee196dc Minor fixes related to the tests in misuse.test (CVS 1738)
FossilOrigin-Name: 0af3ff39422e02afdfdaf2005ab5eb01b496dc72
2004-06-26 09:50:11 +00:00
danielk1977 40b38dcdf8 Remove the 'nMaster' argument from various pager and btree functions. (CVS 1737)
FossilOrigin-Name: 4e20720984e1fd6822ead785d758374d2704b7fb
2004-06-26 08:38:24 +00:00
danielk1977 1e8770ec89 Remove default_synchronous and temp_store pragmas. Allow the safety-level
and cache-size to be set for attached databases. (CVS 1736)

FossilOrigin-Name: 76da457b8fc8fe838226da14c31c315cf914a505
2004-06-26 06:37:06 +00:00
danielk1977 91cf71b01f Remove default_synchronous and temp_store pragmas. Allow the safety-level
and cache-size to be set for attached databases. (CVS 1735)

FossilOrigin-Name: 212de3ce66f746036cb2267a9f924fd55fa2f37a
2004-06-26 06:37:06 +00:00
danielk1977 75edc16f07 Fix a bug in the new full-sync journal format. (CVS 1733)
FossilOrigin-Name: 02bd3acd7efde9cc6b67c97e98db9f4b62d27877
2004-06-26 01:48:18 +00:00
danielk1977 c8e9a2df77 Fix CVS merge problem. (CVS 1693)
FossilOrigin-Name: dfab1e9ac0fbe57fe4a1cbe6c363ef43b3b075ef
2004-06-25 12:08:46 +00:00
danielk1977 cafadbac02 Add a checksum to the master journal name stored at the end of a journal
file. (CVS 1692)

FossilOrigin-Name: 4905e74925a4e9d467c51dc174f265b9395ae9fa
2004-06-25 11:11:54 +00:00
danielk1977 4cb1607bc0 Remove crash.test from memleak.test. (CVS 1691)
FossilOrigin-Name: 2a9cea61f90be4881b01f8a7c1ca4dab77706d2f
2004-06-25 10:26:12 +00:00
danielk1977 fa916940fa Remove duplicate sqlite3_changes() declaration. Ticket #779. (CVS 1690)
FossilOrigin-Name: 0322c83776f0c17286e9accb3ed3c72b5be6cdab
2004-06-25 10:25:10 +00:00
danielk1977 90ba3bd065 A few more comment changes. No code alterations. (CVS 1689)
FossilOrigin-Name: b68b4a4262c2ab60f9a7cc0c206b9db207f86933
2004-06-25 08:32:25 +00:00
danielk1977 f42f25c2c5 Add a comment on the implementation of sqlite3OsLock(). No code changes. (CVS 1688)
FossilOrigin-Name: 084f3fffbdeb1e2b375817ae1111b867c9d32559
2004-06-25 07:21:28 +00:00
danielk1977 f187bd9d64 Activate test cases for new journal format. (CVS 1687)
FossilOrigin-Name: 197d00d6a6a440848a0b4710157272558868221c
2004-06-25 06:23:22 +00:00
danielk1977 7657240a21 Modifications to the journal format to make it more robust. (CVS 1686)
FossilOrigin-Name: 504246a18daca794473b17a7874096f1ec8648ee
2004-06-25 02:38:54 +00:00
drh e970767144 Fix signed integer problems in vxprintf. Ticket #778. Also remove some
dead code from util.c. (CVS 1685)

FossilOrigin-Name: 200cd3baf60e6cfad9fa3971834367821456ae30
2004-06-25 01:10:48 +00:00
dougcurrie 256a4ec4a3 add all sqlite3_ functions in capi reference to dll exports (CVS 1684)
FossilOrigin-Name: b6ca51e47a6f6551058d529662abe113399b38e9
2004-06-24 15:09:45 +00:00
dougcurrie afded26eac add sqlite3_exec to dll exports (CVS 1683)
FossilOrigin-Name: 6c6a84b5641f676d2bd1791863c1be849fbfbee4
2004-06-24 14:43:56 +00:00
dougcurrie 575414ae8d make doc directory earlier in build; see (1667) (CVS 1682)
FossilOrigin-Name: 68c90d16b482a388e73ac1e7535bd0183d6a3c1a
2004-06-24 14:17:44 +00:00
danielk1977 cf991b375a Minor fix for 'make doc'. (CVS 1681)
FossilOrigin-Name: 31fe5cbd870916b2445dec83cdd8e031ef43c177
2004-06-24 01:30:44 +00:00
danielk1977 3aeab9e438 Apply (1679) to version 3. Ticket #777. (CVS 1680)
FossilOrigin-Name: 0a26b9158095f0995fce2f0ccdfb383ab26c76a5
2004-06-24 00:20:04 +00:00
danielk1977 1ba1b5511c Improve test coverage of utf.c. (CVS 1678)
FossilOrigin-Name: 53c553c760a84e213c2277588bcc292892c2b0ce
2004-06-23 13:46:32 +00:00
danielk1977 e12c17bab3 Fix a bug in the previous checkin. (CVS 1677)
FossilOrigin-Name: f31c84a64f53cf2e75a5e988fbb6ad82537f2403
2004-06-23 12:35:14 +00:00
danielk1977 9d951766ea Add some tests for user functions that prefer various text encodings. (CVS 1676)
FossilOrigin-Name: db6bab574869fde49a147d4e19dd73005f247092
2004-06-23 12:15:55 +00:00
danielk1977 ef317ab577 Test cases to verify recovery after a crash. (CVS 1675)
FossilOrigin-Name: 41868d79ac5b3c496c4d87ca6b4ee7c17ef38965
2004-06-23 10:43:10 +00:00
danielk1977 ece80f1e48 Handle corrupt journal file headers correctly. (CVS 1674)
FossilOrigin-Name: 46107da7eddbdda8b582e2ece2dc41222a70330a
2004-06-23 01:05:26 +00:00
danielk1977 d7e69648c1 Add a comment to the output buffer allocation in sqlite3VdbeMemTranslate() (CVS 1673)
FossilOrigin-Name: e2f7f182987fbfe8611ead8bd1f12b2e8b47f6dc
2004-06-23 00:23:49 +00:00
drh 22276bd773 Fix another uninitialized Mem.xDel problem. (CVS 1672)
FossilOrigin-Name: cb4e242e83ba111c5da1f9662fda5a890051e7b0
2004-06-22 22:54:22 +00:00
drh 1b743be858 Be careful to initialize the Mem.xDel field to zero for static Mems. (CVS 1671)
FossilOrigin-Name: e17ea666b1eb1df12a1d4d78bda2e025e2aa30bd
2004-06-22 22:04:46 +00:00
drh 7cf8c55add Make sure the result of a user-defined function uses the text encoding of
the database. (CVS 1670)

FossilOrigin-Name: d333ac8002feff9423e286369e5ae5a6bfe3be50
2004-06-22 17:59:55 +00:00
drh c4d8d097dc Version 3.0.1 ALPHA (CVS 1669)
FossilOrigin-Name: ac6683e380f6199a980d587b2933c3cb0a4024f2
2004-06-22 14:59:40 +00:00
drh fa9249dd98 Fix typos in web documentation. Tickets #770 and #771. (CVS 1668)
FossilOrigin-Name: 04673066ff6a7c127559ba448fe50a4d95a26347
2004-06-22 14:57:53 +00:00
drh f1f7d25536 The download.tcl script used to generate download.html must run out of
the doc subdirectory of the build. (CVS 1667)

FossilOrigin-Name: 80c7b13ff39c88474587b1899505bac83a0b8812
2004-06-22 14:52:26 +00:00
drh d8c8d5cec8 Update the changes.html webpage for version 3.0.1. (CVS 1666)
FossilOrigin-Name: d5d28e9822ba9177acfd72ebd87c293a4fac4784
2004-06-22 14:47:01 +00:00
drh 8eebadf133 Rename sqlite.dll to sqlite3.dll. (CVS 1665)
FossilOrigin-Name: a82cb4d30a1191322e61faedc9c48472d0686c98
2004-06-22 14:41:35 +00:00
drh 03601b8d57 Prepare for another ALPHA release. Version number 3.0.1. (CVS 1664)
FossilOrigin-Name: 6dd7b02537c20af2074ada70c3fd4294dd46742d
2004-06-22 14:41:00 +00:00
drh d86596e0e2 Do not apply unary '-' to an unsigned "sizeof" result. (CVS 1663)
FossilOrigin-Name: 129c5d5e3af4a7eeeebf5e4cbe9f0da5c123a68b
2004-06-22 14:40:11 +00:00
danielk1977 e5b7a0e8ee Fix error introduced during merge of main.mk. (CVS 1662)
FossilOrigin-Name: eef6da38d5b1d84e8a1eb9fe88f0f568717ea323
2004-06-22 13:23:47 +00:00
drh 645f63ed02 Fix some segfaults that could have occurred after a malloc() failure. (CVS 1661)
FossilOrigin-Name: 80151e728101c3cd5a8cf36cca2bfa661b21c746
2004-06-22 13:22:40 +00:00
danielk1977 d1e3bee1a0 Add crash.test script. (CVS 1660)
FossilOrigin-Name: 64a6d805178af8947ccca19898c06979c226d92b
2004-06-22 13:12:51 +00:00
drh 241db313b4 Add comments to test1.c. (CVS 1659)
FossilOrigin-Name: be6bd6c99dde902aafd02d8a72f3d42826caabe8
2004-06-22 12:46:53 +00:00
drh 83f4707ab2 Add os_tst.c to the TESTSRC macro in main.mk. (CVS 1658)
FossilOrigin-Name: d0def160e5cf37cde771c2d9b18904a2a1f8c358
2004-06-22 12:30:19 +00:00
danielk1977 8a6c550d94 Improve the os_test.c module. (CVS 1657)
FossilOrigin-Name: ecdb93d3c92e34f7d85aa2fd703880669397b216
2004-06-22 12:18:32 +00:00
drh efad99959b Patch around compilers that do not support "long long int". (CVS 1656)
FossilOrigin-Name: d98b1502e2947d24ab9f4a5d2e5b9a95dde92faf
2004-06-22 12:13:55 +00:00
danielk1977 e302663615 Add os_test.c. Not activated yet. (CVS 1655)
FossilOrigin-Name: d16b863849d1aa887fe403e25153b1e9df6b837e
2004-06-22 11:29:02 +00:00
dougcurrie 369340af3d configure fixes for cygwin (line endings in configure.ac) ticket #772 (CVS 1654)
FossilOrigin-Name: 819a5973d15bf619182e47abd9b9dca2a560d8ff
2004-06-21 21:49:57 +00:00
dougcurrie 001c0bdc28 configure fixes for cygwin (line endings in configure.ac) (CVS 1653)
FossilOrigin-Name: eec48814f470bc90c7a3ffd8a0f0e84af52abb26
2004-06-21 21:44:49 +00:00
dougcurrie 0f290bf7b8 configure and makefile updates for v3-alpha compiler macros (CVS 1652)
FossilOrigin-Name: 99f38932d6e777392e168493ebcf5559ecc994c7
2004-06-21 18:57:29 +00:00
drh da71ce1623 Fix an uninitialized variable. The variable was harmless, but pedantic
error checking in MSVC raised an exception on it. (CVS 1651)

FossilOrigin-Name: afc398c2ca97ff165ea8242a5ffb8b6374b7fa8f
2004-06-21 18:14:45 +00:00
danielk1977 da95f8a67f Remove unused OP_UtfXX opcodes. (CVS 1650)
FossilOrigin-Name: 84d6354fce8332b2fb4365ee23b9c9b7c012db9f
2004-06-21 11:30:56 +00:00
danielk1977 e159fdf21c Avoid opening a temp table for aggregate queries with no GROUP BY clause. (CVS 1649)
FossilOrigin-Name: 4d02df63496091a1e643601f84313f42130d6282
2004-06-21 10:45:06 +00:00
danielk1977 72c952a1c4 Add the OP_Concat8 opcode, similar in concept to OP_String8. (CVS 1648)
FossilOrigin-Name: bbd3e93348bc3a1178f5278c6cf0b82e75bbf642
2004-06-21 09:06:41 +00:00
danielk1977 9e6db7d70f Ensure sqlite3ErrorMsg() is used to report errors during compilation,
sqlite3Error() during execution. Also remove unused param from
sqlite3VdbeReset() and Finalize(). (CVS 1647)

FossilOrigin-Name: 7a33daef5b49b1f2d89f27e0063372fe4f1702c8
2004-06-21 08:18:51 +00:00
danielk1977 00e279d9f7 Update sqlite3_column_decltype() to return NULL as the declartion type for
an expression that is not a column reference. (CVS 1646)

FossilOrigin-Name: ee9dffd986621490af7bd45c7fe070bb7da8c357
2004-06-21 07:36:32 +00:00
danielk1977 b28af71a22 Update sqlite3_changes() to match the documentation and add
sqlite3_total_changes(). (CVS 1645)

FossilOrigin-Name: ae2f4a0943854fedbbb6fab1dc3aaf972722ed95
2004-06-21 06:50:26 +00:00
dougcurrie d664d9a2bb fix fulltest error by restoring unset (CVS 1644)
FossilOrigin-Name: d2ccac9d01994de09a195d71cb63d1bf9fb0d33f
2004-06-20 03:06:18 +00:00
drh 0e3d74761d Make sure VdbeFunc entries are initialized before trying to destroy them.
Also, unrelated comment changes in build.c. (CVS 1643)

FossilOrigin-Name: fc3b3a8fe86980db4de402bb8e85f8f739fc3883
2004-06-19 17:33:07 +00:00
drh 124b27e654 Omit the DB_Locked and DB_Cookie flags. Other minor cleanup. (CVS 1642)
FossilOrigin-Name: 01f74b420c3f24918c066172e09cebbb22568faf
2004-06-19 16:06:10 +00:00
drh f92c7ff74a Clear up another zero-length array. This seems to fix the segfault in
func-13.4 too. (CVS 1641)

FossilOrigin-Name: 70680a34b4b617286d92730bd3042b8b569b3371
2004-06-19 15:40:23 +00:00
drh 998da3a287 Fix problems with the WatCom C compiler: Arrays must contain at least one
element.  sqlite3FreeX declared properly.  Don't allow run-time expression
(the SQLITE_UTF16NATIVE macro) in an array initializer. (CVS 1640)

FossilOrigin-Name: fbfc3c95a8abf25bb9e2b44cfeb7186c5b0591d7
2004-06-19 15:22:56 +00:00
drh a99db3b6ac Omit the sqlite3VdbeCode() routine. Use sqlite3NameFromToken() more to
reduce the amount of code. (CVS 1639)

FossilOrigin-Name: 99d0436e0ee1c917b2b7bbf005f05288b535648a
2004-06-19 14:49:12 +00:00
drh 65d8439342 file spaceanal.tcl was initially added on branch version_2. (CVS 1638)
FossilOrigin-Name: 936e60d7b122079de23db301a55c6e8510c82e18
2004-06-19 11:57:39 +00:00
drh 7ec0191c42 Create sqlite3.def and move sqlite.def into the attic. (CVS 1635)
FossilOrigin-Name: a5c98a272ec30971a9aa9ba2a6e2dec1a4dd8c18
2004-06-19 11:39:01 +00:00
danielk1977 ec8450f6cb Remove the unused 'next_cookie' mechanism. (CVS 1634)
FossilOrigin-Name: c94a9759ca6346a8c32f388a7aa1f0f139d6abc2
2004-06-19 09:35:36 +00:00
danielk1977 92f9a1bbda Make sure ATTACH and DETACH fail if a transaction is active. (CVS 1633)
FossilOrigin-Name: c49d8bdc3e1172a283f7aaf208fbb9096acd5ab6
2004-06-19 09:08:16 +00:00
danielk1977 f9d64d2c30 Remove the iCollate argument from sqlite3_create_function() (CVS 1632)
FossilOrigin-Name: 728d57ff5517a51c3aad4ba95525b1aa2065bd19
2004-06-19 08:18:07 +00:00
danielk1977 96d81f99d4 Update sqlite3_close() API to match documentation. (CVS 1630)
FossilOrigin-Name: 61819740fe8916892afe502196bb8b75a51f81e8
2004-06-19 03:33:57 +00:00
drh b7ce0c90a3 Update sqlite.def for version 3.0. (CVS 1629)
FossilOrigin-Name: 327780ade9ac99470018320218f39fbbc8f21837
2004-06-19 03:26:12 +00:00
danielk1977 d008cfe305 Fix for #764. When reloading the schema, load the temp schema last. (CVS 1628)
FossilOrigin-Name: 1f43219a7402af7255743466731dba2afb31d12b
2004-06-19 02:22:10 +00:00
dougcurrie d3fc6d0e3b fix dependencies for testfixture in Makefile.in (CVS 1627)
FossilOrigin-Name: 26676538ee63311393b52c8479c324469bf71f65
2004-06-19 02:19:39 +00:00
drh ef4ac8f9df Change the name of the TCL command from "sqlite" to "sqlite3" so that both
SQLite version 2 and SQLite version 3 can be used by Tcl at the same time. (CVS 1626)

FossilOrigin-Name: d705d051bed2b92b6c3bbcc75fe5b056633b9c31
2004-06-19 00:16:31 +00:00
dougcurrie 81c95efaf5 MinGW/MSYS build fixes; ticket #765 (CVS 1625)
FossilOrigin-Name: 5f383c1ee1a2aec9e192f29528ec2a02f2329d19
2004-06-18 23:21:47 +00:00
dougcurrie f12f80f071 MinGW/MSYS build fixes; ticket #765 (CVS 1624)
FossilOrigin-Name: 3c6b9b41a682a7bb979acc1e269eea2384aa9d45
2004-06-18 23:20:53 +00:00
dougcurrie 6b29334cd2 MinGW/MSYS build fixes; ticket #765 (CVS 1623)
FossilOrigin-Name: 7121cee78c2ed20fd09190fdcca1c8c92ef1e09d
2004-06-18 23:19:19 +00:00
drh bdb4383a90 Fix declaration problem in the previous check-in. (CVS 1622)
FossilOrigin-Name: f312057da4304857d16b344b784c84ce14e2ef69
2004-06-18 17:45:11 +00:00
drh 38f8271f81 Changes to allow libsqlite3.a and libsqlite.a to be both linked into the
same program at the same time. (CVS 1621)

FossilOrigin-Name: 2590fffcaa92adc619f7a927d2b5169d8dfef50a
2004-06-18 17:10:16 +00:00
drh 43d0578e04 Fix typos in documentation. Fix publish.sh so that it correctly builds the
ZIP archive of preprocesses source code. (CVS 1620)

FossilOrigin-Name: fee0c5e308c3de1937185e2060c8757e605ab3a2
2004-06-18 15:13:48 +00:00
drh 8107be2c7e Version 3.0.0 (ALPHA) (CVS 1619)
FossilOrigin-Name: 8b409aaae42cc36d96536531da41f05bd0cdd29c
2004-06-18 12:29:23 +00:00
danielk1977 f5628d7825 Fix typos in capi3.tcl (CVS 1618)
FossilOrigin-Name: 9e0e530f10bf70996471650496173dee074c2732
2004-06-18 11:34:09 +00:00
drh 829512baa0 Update the Makefile.in, version number, change log, etc for the 3.0.0
release. (CVS 1617)

FossilOrigin-Name: 917391e05ef45fd1eae883a99e6bbe6d7df3cc1c
2004-06-18 11:29:35 +00:00
danielk1977 8d81b86a2e Fix typos and minor errors in lang.tcl. (CVS 1616)
FossilOrigin-Name: 61db159c7d1d971266e487d44e3eb5bf6ac9a8e3
2004-06-18 11:25:21 +00:00
danielk1977 5314c4d7ab Fix a couple of gcc warnings. (CVS 1615)
FossilOrigin-Name: 960f55f3ecbef4581c8cb7be860023ba10de4e96
2004-06-18 06:02:35 +00:00
danielk1977 bfd6cce56b Optimisation for unicode encoding conversion routines. (CVS 1614)
FossilOrigin-Name: 39a415eaa65964742e40b7ea4d471fa04007c6c9
2004-06-18 04:24:54 +00:00
drh a285422922 Documentation updates in preparation for the release of version 3.0.0. (CVS 1613)
FossilOrigin-Name: 9fb29f7331254b601b71f0fe7d77f91915272dc7
2004-06-17 19:04:17 +00:00
danielk1977 ededfd5e83 Remove redundant opcodes OP_MakeKey and OP_MakeIdxKey. (CVS 1612)
FossilOrigin-Name: a71a9ff114f2162696d8d37fbc87b315568f6dcb
2004-06-17 07:53:01 +00:00
danielk1977 f736b77160 Handle conflicting ON CONFLICT clauses in table definitions. (CVS 1611)
FossilOrigin-Name: 12e77e759ec5b45b7fb94aa815435127f395162e
2004-06-17 06:13:34 +00:00
danielk1977 3f6b087471 Use the faster LIKE function from sqlite v2. Add special user functions to
test builds to test the auxdata APIs. (CVS 1610)

FossilOrigin-Name: b9493c5facea4d24a6cbc4f6fa2f75dc2399a11d
2004-06-17 05:36:44 +00:00
danielk1977 d09b592f63 Remove the second definition of SQLITE_N_BTREE_META from test3.c. (CVS 1609)
FossilOrigin-Name: b1e66ae4640c2cd32d47c043b5c25ea67182098b
2004-06-17 00:01:21 +00:00
danielk1977 f7df9ccfe7 Trivial modifications to prevent compiler warnings. (CVS 1608)
FossilOrigin-Name: b3d5ad6f7832d46e34e99e4a1cb7e47c88f207a4
2004-06-16 12:02:47 +00:00
danielk1977 742f947b1d Trivial modifications to prevent compiler warnings. (CVS 1607)
FossilOrigin-Name: 7974c9a6f5ed86f02176376d99d909c43a4ae455
2004-06-16 12:02:43 +00:00
danielk1977 cfe9a69f90 Trivial modifications to prevent compiler warnings. (CVS 1606)
FossilOrigin-Name: 6001c5e1ced08096bb404e72ff533b7edcc896ec
2004-06-16 12:00:29 +00:00
danielk1977 8def5ea203 Fix handling of a failed malloc() in various places (CVS 1605)
FossilOrigin-Name: b739ef2a1b8f7cfee4ab3f4c1319c159bd1e2e40
2004-06-16 10:39:52 +00:00
danielk1977 5c4c77878d Fix handling of a failed malloc() in various places (CVS 1604)
FossilOrigin-Name: 7d8edce4c12d075acbc6bac6758aabb2769f983a
2004-06-16 10:39:23 +00:00
danielk1977 eac7a362f6 Fix two more memory leaks. (CVS 1603)
FossilOrigin-Name: 98b48704a1ce983677cdb269c24f7bca4ed606f7
2004-06-16 07:45:24 +00:00
drh 7b93ed3d48 Documentation updates and changes the publish.sh script. (CVS 1602)
FossilOrigin-Name: e9a77f8972128550f6ff98dcf854eb7680eaee8b
2004-06-16 03:02:00 +00:00
danielk1977 e00484002f Assorted memory leak fixes. (CVS 1600)
FossilOrigin-Name: 07b90f3690768e852384fbbde0ba59e69e24d1da
2004-06-15 16:51:01 +00:00
danielk1977 b20e56b451 Memory leak fixes for tests in file select1.test. (CVS 1599)
FossilOrigin-Name: 59db58ebd30cd7c79c32f5a725620e740eff661d
2004-06-15 13:36:30 +00:00
danielk1977 369f27eb51 Minor bugfixes and test case adjustments for version 2 test cases to work
with version 3. (CVS 1598)

FossilOrigin-Name: e21a181376d4115c7dbe614f3f8a1fbf82d77c75
2004-06-15 11:40:04 +00:00
danielk1977 fbcd585fe6 (1) Vdbe makes a copy of column types. (2) Don't invalidate other cursors
when a statement or transaction is rolled back. (3) Update capi2.test for
the new API. (CVS 1597)

FossilOrigin-Name: 4f5e2530829ef91753b083b5f2a1d7332e311cb6
2004-06-15 02:44:18 +00:00
drh 0c6cc4ed19 Update comments in btree.c. No changes to code. (CVS 1596)
FossilOrigin-Name: 1c6a0706359c21e3b04e9097837a297d1d7714c3
2004-06-15 02:13:26 +00:00
drh 1f5957167b Do not use the page containing locks for anything to avoid problems with
the manditory file locking on windows. (CVS 1595)

FossilOrigin-Name: 5a814202777f381caf5337b37e11c9ab8b8f554a
2004-06-15 01:40:29 +00:00
drh bf9a7e4d4e Add the sqlite3OsFileModTime() interface. But it is still unused. The
change counter in page 1 is always incremented. (CVS 1594)

FossilOrigin-Name: 186c6f93e12978907c5f0ff81d90bdf7367b9274
2004-06-15 00:29:03 +00:00
danielk1977 2dd59365ed Update some old tests to use the new API. (CVS 1593)
FossilOrigin-Name: af6edd2c0ad160435acd5bfa7af36c4f394f0bb8
2004-06-14 23:46:47 +00:00
danielk1977 026d270ca6 Schema modifications are committed internally when a statement transaction
is committed. (CVS 1592)

FossilOrigin-Name: 4cfc5a36e9891a9b69209f94194fc492e203ab75
2004-06-14 13:14:59 +00:00
danielk1977 2ac79703b1 Fix a bug in the auth.test script. (CVS 1590)
FossilOrigin-Name: 1fa97dd81d349e448171a78f69e463e7fa364daa
2004-06-14 11:54:18 +00:00
danielk1977 f3ce83f5f6 Have the TCL 'errorcode' interface call sqlite3_errcode(). (CVS 1589)
FossilOrigin-Name: f4b4df6514c19b0c23b399142749a7e4a20d0f70
2004-06-14 11:43:46 +00:00
danielk1977 66b978a415 Don't invoke authorisation callback during database initialisation. (CVS 1588)
FossilOrigin-Name: 293fbf0aa5c221bc341d0d9afc73d459f427f940
2004-06-14 11:35:17 +00:00
danielk1977 3fe83ac7a1 Bugfix for previous checkin. (CVS 1587)
FossilOrigin-Name: 2737505f28e37627ed6091e356d005624e1f49fa
2004-06-14 09:41:17 +00:00
danielk1977 962398d395 Ensure master journal file is deleted when a transaction is committed. (CVS 1586)
FossilOrigin-Name: cb3cbe00be9a42e974688016a056053cedb55eef
2004-06-14 09:35:16 +00:00
danielk1977 f9d19a6b3f Check the value of the schema cookie before reading the sqlite_master table. (CVS 1585)
FossilOrigin-Name: 80c299f8839d920c61854f575498340b28db98d7
2004-06-14 08:26:35 +00:00
danielk1977 19bea40160 Change tests in pager.test to account for the extra cache hit in the code
that updates file change counter. (CVS 1584)

FossilOrigin-Name: 76ac9a787b42da3bfa94192b26ed48483b5ff189
2004-06-14 06:13:06 +00:00
danielk1977 5865e3d54f Ensure the master journal directory is synced. Also, change the master journal
format to store journal file names. (CVS 1583)

FossilOrigin-Name: 73cd0aabb24f7b663c8b55cf5e8fcb34fd48c032
2004-06-14 06:03:57 +00:00
danielk1977 aa5ccdf5b8 Update the file change counter just before each transaction is committed. (CVS 1582)
FossilOrigin-Name: 4649abcbfd032836b196b5d690ef66e4aa494c45
2004-06-14 05:10:42 +00:00
drh 59eb676017 os_win.c is now working with the new locking protocol. (CVS 1581)
FossilOrigin-Name: 77c5eaa10a9d2e2bb8f89b7434d6e6efbacf35e9
2004-06-13 23:07:04 +00:00
drh eafe05b0ce More speed improvements. (CVS 1580)
FossilOrigin-Name: c5ebc1c05eccc2c0697b6047a504954e11960f73
2004-06-13 00:54:01 +00:00
drh e1632b271d The VDBE aggregate functions use an in-memory btree instead of a disk-based
btree for improved performance. (CVS 1579)

FossilOrigin-Name: 8029f1e465b900215acdff48c8eefb53c71341a8
2004-06-12 20:42:29 +00:00
drh 4774b13029 Speed up in the handling of VDBE cursors. (CVS 1578)
FossilOrigin-Name: e42316f5708de6f639b7b54e08d4be73b45367e9
2004-06-12 20:12:51 +00:00
drh e61cffc203 Improve the speed of OP_Column through better caching. (CVS 1577)
FossilOrigin-Name: f687977a28eda5ce0aa1cba2fdfb0152443032bc
2004-06-12 18:12:15 +00:00
drh 406c3f9284 Fix typo in the locking document. (CVS 1576)
FossilOrigin-Name: 99a7bd83ac38e14bb936a834634313cf98279a62
2004-06-12 14:11:38 +00:00
danielk1977 d8123366c4 (1) Modifications to the user-function interface and (2) Internal changes
to automatically created indices. (CVS 1575)

FossilOrigin-Name: 5903f53828b5d282b33e27813417e4317c9ecf0b
2004-06-12 09:25:12 +00:00
drh 3cde3bb0da Bug fix in the unix locking code. (CVS 1574)
FossilOrigin-Name: dcad244f58453d23f2bcb749dcea077434bbd08c
2004-06-12 02:17:14 +00:00
danielk1977 2a764eb0cd Change prototype for busy callbacks to "int xBusy(void *, int);" (CVS 1573)
FossilOrigin-Name: 4f1cfca5ca703d0068cf8d6222dc8e0cfb7e24b6
2004-06-12 01:43:26 +00:00
danielk1977 dc8453fd7a Use the SQLITE_UTF* symbols instead of the old internal TEXT_Utf* symbols. (CVS 1572)
FossilOrigin-Name: 9b84f2f488e1d37ba1a4c4cf31490bcbba0f6edd
2004-06-12 00:42:34 +00:00
drh 31ef3b91f5 Fix typos in the new locking document. (CVS 1571)
FossilOrigin-Name: 022075517cc0edc5f21de4b92ef188bda2034c98
2004-06-11 22:04:31 +00:00
drh 52619dfb7f Documentation of the new pager locking mechanism. (CVS 1570)
FossilOrigin-Name: 13cf1ba8256bf8cee0195dbaeac71a20cd2c2fc2
2004-06-11 17:48:02 +00:00
danielk1977 ce2663ccc8 Have the vdbe aggregator use a btree table instead of a hash table. (CVS 1569)
FossilOrigin-Name: 8d56118f64dbaf8c8006266fa7026f900a4a16bd
2004-06-11 13:19:21 +00:00
danielk1977 dc1bdc4f9d Fix various collation sequence issues. (CVS 1568)
FossilOrigin-Name: 66835ee67051027456a536e33b2f88a741654525
2004-06-11 10:51:27 +00:00
drh 726de599bd Comment changes in pager.c. (CVS 1567)
FossilOrigin-Name: 0e420f72cd5885e32914b4d958bad811fdd9fb77
2004-06-10 23:35:50 +00:00
drh ef5ecb4126 Add new contributed logo TIFF. (CVS 1566)
FossilOrigin-Name: 86744c9aca8f27c994a2bf37c4f9fd3c90b1266f
2004-06-10 22:51:42 +00:00
danielk1977 4e6af1347c Correctly handle the situation where a collation sequence is available, but
not in the preferred encoding. (CVS 1565)

FossilOrigin-Name: 49ab4794e1b5be5cbb3b87a65477659762487cf8
2004-06-10 14:01:08 +00:00
danielk1977 caec4e7a59 Add the sqlite3_collation_needed() API and fix some error handling cases
involving unknown collation sequences. (CVS 1564)

FossilOrigin-Name: 67500546ea24fd7a30348960c98cd257dbfa965f
2004-06-10 10:51:52 +00:00
danielk1977 d2b65b9fad Add the sqlite3_collation_needed() API and fix some error handling cases
involving unknown collation sequences. (CVS 1563)

FossilOrigin-Name: 518d82d3b1ab996d675f45c94d740c98578a04a6
2004-06-10 10:51:47 +00:00
danielk1977 7cedc8d4d6 Add the sqlite3_collation_needed() API and fix some error handling cases
involving unknown collation sequences. (CVS 1562)

FossilOrigin-Name: edf069b9f4044ed2a80962c7722052bf1b80bf45
2004-06-10 10:50:08 +00:00
danielk1977 0de0bb3360 Misc fixes for test cases failing due to the new locking model. (CVS 1561)
FossilOrigin-Name: 71e98d0d089576433c4b06dcba1c57063bd366f5
2004-06-10 05:59:24 +00:00
danielk1977 a3f3a5f3d2 When in PAGER_RESERVED state, don't write to the main file when rolling
back a statement transaction. (CVS 1560)

FossilOrigin-Name: adb2bd61436927d37b23bae857089d62e12397af
2004-06-10 04:32:16 +00:00
danielk1977 466be56bcf Change the collation sequence interface to allow collation sequences that
use UTF-16 in non-native byte order to be registered. (CVS 1559)

FossilOrigin-Name: b8aaa3a29e0ddef357ab1b3b0b9f87ed390f2f36
2004-06-10 02:16:01 +00:00
drh 35d4c2f4b8 Add the vdbe_listing and sql_trace pragmas used for debugging. (CVS 1558)
FossilOrigin-Name: 28c3cc088018833f507535b8d227232776cff204
2004-06-10 01:30:59 +00:00
drh a60accbdb2 Tests in lock.test no conform to the new locking scheme. (CVS 1557)
FossilOrigin-Name: a60afd04c5296020e5e72c4d35063fd1e6f90e9e
2004-06-10 01:08:06 +00:00
drh 427eab53e1 Fix a buffer overrun in the atomic multifile commit logic of the pager. (CVS 1556)
FossilOrigin-Name: 3b78ffe0b5dfa20e5c638d85ed400afda8a9f948
2004-06-10 00:51:43 +00:00
drh a6ecd33851 Check for schema updates if the parser fails to find a table. More locking
test updates. (CVS 1555)

FossilOrigin-Name: a22283512afe2df09d5783d189fbd7389ed313ad
2004-06-10 00:29:09 +00:00
drh f8646695a2 Website changes for version 2.8.14. (CVS 1553)
FossilOrigin-Name: 73afa14a04e8aa22de71aac7d08abc0ec68dc327
2004-06-09 23:15:22 +00:00
drh ff13c7d6a3 If a commit fails due to lock contention right after the COMMIT command, take
the database back out of autocommit mode.  Do not rollback.  This gives the
user the chance to try the COMMIT again. (CVS 1551)

FossilOrigin-Name: 39b4ba95c4a16b28b5e8c7a3331e09cb5796e258
2004-06-09 21:01:11 +00:00
drh c9e0686ead Turn on the atomic multifile commit logic. It does not work right yet, but
it has at least stopped failing asserts. (CVS 1550)

FossilOrigin-Name: 3674b25edc37145b2b1275dd20580015ace66aa7
2004-06-09 20:03:08 +00:00
drh ae2b40c47d Remove legacy journal formats. (CVS 1549)
FossilOrigin-Name: a12bef4a0877fb1dca531509a1186e092727b6d8
2004-06-09 19:03:54 +00:00
drh a6abd04193 Fixes to the file locking. 109 tests are now failing. (CVS 1548)
FossilOrigin-Name: dc0763455bbf54c1d8728e16033709caedd6e1c6
2004-06-09 17:37:22 +00:00
drh 89ac8c1a70 Add the "lock_status" pragma - only available when SQLITE_DEBUG is defined.
Used for testing only. (CVS 1547)

FossilOrigin-Name: 0ecbba78fcde8f7715cd74c674b5040ef4953f6e
2004-06-09 14:17:20 +00:00
drh faa57acc9f Change the MEMORY_DEBUG macro to SQLITE_DEBUG. (CVS 1546)
FossilOrigin-Name: 428b685b7174ef4589176def1028ad1c9461ff7e
2004-06-09 14:01:51 +00:00
danielk1977 c039139807 Fix error reporting when trying to attach a database with a foriegn text
encoding. (CVS 1545)

FossilOrigin-Name: beab038c71eecbabb1351b0c98a71f32ea013285
2004-06-09 12:30:04 +00:00
danielk1977 0202b29ef7 Some progress on user-defined collation sequences. (CVS 1544)
FossilOrigin-Name: c634e71f1909819fb55c728bc410e5cc390428e3
2004-06-09 09:55:16 +00:00
drh 80242055e5 Start all transactions and verify all schema cookies near the beginning of
of each vdbe program. (CVS 1543)

FossilOrigin-Name: 1086196460e261718e78512d77e25dde021a117d
2004-06-09 00:48:12 +00:00
drh b3e043463d Do not require a RESERVED lock when transitioning from SHARED to EXCLUSIVE. (CVS 1542)
FossilOrigin-Name: 4dfdea7373f3471d17498da3d6c3aaf926a72d4b
2004-06-08 00:47:47 +00:00
danielk1977 3f41e976e8 Enhance the built-in function quote() to support blob values. (CVS 1541)
FossilOrigin-Name: 97aa54bb70715934e0af082d51b9b0f6bb847e8e
2004-06-08 00:39:01 +00:00
danielk1977 4f057f904a Remove the third argument from the sqlite3_open() API. (CVS 1540)
FossilOrigin-Name: 62e31f396cb6b49f542977e2fade78e11e371132
2004-06-08 00:02:33 +00:00
drh 2ac3ee9787 More work on windows locking. Fix some problems with unix locking. There
is still an assertion failure on windows locking in attach2.test. (CVS 1539)

FossilOrigin-Name: 0c2d169cf3c0f36972015c952a2b46cb9a333881
2004-06-07 16:27:46 +00:00
danielk1977 517eb64616 Tables created with the CREATE TABLE <tbl> AS SELECT ... syntax now inherit
column declaration types from the SELECT statement. (CVS 1538)

FossilOrigin-Name: 31c1668dbc2b84438a5b78b0270f58b37b03791d
2004-06-07 10:00:31 +00:00
danielk1977 8e227875dd Add pragma to set/get text encoding. Also fix an obscure problem where a
temp trigger could be accidently dropped. (CVS 1537)

FossilOrigin-Name: 983221b038813c5a7892564896e39597c223c4c3
2004-06-07 07:52:17 +00:00
drh e54ca3fe2e Progress towards getting locking to work on windows. (CVS 1536)
FossilOrigin-Name: 4f7c0961ad6cb7082bf7716f0c7ca16a8742c039
2004-06-07 01:52:14 +00:00
danielk1977 ad7dd42558 Performance improvements for LIKE. It is still too slow though. (CVS 1535)
FossilOrigin-Name: 30b81507fc404355751705c6f9856c178249eff1
2004-06-06 12:41:49 +00:00
danielk1977 d02eb1fdf4 Enhance user function API to support association of meta-data with constant
arguments and the specification of text encoding preference. The LIKE
operator takes advantage of both. (CVS 1534)

FossilOrigin-Name: 92337d8f79b9754cd61c73e7db2e792a1f482f50
2004-06-06 09:44:03 +00:00
drh 51c6d9633f Added sqlite3OsLock for win32. Assertion fault in attach.test. (CVS 1533)
FossilOrigin-Name: 9e6cd9ec75f726ef85e60f593aaa895791315071
2004-06-06 00:42:25 +00:00
danielk1977 682f68b020 Add the sqlite3_set_auxdata() and sqlite3_get_auxdata() APIs. (CVS 1532)
FossilOrigin-Name: c2899b437366d879258ab4f6ae47868441010eca
2004-06-05 10:22:17 +00:00
danielk1977 2a02e33950 Ensure blob values survive the ".dump" command of the shell. (CVS 1531)
FossilOrigin-Name: e82eb722b0e0b223ddaf7d85669792c33594f9da
2004-06-05 08:04:36 +00:00
drh a2fce64acc Critical bugs fixed in btree.c. Incompatible file format change. Unrelated
comment fix in select.c (CVS 1530)

FossilOrigin-Name: cb1ffabf86996ab20dfffcb5f133fa9a9b56bbe2
2004-06-05 00:01:44 +00:00
danielk1977 9eed505701 Defer the exclusive db lock until the pager cache is flushed to disk. 41
tests now fail. (CVS 1528)

FossilOrigin-Name: d2f69e5ef2f261a00bb8427a4e2a1638ecfd17a9
2004-06-04 10:38:30 +00:00
danielk1977 24162fe668 Move the 'busy-callback' logic to the pager layer. (CVS 1527)
FossilOrigin-Name: ff70b6d2b60c143e3ada0606ceff97571998c7e3
2004-06-04 06:22:00 +00:00
danielk1977 13adf8a071 Untested updates to support atomic multi-file transactions (CVS 1526)
FossilOrigin-Name: d57e5252c8baaf615c2cd218a33356ea5d95a5e2
2004-06-03 16:08:41 +00:00
danielk1977 ecb2a9644b Fix a segfault in sqlite3OsLock() (CVS 1525)
FossilOrigin-Name: 51348b82c4d5801091537b80059d770410774905
2004-06-02 06:30:16 +00:00
drh 7a224deb5f Work toward combining the OP_MakeKey, OP_MakeIdxKey, and OP_MakeRecord
opcodes into one.  The work is incomplete. (CVS 1524)

FossilOrigin-Name: 165d69a04cca719dec2b042117f848f153721a1d
2004-06-02 01:22:02 +00:00
drh df0148931d Remove the sqlite3_libencoding() api and the ISO8859 encoding option. (CVS 1523)
FossilOrigin-Name: b53640ed2232aaf173a71636073477d80407d11f
2004-06-02 00:41:09 +00:00
danielk1977 193c72f84e Fix a bug with UTF-16 byte-order-marks on big-endian hosts. (CVS 1522)
FossilOrigin-Name: c17b864103fe5e6def0f650eadb7b2cc6e87144f
2004-06-02 00:29:24 +00:00
drh cc74b1429d Fix another website typo. (CVS 1521)
FossilOrigin-Name: 24e2bbd0f233eaec1789e866e9abb88db66e2278
2004-06-02 00:08:55 +00:00
danielk1977 9a1d0abed4 Unix version of sqlite3OsLock(). (CVS 1520)
FossilOrigin-Name: 023d1760c1a720632b25c98d14bf521ab91861e2
2004-06-01 14:09:28 +00:00
drh fedc8347c0 Fix typo on homepage (CVS 1519)
FossilOrigin-Name: a84ece250035d02e399ec208aded524c20c12737
2004-06-01 12:59:50 +00:00
drh 26dbdbf857 Fix typos in version 3 documents. (CVS 1518)
FossilOrigin-Name: 915cba57123f859c7f128bd52580573877c502ba
2004-06-01 10:01:25 +00:00
drh 014ac19de2 Makefile changes for building windows DLLs. (CVS 1517)
FossilOrigin-Name: 11c5d6ab39d04e05a3a1b68477f159b17311a6da
2004-06-01 01:45:11 +00:00
drh 93db69ee0f Add the capi3ref.html page to the website. (CVS 1516)
FossilOrigin-Name: 89f54f1ffdddc99340777cda6d9b1d7446549fa2
2004-06-01 01:22:37 +00:00
danielk1977 d1a2553ae6 Remove the sqlite3_open_varargs() API. (CVS 1515)
FossilOrigin-Name: 6902fb1b49fdf0e38265fa26198690243cdc2f58
2004-06-01 00:03:52 +00:00
danielk1977 f20b21c8fd Remove the sqlite3_error_string() API. (CVS 1514)
FossilOrigin-Name: af8e2006d808031a040f293c44f3bfbe841b866b
2004-05-31 23:56:42 +00:00
drh 218dc69436 Synchronize lemon.c to the version on the 2.8 branch. (CVS 1513)
FossilOrigin-Name: 6ab3af8847a7b0f1508824c9d8e0ec9685219371
2004-05-31 23:13:45 +00:00
drh 3f4fedb2c4 Change the name of the sqlite3_freemem API function to just sqlite3_free. (CVS 1512)
FossilOrigin-Name: f3b80bbb97ed0b0c1cf634068f28f23802ec71a8
2004-05-31 19:34:33 +00:00
drh 9c054830b4 Change all SQLITE3 preprocessor macros to SQLITE. Documentation updates. (CVS 1511)
FossilOrigin-Name: adf7e29ff60dc559f64832fadb09f0b9decc0e76
2004-05-31 18:51:57 +00:00
drh 1d482dd917 Change the name of the include file to "sqlite3.h". The names of the shell
command and static library become "sqlite3" and "libsqlite3.a". (CVS 1510)

FossilOrigin-Name: 4c37b6d2b78e88e2a9dfed4d764caeb0f626f92e
2004-05-31 18:23:07 +00:00
drh 75d82cc4bf Begin adding documentation for version 3.0. (CVS 1509)
FossilOrigin-Name: 2005bfdad03ac2aa70a82ba7ff9b2f469d129367
2004-05-31 18:22:25 +00:00
drh 02f9f6b38f Get the attach.test working on windows. (CVS 1508)
FossilOrigin-Name: 48226a73801bc478d6fd6de5a554aec5119d2194
2004-05-31 18:21:54 +00:00
drh d4acf19cb0 More website updates. (CVS 1507)
FossilOrigin-Name: 460f2361141f14aa709addd41cc011127bac9b6e
2004-05-31 16:04:08 +00:00
drh e100f835d3 Website redesign in preparation for adding version 3 documentation. (CVS 1506)
FossilOrigin-Name: 2052911b1fd119af9dbd81fdfe80244685f58212
2004-05-31 15:06:28 +00:00
danielk1977 3a81de11b6 Some test cases for read locks (CVS 1505)
FossilOrigin-Name: 0e07006704cd441f91d5fadbf3b644fd20da79bd
2004-05-31 12:34:53 +00:00
danielk1977 11146c9c2e Use read-only transactions. (CVS 1504)
FossilOrigin-Name: 6c100887eeb32631e1aa914a69db959e1f58f192
2004-05-31 11:51:44 +00:00
danielk1977 77d83ba50f Bugfix for previous checkin. (CVS 1503)
FossilOrigin-Name: 5f869fbfc029eb2601d1d967685517d007d002a4
2004-05-31 10:08:14 +00:00
danielk1977 ee5741ea78 Add read-transactions to the btree and vdbe. The compiler doesn't invoke
them yet. (CVS 1502)

FossilOrigin-Name: 6b43633a96c674a5d470578ef80ebf2227da0682
2004-05-31 10:01:34 +00:00
danielk1977 33752f8acf Remove the <ON CONFLICT> clause from BEGIN (CVS 1501)
FossilOrigin-Name: 9029274b6129140064bd7ac34df7eaba00d28efb
2004-05-31 08:55:33 +00:00
danielk1977 1d850a72c2 Replace OP_Begin, OP_Commit and OP_Rollback with OP_AutoCommit. (CVS 1500)
FossilOrigin-Name: b8ed812c92f2dbb4431d45aeb41646ceb53e0cbc
2004-05-31 08:26:49 +00:00
drh a19b775db9 Add 3-byte and 6-byte integer serial types. This makes databases smaller
and faster.  Should we go ahead and add 5- and 7-byte integer types too? (CVS 1499)

FossilOrigin-Name: e6685af815c4c0c7f09bb097a59a121862b865cf
2004-05-30 21:14:58 +00:00
drh e51c44f481 Various speed enhancements. (CVS 1498)
FossilOrigin-Name: a0db15bba64af0c529d5be366659bca1165ff21b
2004-05-30 20:46:09 +00:00
drh 271efa5a28 Improved comments and speed tweaks to btree.c. (CVS 1497)
FossilOrigin-Name: c86b7c065a798cd108189b96e87d100115862ff2
2004-05-30 19:19:05 +00:00
drh 3a41a3fe66 Additional minor speed improvements. (CVS 1496)
FossilOrigin-Name: a90264c0a4c73097fe0ae8933dcebb15b8eaa2bb
2004-05-30 02:14:17 +00:00
drh 696b32fa4e Faster version of sqlite3VdbeSerialGet. (CVS 1495)
FossilOrigin-Name: 80985505fe8ba8e505842dae95d37bf412fc586d
2004-05-30 01:51:52 +00:00
drh 6fec076238 Do not include the P3 parameter on OP_Integer opcodes if the integer will fit
in 32 bits.  The P3 conversion is slow. (CVS 1494)

FossilOrigin-Name: fcd84ebabca72023e76e6954514948aa9a3ab999
2004-05-30 01:38:43 +00:00
drh 436051582f A file format change for btree.c makes it between 10 and 20% faster. (CVS 1493)
FossilOrigin-Name: cbcaece7f45a0bc994e6c54a996afa4e6529da6a
2004-05-29 21:46:49 +00:00
danielk1977 0f69c1e3ec Transform OP_HexBlob and OP_String8 to OP_Blob and OP_String the first time they are executed. (CVS 1492)
FossilOrigin-Name: 3225de8902b0e7e60c4d9f3a5ef51bc74f57d364
2004-05-29 11:24:50 +00:00
danielk1977 bd26f925e0 Ensure vacuum handles table names with spaces in them. (CVS 1491)
FossilOrigin-Name: 0a6689be843e695902fbfef863f128915545499e
2004-05-29 10:43:06 +00:00
danielk1977 3df6b2570f Fix vacuum so that it works with blobs. (CVS 1490)
FossilOrigin-Name: 4feb4b9a71ce7a92924d2358a7ccecb4cca19223
2004-05-29 10:23:19 +00:00
danielk1977 e7d00f5825 Avoid arithmetic on void pointers. (CVS 1489)
FossilOrigin-Name: 3d68703e2e4e793012cb3c13a6744e915475e006
2004-05-29 02:44:02 +00:00
danielk1977 ef2cb63e9e Allow CREATE and DROP TRIGGER on attached databases. (CVS 1488)
FossilOrigin-Name: 4060a37d0baaa60c50f2dde4a1ab344133fcabbb
2004-05-29 02:37:19 +00:00
drh 51846b56ed Factor common code for generating index keys into a procedure. Other
speed improvements and bug fixes. (CVS 1487)

FossilOrigin-Name: 6661bb5f9c1692f94b8b7d900b6be07f027e6324
2004-05-28 16:00:21 +00:00
danielk1977 76d505baad Fix a bug in the sqlite3_column_decltype() API. (CVS 1486)
FossilOrigin-Name: c8a40218c20cf5d0abad330e8fa59ca4c36e7608
2004-05-28 13:13:02 +00:00
danielk1977 48dec7e215 Allow CREATE and DROP VIEW on attached databases. (CVS 1485)
FossilOrigin-Name: ad879a957d93c0b49c289947826b451d3ea37e5b
2004-05-28 12:33:30 +00:00
danielk1977 a8858103c9 Allow DROP TABLE and DROP INDEX on attached databases. (CVS 1484)
FossilOrigin-Name: 2fb3708e10a06660ad1974ef8e9742b706a0a9fc
2004-05-28 12:11:21 +00:00
danielk1977 cbb18d2256 Allow CREATE TABLE and CREATE INDEX on attached databases. (CVS 1483)
FossilOrigin-Name: 4984a130ccf3b8e486941a5d0d0cc70a691f0dac
2004-05-28 11:37:27 +00:00
drh d578820154 Tables and indices use the same record format. (CVS 1482)
FossilOrigin-Name: 1b15b32bdbccae555243e67aa011139c50dc2fb3
2004-05-28 08:21:05 +00:00
drh f3218fea00 Tables and indices use the same record format. (CVS 1481)
FossilOrigin-Name: ebd564d10b0ecd7ff15cbd6cd2b979c9f767476c
2004-05-28 08:21:02 +00:00
drh 25aa1b4580 Remove the encoding argument from sqlite3VdbeSerialGet. Use the 32-bit
version of sqlite3GetVarint for schema-level parameters. (CVS 1480)

FossilOrigin-Name: 321f8c463520e99681de878b743027c570b73e35
2004-05-28 01:39:01 +00:00
danielk1977 61de0d1b99 Add API functions sqlite3_open_varargs(), sqlite3_open16_varargs() and
sqlite3_complete16(). (CVS 1479)

FossilOrigin-Name: 203af2b2e3a25f4fe0e128e350c21834cad0bd7f
2004-05-27 23:56:16 +00:00
drh d3194f5a4a Change the record format to include an extra varint at the beginning to record the number of bytes in the header. (CVS 1478)
FossilOrigin-Name: 0c4d138807f367d75b3fb5b2dadf206df725659f
2004-05-27 19:59:32 +00:00
drh 5f3b4ab53c Remove the COPY command. (CVS 1477)
FossilOrigin-Name: 287f86731c71401dbac098e08357367b4f8e5a43
2004-05-27 17:22:54 +00:00
danielk1977 6d88bad4f9 Enhance the C function used to test sqlite3_create_function() from Tcl. (CVS 1476)
FossilOrigin-Name: c85e5f1528d098ea330ed0cf7e3c01cf9be93c10
2004-05-27 14:23:36 +00:00
danielk1977 49e4643ee8 Test sqlite3_bind_blob(). (CVS 1475)
FossilOrigin-Name: 42247b2fb0c94e75a432b3e067fff9a1be328fc8
2004-05-27 13:55:27 +00:00
danielk1977 3fd0a736bf A couple of test cases and fixes for blob literals. (CVS 1474)
FossilOrigin-Name: 6d552af67cf6fa6935373ba39de5c47ebf613eb9
2004-05-27 13:35:19 +00:00
danielk1977 30ccda1006 Alter the Tcl eval sub-command so that it supports blobs. (CVS 1473)
FossilOrigin-Name: b5d5f0ad717ef43a9714dd1cc40e20d1b94a3e58
2004-05-27 12:11:31 +00:00
danielk1977 f93bbbea47 A few more bugfixes. Test cases pass now. (CVS 1472)
FossilOrigin-Name: c9e3015faffb650d8dbf1f7f95a7057a36361bac
2004-05-27 10:30:52 +00:00
danielk1977 c572ef7fcd Various bugfixes. 68 Test cases still fail. (CVS 1471)
FossilOrigin-Name: 67a140cf78d99e38ccd94751c4f8ead1a2b96859
2004-05-27 09:28:41 +00:00
drh f44795013f Fixes to the MEM changes. The library now links. (CVS 1470)
FossilOrigin-Name: f33d15d95f195e26e1ef396158597a2caa06f374
2004-05-27 03:12:53 +00:00
drh eb2e176a12 More MEM changes in the vdbe.c. Still will not compile. (CVS 1469)
FossilOrigin-Name: dbdd1a7f316e576d0611748ec63c9ef00d4c10db
2004-05-27 01:53:56 +00:00
danielk1977 ea61b2c4fc More test cases for the new query API. (CVS 1468)
FossilOrigin-Name: 74097ecdb0b1e0eec143c5a3f8ca2f0d63d6f38d
2004-05-27 01:49:51 +00:00
danielk1977 04f2e68d0c Add TCL test bindings and some more test cases for the new query API. (CVS 1467)
FossilOrigin-Name: d72adf0c522b442d5e1663862bdd639c282d4495
2004-05-27 01:04:07 +00:00
drh 69174eb484 Break Mem.flags into Mem.type and Mem.enc. (CVS 1466)
FossilOrigin-Name: 68ef17028621681f5d091e77d5df84f663a15e27
2004-05-26 23:43:11 +00:00
drh 4f26d6c429 Refactoring of the vdbe Mem functions and the APIs that deal with them.
The code will not compile in its current state. (CVS 1465)

FossilOrigin-Name: bba6684d502ba1ecd9614d2470ec94296e3c07c2
2004-05-26 23:25:30 +00:00
drh f9b596ebc0 Remove dataType and includeTypes flags from function definitions. Added new
P3_FUNCDEF type for P3 arguments on opcodes.  Fixes to several user functions.
28 tests fail now. (CVS 1464)

FossilOrigin-Name: 36e031625995b2f7baf7654d771ca8fb764a0085
2004-05-26 16:54:42 +00:00
danielk1977 b77f5dadbf Ensure the type of an sqlite3_value* is not modified by calls to
sqlite3_value_*() calls. (CVS 1463)

FossilOrigin-Name: ce8b15203413f38a8b7127eb08ae5db1c1eb164a
2004-05-26 13:27:00 +00:00
danielk1977 3cf8606395 Add some tests for the new API. Many more to come. (CVS 1462)
FossilOrigin-Name: d5659f2ee6788e0205fb5e03eeaf64e6c0aa9bed
2004-05-26 10:11:05 +00:00
danielk1977 398eae781e Remove the show_datatypes pragma. (CVS 1461)
FossilOrigin-Name: 93bb958d939302795027f738b8f663cbce3e8783
2004-05-26 06:58:43 +00:00
danielk1977 6590493d53 Use the new form of the sqlite3_create_function() API. (CVS 1460)
FossilOrigin-Name: 0317bef4b0c219ca2888c90553201e53230fb360
2004-05-26 06:18:37 +00:00
danielk1977 fc57d7bf72 Use the new API calls more consistently. (CVS 1459)
FossilOrigin-Name: 17e7db488dac6b30d174f2272edf1046c2bb9990
2004-05-26 02:04:57 +00:00
danielk1977 17240fd90f More changes to do with the new sqlite3_step() API. (CVS 1458)
FossilOrigin-Name: e83138250ce0a8caacbd1822eec2e06796d2f5f2
2004-05-26 00:07:25 +00:00
drh 8c6fa9b03b Minor code fixes in btree.c and pragma.c to help with watcom C. (CVS 1457)
FossilOrigin-Name: 143c502a59e727975f61c8d13b6c5a90dad038f3
2004-05-26 00:01:53 +00:00
danielk1977 98d30677b0 Add file legacy.c with old APIs. (CVS 1456)
FossilOrigin-Name: ae18fcb7ad91096f8029605b54d71ec225f31f32
2004-05-26 00:01:35 +00:00
danielk1977 22322fd42b Move the sqlite3_exec() function to legacy.c. (CVS 1455)
FossilOrigin-Name: 9385ad5ca82c82d9ef699102ca0b53661d02a052
2004-05-25 23:35:17 +00:00
danielk1977 0ae8b83155 Change a couple of symbol names for the new user function API. (CVS 1454)
FossilOrigin-Name: 8f6b20c2938ded7ab9e400494c02370ecf7e9311
2004-05-25 12:05:56 +00:00
danielk1977 7e18c259fe Use the new API for returning values and errors from user functions. (CVS 1453)
FossilOrigin-Name: 4eccae03b4a7f37804fea30416579787c3584bb2
2004-05-25 11:47:24 +00:00
danielk1977 88208050b6 Add manifest type aware versions of the min() and max() aggregates. (CVS 1452)
FossilOrigin-Name: b77c268ebebd5401c3f519a72cfb81438207368c
2004-05-25 01:13:20 +00:00
danielk1977 6ddcca553d Aggregate functions also use sqlite_value* instead of const char * for
arguments. (CVS 1451)

FossilOrigin-Name: 5c28ed5e9b5a3ecb3081ce0c5c9450d6ae8dc77d
2004-05-24 23:48:25 +00:00
danielk1977 35bb9d026e Update the typeof() operator to respect manifest types. (CVS 1450)
FossilOrigin-Name: 162cf42e33691f4c9ec3a25abcaa2bdcdca2b5e0
2004-05-24 12:55:54 +00:00
danielk1977 51ad0ecd28 Non-aggregate SQL functions use sqlite_value* instead of const char * for
argument values. (CVS 1449)

FossilOrigin-Name: 1e47d7384d5fdfceb6ec737c656f70be59ba5b01
2004-05-24 12:39:02 +00:00
danielk1977 7e435458a0 Fix typo in vdbe.c from previous commit. (CVS 1448)
FossilOrigin-Name: a554bf6c7075839f760a2ff944ac61b32cab0821
2004-05-24 09:15:39 +00:00
danielk1977 0ffba6b269 Add the sqlite3_value_*() access functions. (CVS 1447)
FossilOrigin-Name: 4bf925fcfccb18e66be031f8a234f370d581e9ea
2004-05-24 09:10:10 +00:00
danielk1977 bd7e46086e Fix for retrieving UTF-16 little-endian text from a big-endian database. (CVS 1446)
FossilOrigin-Name: 8104baf23dd28fc982cf260e3e8c90f0c582f602
2004-05-24 07:34:48 +00:00
danielk1977 8a6b5411b3 Have the vdbe handle strings in the same encoding as the database. (CVS 1445)
FossilOrigin-Name: b7155db2b13aa3ca5f6c68e948d9e8740ebcac47
2004-05-24 07:04:25 +00:00
danielk1977 93d4675d67 Begin changing the vdbe so all stack values use the database encoding. (CVS 1444)
FossilOrigin-Name: f47de3a933b51b37629a0ca2e492a534a12e7339
2004-05-23 13:30:58 +00:00
drh 7906975a0f Remove the OP_SetInsert opcode. (CVS 1443)
FossilOrigin-Name: 18e690e405710c9a8010340c01754bbfa3231fe9
2004-05-22 21:30:40 +00:00
drh be94025f3b Move btree_rb.c into the attic. (CVS 1442)
FossilOrigin-Name: 4159ef235d780ec941677439e77c6fa96e24997c
2004-05-22 17:46:37 +00:00
drh bbd42a6dda Split up os.c into separate files, one for each platform. (CVS 1441)
FossilOrigin-Name: 5c61be1c47ac960fba2a642e69a98436ce1cd725
2004-05-22 17:41:58 +00:00
drh 60ca804396 Bug fix in vdbe.c - variable declarations must come before code in ANSI C. (CVS 1440)
FossilOrigin-Name: c36203de22f673691783529e06ce5a58bcebeedc
2004-05-22 11:09:30 +00:00
danielk1977 fe7fdb7344 Add a couple of tests for UTF-16 databases. (CVS 1439)
FossilOrigin-Name: 891be63a92097384e1b00993d35f002048c4b42e
2004-05-22 10:33:04 +00:00
danielk1977 e1cd98740f Add a couple of tests for UTF-16 databases. (CVS 1438)
FossilOrigin-Name: d7551df8c32c4981d94eb57cd2a999592e91f50f
2004-05-22 10:33:04 +00:00
danielk1977 802908635d Use the new form of the sqlite3_open() API everywhere. (CVS 1437)
FossilOrigin-Name: b449217318ade3196757bef8aaf7302634f0f9b6
2004-05-22 09:21:21 +00:00
danielk1977 28d47b57ec Tests for the functions in utf.c. (CVS 1436)
FossilOrigin-Name: 802d65affcafffda33e2ff1cbd4e4869dc3814df
2004-05-22 08:16:11 +00:00
danielk1977 172bc3938a Store the text encoding in the database (as meta value 4). (CVS 1435)
FossilOrigin-Name: 7f00ca5801889724c0e768961aa15f5ce0b8e7b5
2004-05-22 08:09:11 +00:00
danielk1977 18f4189055 A few bugfixes related to UTF-16 databases. sqlite3_open() still assumes a
UTF-8 database, and sqlite3_open16() still assumes a UTF-16 db. (CVS 1434)

FossilOrigin-Name: b3581d2796c8cb6581b7156774698a05fc8f800e
2004-05-22 07:27:46 +00:00
danielk1977 b1bc95315b Steps towards UTF-16 databases. Some tests are failing because of this
commit. (CVS 1433)

FossilOrigin-Name: c4a8246864eee7cb993ab7b703324d92c284d72a
2004-05-22 03:05:33 +00:00
drh ab01f61ab8 Update comments and remove dead code from btree.c (CVS 1432)
FossilOrigin-Name: 8069caca82bc4d40d8ac95bafdd91a18a70ab1e0
2004-05-22 02:55:23 +00:00
drh 1483e14cf7 Floating point values are serialized in big-endian byte order. (CVS 1431)
FossilOrigin-Name: acb65297b69c531813287166175fa7864c900fe6
2004-05-21 21:12:42 +00:00
drh 7f0f12e3ab Remove the OP_SetFound opcode and its cousins. (CVS 1430)
FossilOrigin-Name: 5524075ec02102446f8d153e068546f763d4bf7a
2004-05-21 13:39:50 +00:00
danielk1977 83ab5a8f62 Eliminate some unused code (CVS 1429)
FossilOrigin-Name: 550a53b3f28ddb288bcb6c21849ca83b0a20bde4
2004-05-21 11:39:05 +00:00
danielk1977 ca6b291fcf Pretty-print blobs in vdbe-traces. (CVS 1428)
FossilOrigin-Name: 5eb94c97657b34ed2df6455e23875e2840743bda
2004-05-21 10:49:47 +00:00
danielk1977 106bb236a8 Further work on the new API. All the functions to execute queries are there
now. (CVS 1427)

FossilOrigin-Name: fc94575d77f9865e1553bb70c2e3eda2a0b8669e
2004-05-21 10:08:53 +00:00
drh ce665cf60e Eliminate the OP_SortMakeRec and OP_SortCallback opcodes. Sort using the
standard record format. (CVS 1426)

FossilOrigin-Name: 25643a0137d395572f16cfec3ab3327d913138ba
2004-05-21 03:01:58 +00:00
drh 736c22b803 Most sorting problems are fixed. Dead code has been removed. 3 test failures
remain but will be fixed by the new function API once it gets implemented. (CVS 1425)

FossilOrigin-Name: 3b55095e036d68886d007239333bbf90acd15692
2004-05-21 02:14:24 +00:00
danielk1977 2f2322fa9c Fix typo in bind.test that was causing a seg-fault. (CVS 1424)
FossilOrigin-Name: d1af1a4acce77b87367049da93b13746b743e831
2004-05-21 02:11:40 +00:00
danielk1977 4ad1713c5e Add new sqlite3_open() and sqlite3_open16() APIs. (CVS 1423)
FossilOrigin-Name: 307b55006c401f10ec5fa5b12cc7d5ba860f9a46
2004-05-21 01:47:26 +00:00
drh ffbc30884c Sorting bug fixes. Now only 17 tests fail. (CVS 1422)
FossilOrigin-Name: 0736b7e8401f587f8b412602d029ef9bd69425f6
2004-05-21 01:29:06 +00:00
drh 1186b0a08b Fix a bug that prevented sorting by index. Down to 162 failed tests. (CVS 1421)
FossilOrigin-Name: b032b646b72a03e828d732ac22192f992904d79f
2004-05-20 23:37:54 +00:00
drh d3d39e939d Add internal support for collating sequences. This breaks 244 tests. (CVS 1420)
FossilOrigin-Name: a6cb09d7af537726acc87b9133f68c81e839e047
2004-05-20 22:16:29 +00:00
drh 53db145800 sqlite3MemCompare now takes a CollSeq* argument. (CVS 1419)
FossilOrigin-Name: 5c1e47a25244eacc69b688f5f4e62cec9f09665a
2004-05-20 13:54:53 +00:00
drh e2ea40d36d Fix problems with types and the recognition of BLOB as having no affinity. (CVS 1418)
FossilOrigin-Name: 8411718f0ac17e9c2376fdf8b5fa0cc5fc88be9b
2004-05-20 12:41:19 +00:00
drh 1ad3b9e61a Default type affinity is now NUMERIC. The affinity.html file checked into
the doc directory. (CVS 1417)

FossilOrigin-Name: 948307f07d6f8cc1cc186167ff7aaa5dfd5d8a2e
2004-05-20 12:10:20 +00:00
danielk1977 6622cce372 Add some more elements of the new API. (CVS 1416)
FossilOrigin-Name: 2821767b947ae1a70e98dd7f47d69e424c37947f
2004-05-20 11:00:52 +00:00
drh 137b35e480 Fix the misc3.test test file. (CVS 1415)
FossilOrigin-Name: 478836f44825d8154c0106e46e9a2b2daaa4cf33
2004-05-20 03:30:10 +00:00
drh d686179207 Bug fix associated with misc3.test. (CVS 1414)
FossilOrigin-Name: a7f02db73881eb2d899daa93646962960dac5375
2004-05-20 03:02:47 +00:00
drh b6f5452fb2 Bug fix associated with OP_SetNumColumns in insert.c. Also changed a
variable name in OP_Column. (CVS 1413)

FossilOrigin-Name: bf2181f13fdad72d8c90eccc2d29034178181731
2004-05-20 02:42:16 +00:00
drh 465407d9b6 VACUUM works again. (CVS 1412)
FossilOrigin-Name: c4e1d02ffded1421c09b0c8e45954e69f3583297
2004-05-20 02:01:26 +00:00
danielk1977 e3209e4eb6 Add some comments for sqlite3_bind_*() APIs. (CVS 1411)
FossilOrigin-Name: 46b0942239dde9982abaaa7f77d5cf8375eb4209
2004-05-20 01:40:18 +00:00
danielk1977 51e3d8e204 Add support for the new sqlite3_bind_*() APIs. (CVS 1410)
FossilOrigin-Name: e8f980d842fcd793552acd32708db55c8f014634
2004-05-20 01:12:34 +00:00
drh a34a84fe1a Get more tests running. (CVS 1409)
FossilOrigin-Name: 7eb3f29e305d0f455f6544560c567fa6b6e24986
2004-05-19 21:09:31 +00:00
drh fec19aad44 Correctly handle 64-bit integers in SQL statements. (CVS 1408)
FossilOrigin-Name: 34f03ba6a9d6e2144d0c6cbbbeb37b4c69705f1f
2004-05-19 20:41:03 +00:00
drh 7cf6e4de35 Change opcode names and comments to better describe the operation of
the incrKey flag.  OP_MoveTo becomes OP_MoveGe. (CVS 1407)

FossilOrigin-Name: 8f249c45cbc77f4320798ff1a830b55e5c74888a
2004-05-19 14:56:55 +00:00
drh 772ae62a82 Bug fixes in where.c. The where.test test works again. (CVS 1406)
FossilOrigin-Name: 7c31e257e2d109bfedf63dc307b422e1abd46d0e
2004-05-19 13:13:08 +00:00
drh 09e490ce3c Really remove the OP_StrEq opcode this time - appearently I didn't save the
file out of the editor before doing the check-in (1397). (CVS 1405)

FossilOrigin-Name: 821b0b297c11a5e8d08d73b5eff810652e5a0d27
2004-05-19 11:31:12 +00:00
drh 5a12e68986 Variable name change: azVar to apVar. (CVS 1404)
FossilOrigin-Name: 45169ce015da07da9a874b5b075ea6a05f59f162
2004-05-19 11:24:25 +00:00
danielk1977 54db47e3da Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1403)
FossilOrigin-Name: f71844bc27c9fc799af3337daf2a212370d4a724
2004-05-19 10:36:43 +00:00
danielk1977 c7134988f4 Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1402)
FossilOrigin-Name: a0f3f6ed2327992036267627cf663e5ca56bd3ae
2004-05-19 10:35:01 +00:00
danielk1977 e4b7c01fd5 Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1401)
FossilOrigin-Name: 33293ae1849dcb4587b8463466bdde2dd9336b82
2004-05-19 10:34:56 +00:00
danielk1977 295ba55ac6 Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1400)
FossilOrigin-Name: 4e602bb473e22cc45de2f5788c035d18586cb836
2004-05-19 10:34:51 +00:00
drh a9fd84b034 Add definitions of the CollSeq and KeyInfo structures. (CVS 1399)
FossilOrigin-Name: cd1be81569aa6d5a365eb27b7d067a153079ce45
2004-05-18 23:21:35 +00:00
drh 428702d730 Remove dead code from vdbeaux.c. Add comments describing desired changes
to OP_Sort processing in select.c (CVS 1398)

FossilOrigin-Name: ae37e8a0bff39fd1568eae83f8761c34cd0184fc
2004-05-18 22:38:31 +00:00
drh d93b626c0a Remove the OP_StrEq opcodes. (CVS 1397)
FossilOrigin-Name: 238442bbd267faee3eb70048bd9419af99c02931
2004-05-18 22:17:45 +00:00
drh 7efd61f240 Remove dead code from util.c (CVS 1396)
FossilOrigin-Name: 3ce42e85a2e6c95ebc0857436d5fe9384cab8628
2004-05-18 22:03:42 +00:00
drh d8820e80fc New varint encoding gives a maximum varint length of 9 instead of 10. (CVS 1395)
FossilOrigin-Name: 61bdb53a363644074d01682fab8220078523676b
2004-05-18 15:57:42 +00:00
drh 10c0fa6a75 Additional debugging output from btree.c (CVS 1394)
FossilOrigin-Name: b2def1852c5357629cf69f0071963f9883074a70
2004-05-18 12:50:17 +00:00
danielk1977 bf3b721fab Fix many problems with manifest types and column affinity. Most things are
working now. (CVS 1393)

FossilOrigin-Name: ad4a964158ba9ca9d221cf7ea0439577f3894890
2004-05-18 10:06:24 +00:00
danielk1977 84ac9d02dd Fix many problems with manifest types and column affinity. Most things are
working now. (CVS 1392)

FossilOrigin-Name: a62872aacd544a1465b06e007153168663f3c83a
2004-05-18 09:58:06 +00:00
danielk1977 eb015e03e1 Bugfix for row format. (CVS 1391)
FossilOrigin-Name: c1745f47ae6597953426c852559c3ba559b5ecd4
2004-05-18 01:31:14 +00:00
danielk1977 b4964b723c Omit the '\0' at the end of UTF-8 strings on disk (it is implied). Also
don't store the number of rows at the beginning of each table record. (CVS 1390)

FossilOrigin-Name: 202a470f2c1804a96e69f16709d1a92e405971f0
2004-05-18 01:23:38 +00:00
danielk1977 e014a83880 More changes to support the new types model. Compound SELECTs are currently
broken. (CVS 1389)

FossilOrigin-Name: 0f6c9b05e688e281fa168aacdd867db408df2863
2004-05-17 10:48:57 +00:00
danielk1977 93edea9380 Fix a bug meant real numbers with a negative sign were being stored as
strings by default (instead of IEEE floats). (CVS 1388)

FossilOrigin-Name: 9321e7426337e04064b5791c48dd5fc3c1eecaa2
2004-05-16 22:55:28 +00:00
drh 96f5b7672d Fix a bug in the BTree balancing routine. (CVS 1387)
FossilOrigin-Name: 6c73544bfacb891aae8d6124a2903ccff616494b
2004-05-16 16:24:36 +00:00
danielk1977 f9dd2c2e04 Fix two bugs that were causing lots of tests to fail. (CVS 1386)
FossilOrigin-Name: 5cba8a510c0aeae740db695e960c60e5f6c303f5
2004-05-16 11:57:28 +00:00
danielk1977 a37cdde042 More changes to support the manifest type model. A few things are currently
broken. (CVS 1385)

FossilOrigin-Name: a4af838f8d1b81ec6c8db97655c6876aca0738d9
2004-05-16 11:15:36 +00:00
drh 3add367f2f More speed improvements to btree. (CVS 1384)
FossilOrigin-Name: aab4b794b4238bad5c4a6aee7d4443732921127d
2004-05-15 00:29:24 +00:00
drh d7556d209e Allocates VDBE cursors one by one in separate memory so that pointers to
cursors can persist through a realloc(). (CVS 1383)

FossilOrigin-Name: d8bacc16801606176fe8639b2f55b4584ad549df
2004-05-14 21:59:40 +00:00
drh 9188b38919 Cache record headers in the OP_Column opcode. (CVS 1382)
FossilOrigin-Name: 8d9eab178f285415775060369f372a88c7091f9f
2004-05-14 21:12:22 +00:00
drh fa1a98a24e More speed improvements. (CVS 1381)
FossilOrigin-Name: cf75cac9b6bd43e60c6e25042b194ec5c60e5671
2004-05-14 19:08:17 +00:00
drh 6d2fb15475 Optimized varint routines and tests added. (CVS 1380)
FossilOrigin-Name: d4e0933dc72b66157164610e0b03f339bc535fb9
2004-05-14 16:50:06 +00:00
drh 10617cddf6 Performance improvements (CVS 1379)
FossilOrigin-Name: cad47917267d32ab00c8b949151c8bc3c6638479
2004-05-14 15:27:27 +00:00
drh e6c438166f Table 1 of a database (the sqlite_master table) defaults to use B+trees. (CVS 1378)
FossilOrigin-Name: 45b60de5c7deb83d10ab54759434e32847f0c2ef
2004-05-14 12:17:46 +00:00
danielk1977 940762585e Use B+trees for tables (CVS 1377)
FossilOrigin-Name: c6604a94d25d148fbb42b47ae9a8195e4697c681
2004-05-14 12:16:11 +00:00
danielk1977 13dadd2798 Delete some code no longer in use (CVS 1376)
FossilOrigin-Name: f24aedc2b0c401d8b714ba39b604d7caa7f6a430
2004-05-14 11:16:56 +00:00
danielk1977 3d1bfeaa22 Implement type affinity for table and index records (CVS 1375)
FossilOrigin-Name: dbfe6e93166d9557d66cab9dca7977baa3501e5e
2004-05-14 11:00:53 +00:00
drh b6f4148607 Changes to btree and pager in preparation for moving to run-time page
size determination. (CVS 1374)

FossilOrigin-Name: f63fb6dd4e8e33d4c1983396b1a0305836ee4df7
2004-05-14 01:58:11 +00:00
danielk1977 e7c8d58a1f Changes to make regression tests in rowid.test pass. (CVS 1373)
FossilOrigin-Name: 790226c94493a6d58a7e52fd3ed35ef495fab11e
2004-05-13 13:38:52 +00:00
danielk1977 50ce750c2a Change the OP_ListXX opcodes to use 64 bit integers (CVS 1372)
FossilOrigin-Name: da9b3dce334bde99360db45b4a3d41be519ec2d1
2004-05-13 12:32:11 +00:00
danielk1977 9688f3796b Update quick.test (CVS 1371)
FossilOrigin-Name: a61eefa081c219704d9e6c4ee20ef9bf01d76b7f
2004-05-13 11:46:00 +00:00
danielk1977 96fc5fe6a5 Various minor fixes and updates to make more test cases pass. (CVS 1370)
FossilOrigin-Name: dbe8385ecf1df8bf0b1baf5e811ec5a1de5c4c42
2004-05-13 11:34:16 +00:00
danielk1977 183f9f7360 Commit vdbeaux.c, which should of gone in with the previous commit. (CVS 1369)
FossilOrigin-Name: 5378a6404058f5e9d3e91269ab27afef9874b43a
2004-05-13 05:20:26 +00:00
danielk1977 452c989fd8 Manifest types in indices. At the moment indices use manifest typing, but
some other parts of the SQL engine do not, which can lead to some strange
results. (CVS 1368)

FossilOrigin-Name: 9f2b6d9d3a07e25fcdb7e8290da7a182a65c37b2
2004-05-13 05:16:15 +00:00
drh 6f11bef7d6 Allocate more overflow data onto overflow pages, thus wasting less disk space. (CVS 1367)
FossilOrigin-Name: 1d52a4bb478648ef53a0dbb21865ccb9281dc24a
2004-05-13 01:12:56 +00:00
drh fc70e6fcec Fix a problem with B+trees. (CVS 1366)
FossilOrigin-Name: 64a75c4cd40f79c7b384bb2972922ff0c10212a4
2004-05-12 21:11:27 +00:00
drh 8b18dd4fb5 Implement a B+tree option (all data stored on leaves). (CVS 1365)
FossilOrigin-Name: b8f70d17f06531269caa0a127efb2d25ad0f3e1c
2004-05-12 19:18:15 +00:00
drh 4a1c380a4b Btree uses signed integers for the rowid. The intToKey() and keyToInt() macros
are now no-ops. (CVS 1364)

FossilOrigin-Name: fb3c80301441f0d255164578601439db3e0c7a61
2004-05-12 15:15:47 +00:00
drh ac69b05efa The pager now handles file ":memory:" complete in memory with no disk I/O. (CVS 1363)
FossilOrigin-Name: 97de9f7ceebab859ef984d155808575ad321afc0
2004-05-12 13:30:07 +00:00
danielk1977 8d059845fc Add some more code to support manifest typing in indices. Not activated yet. (CVS 1362)
FossilOrigin-Name: 2f16c9ef3c101c4280991ce3cb0c3bea7b6ed439
2004-05-12 11:24:02 +00:00
danielk1977 cfcdaefe11 Change the table record format to support manifest typing. (CVS 1361)
FossilOrigin-Name: 0242c9e4f7c85e9c911cf30d90b0cdb1015f3d7d
2004-05-12 07:33:33 +00:00
drh 779b6d357a Change sqlite_ to sqlite3_ in the attach2.test test script. (CVS 1360)
FossilOrigin-Name: 98f756e6a0809e7034bfb587ff9d9085baac0c6e
2004-05-11 10:04:48 +00:00
drh f4dada7512 A different fix for the problem with opening existing files. See also
check-in (1358). (CVS 1359)

FossilOrigin-Name: 93deaf54c6e1daee0c89a5e2a7d4a5e712ece3f4
2004-05-11 09:57:35 +00:00
danielk1977 bf57cfebc2 Fix a bug that was preventing the library from opening existing files. (CVS 1358)
FossilOrigin-Name: ad064bd429602fcac26b377841da90a1a56f5966
2004-05-11 09:50:02 +00:00
drh a3b321df91 Fix an offset problem in the meta values that was causing problems for
many tests. (CVS 1357)

FossilOrigin-Name: 6d378cb7e7e081bb3bcd3a347bc1e02f50ee25cc
2004-05-11 09:31:31 +00:00
drh 33825340cb Remove the unused upgrade_3_schema subroutine from main.c. (CVS 1356)
FossilOrigin-Name: b5d2771ee0e9c77967b4a64a97dcd56c067bc7b8
2004-05-11 09:05:48 +00:00
danielk1977 9400f26176 More small changes to get test cases to execute. (CVS 1355)
FossilOrigin-Name: 6dc6004684a97fbdba2f2dce94086dc2c4967a42
2004-05-11 08:48:10 +00:00
danielk1977 3d68f03a96 Remove code dealing with old file formats. (CVS 1354)
FossilOrigin-Name: dfde112116b982017a5516590ff1780e8aa519ce
2004-05-11 07:11:51 +00:00
danielk1977 36a3c70b98 More minor changes to accomadate the new btree. All the select* tests
pass now. (CVS 1353)

FossilOrigin-Name: 941d0fdc97ad0a2ba0e823ce40022bdef857aa6e
2004-05-11 06:55:14 +00:00
danielk1977 6490bebd62 Minor changes to the vdbe so that more tests pass. (CVS 1352)
FossilOrigin-Name: 16078fe0ea146537f75b869e6b0cce202af6781b
2004-05-11 06:17:21 +00:00
danielk1977 0dbe72b952 Fix up a couple of little things in the vdbe. select1.test passes now. (CVS 1351)
FossilOrigin-Name: 9ba0df4d7792dccb67782113751c0e5807348d62
2004-05-11 04:54:49 +00:00
danielk1977 643631771d Internal symbols MEM_Dyn and MEM_AggCtx were defined as the same bit pattern.
Change MEM_AggCtx to 0x1000. (CVS 1350)

FossilOrigin-Name: 2fffd133a5e0058f02c20c498875093261e9ee19
2004-05-11 03:11:22 +00:00
danielk1977 49f737d124 Fix a bug in the btree code for reading varints greater than 2^32. (CVS 1349)
FossilOrigin-Name: 7bc4f5543fbfa9f3fe6e9479a1f85fbaf6c95af4
2004-05-11 02:10:06 +00:00
drh 1bbf5ee85c Update the main.mk makefile so that it builds everything again. (CVS 1348)
FossilOrigin-Name: e6e52fc2e62835712d6b92a19fdbd2ba15b2e9cd
2004-05-11 01:18:24 +00:00
drh 0e1c19e2b6 Updates to sqlite3BtreeKeyFetch() and sqlite3BtreeDataFetch(). (CVS 1347)
FossilOrigin-Name: a675ac49882887dfcbf671e9092a29aca9eb694e
2004-05-11 00:58:56 +00:00
danielk1977 5f8d8a844c Change to OP_PutIntKey to use new btree API. (CVS 1346)
FossilOrigin-Name: c080fed7b58e754bb34afe597ff3b2f399c7d313
2004-05-11 00:28:42 +00:00
drh f328bc80ce Work toward getting the new btree.c integrated with vdbe.c. (CVS 1345)
FossilOrigin-Name: bc5a2dafa1df74ba6403b4751ac1c33b0fee2884
2004-05-10 23:29:49 +00:00
drh 3644f0858d The btree.c module passes all tests and is ready for integration.
Still need to go back and do coverage testing. (CVS 1343)

FossilOrigin-Name: 84506b23365933383397e02a8ec5a980c57c80fc
2004-05-10 18:45:09 +00:00
drh 24cd67e732 The btree.c module now passes all the historical regression tests. New tests
for new functionality still need to be added. (CVS 1342)

FossilOrigin-Name: 433ae0d327e5d5b0761e88418ed57fc4cbf4966b
2004-05-10 16:18:47 +00:00
drh 3dc0b8ebe3 Add flags values to the Mem structure to accomodate BLOBs and to show
the representation of strings. (CVS 1341)

FossilOrigin-Name: 3af283f483f75795d5b03dc8fd886aaf326d50b7
2004-05-10 12:07:10 +00:00
danielk1977 1d994699a0 Change the names of external symbols from sqlite_XXX to sqlite3_XXX. (CVS 1340)
FossilOrigin-Name: ac46bd686d2211813d254af578fe4e211162bc4b
2004-05-10 10:37:18 +00:00
danielk1977 132872b37e Change the names of external symbols from sqlite_XXX to sqlite3_XXX. (CVS 1339)
FossilOrigin-Name: 19b100ec0d088b2cca147c967a80d18403b7ee86
2004-05-10 10:37:18 +00:00
danielk1977 6f8a503d71 Change the names of external symbols from sqlite_XXX to sqlite3_XXX. (CVS 1338)
FossilOrigin-Name: 2242423e31a5e81e89ffcc99e62307c5cc0120d5
2004-05-10 10:34:51 +00:00
danielk1977 24b03fd055 Change the names of external symbols from sqlite_XXX to sqlite3_XXX. (CVS 1337)
FossilOrigin-Name: ba2ba24263a9e4d1b65b441295504a5da6380f33
2004-05-10 10:34:34 +00:00
danielk1977 90e4d95d14 Add some functions to serialize and deserialize vdbe values (used
by manifest typing). (CVS 1336)

FossilOrigin-Name: 05434497ba5d9971d23144eb4b9d709c233f6546
2004-05-10 10:05:53 +00:00
danielk1977 9490bee025 Add versions of OP_MakeRecord and OP_Column that use manifest typing (not
activated yet). (CVS 1335)

FossilOrigin-Name: 9ea8e8ab23d46adb2970ccf62340703ec42345fa
2004-05-10 07:17:31 +00:00
danielk1977 192ac1dcab Add versions of OP_MakeRecord and OP_Column that use manifest typing (not
activated yet). (CVS 1334)

FossilOrigin-Name: 8a66a502ba09e3d858d2f45df9b3b665ebb85d5b
2004-05-10 07:17:30 +00:00
danielk1977 8e150818ec Change some code that assumes the root-page of sqlite_master is 2 (it is
now 1) (CVS 1333)

FossilOrigin-Name: 37ae528fb85799007f4ddfc56a7d9493dbb29cbf
2004-05-10 01:17:37 +00:00
danielk1977 189621d81f Add a temporary sqlite2BtreeKeyCompare() function to help get
regression tests passing again. (CVS 1332)

FossilOrigin-Name: d8d1c91e55f24d17233414facaa03136b3b320d5
2004-05-09 23:23:56 +00:00
drh 3a4c141357 More btree.c bug fixing. It's getting closer but still not there yet.
Move obsolete test scripts into the attic. (CVS 1331)

FossilOrigin-Name: 9379c7c9cf8b0770a0c8d1feb5ffdba342173589
2004-05-09 20:40:11 +00:00
drh da200cc1c7 The btree.test test is no working with integrity_check enabled. (CVS 1330)
FossilOrigin-Name: 9f1caa530e69aaf202debac36b6a46d707f362d7
2004-05-09 11:51:38 +00:00
drh 457f501464 Begin trying to get integrity checking working on the new btree.c. (CVS 1329)
FossilOrigin-Name: 499569daa6a3aed6609bcb1e11a3d231e13f4f9c
2004-05-09 01:35:05 +00:00
drh c12fc0d85f All tests in btree.test now pass (but only because I commented out the
btree_integrity_check test.) (CVS 1328)

FossilOrigin-Name: ee706e9c74c3fb32fc3369db226fad9ed4db7596
2004-05-09 00:40:52 +00:00
drh c8629a13e1 More btree.c bug fixes. (CVS 1327)
FossilOrigin-Name: e9f84ff3fe45a014ab60fabbfd91d19e6d353477
2004-05-08 20:07:40 +00:00
drh ab9f7f12d5 Get the code back to the point where it will compile the btree.c tests.
Move the default key comparison routine from btree.c into vdbeaux.c.
Commented out code in vdbe.c that will need to be fixed. (CVS 1326)

FossilOrigin-Name: 2bca92240b16a51f78661c3ba4d779d231780f8d
2004-05-08 10:56:11 +00:00
drh eec983e175 Minor change to main.c so that it will compile with GCC 2.96. (CVS 1325)
FossilOrigin-Name: 1a09a1ada199b76926c64bd79ad39d6d50a75011
2004-05-08 10:11:36 +00:00
danielk1977 4adee20fcb Change lots of internal symbols from sqliteXXX to sqlite3XXX so that the
library links again. It doesn't work yet, due to changes in the btree layer
calling convention. (CVS 1324)

FossilOrigin-Name: 8af6474c49263ae26216dff9465b33f76b500cf4
2004-05-08 08:23:19 +00:00
drh 9b17127705 More bug fixes in btree.c. (CVS 1323)
FossilOrigin-Name: 2d64cba38c0f5fffa18cb30c4c448278837de49d
2004-05-08 02:03:22 +00:00
drh c39e000bbf More bug fixes in btree.c. (CVS 1322)
FossilOrigin-Name: a80939ef714ec884950b4a1f4f809ffa37fdfa59
2004-05-07 23:50:57 +00:00
drh de64713041 The btree.c module compiles and links and passes some tests. Many tests
still fail, though. (CVS 1321)

FossilOrigin-Name: d394b2b217d4d728f9eba397262bf9d36195719e
2004-05-07 17:57:49 +00:00
drh a34b676483 New btree.c module compiles and links. (CVS 1320)
FossilOrigin-Name: dcd6b55f932a7ade4ad058534651e198b56370ad
2004-05-07 13:30:42 +00:00
drh 4fc0fb4358 Trying to synchronize the test3.c module with the new btree.c code. (CVS 1319)
FossilOrigin-Name: 7fd1a660b0607b7c36de1278724521cbea72af0c
2004-05-07 02:26:28 +00:00
danielk1977 697e6e27b8 Fix compilation problem in test5.c (CVS 1318)
FossilOrigin-Name: 49c3c86c17bcd8132216791d7a1a17e2c6256206
2004-05-07 01:50:37 +00:00
danielk1977 998b56c351 Add code to convert between the various supported unicode encoding schemes.
Untested at this point. (CVS 1315)

FossilOrigin-Name: 71260ff7f7030f56c292b43f83a213c65c9a184e
2004-05-06 23:37:52 +00:00
drh 23e11cab7d Update test3.c to work with the new btree.c API. (CVS 1314)
FossilOrigin-Name: bfb3234dc60c9152fdf0a16b887089365443f5ed
2004-05-04 17:27:28 +00:00
drh a5d14fe7c5 Added template for the utf.c file containing conversion routines. (CVS 1313)
FossilOrigin-Name: 89b42c468f437003f74a1785370e75b2585fa9e2
2004-05-04 15:00:46 +00:00
drh 9102529d8c Incremental btree.c changes. (CVS 1312)
FossilOrigin-Name: fdc629dbbf974024215969e0bd3def4597258812
2004-05-03 19:49:32 +00:00
drh 4b70f11aea Changes to btree for the new file format are mostly complete. Still need
to test and debug. (CVS 1311)

FossilOrigin-Name: 0eee3b5cd400e9548437632ec1dfe625a3fca9cf
2004-05-02 21:12:19 +00:00
drh 8856d6aad2 Sync all version 3 changes. (CVS 1309)
FossilOrigin-Name: 51892d6cdc739bb049fdfce8301354312167c181
2004-04-29 14:42:46 +00:00
drh 3aac2dd7bc Pager tests working. (CVS 1308)
FossilOrigin-Name: 910067a200c4b25b5d813a84146673d3d1c80952
2004-04-26 14:10:20 +00:00
drh 9e572e608f Begin modifying the BTree code for the new version-3 file format.
This is a work-in-progress.
As of this check-in, SQLite will not build. (CVS 1306)

FossilOrigin-Name: ce0bbd3a7159e12c86c5cde6571d6668b234827b
2004-04-23 23:43:10 +00:00
drh cc83b6e071 Add an extra assert() to lemon.c to make debugging easier. Ticket #692. (CVS 1305)
FossilOrigin-Name: 818bdba5dc25cda56716fdda1781a3d4ecb3a111
2004-04-23 23:38:42 +00:00
drh 226e5f9de7 Branch version_2. Code for version 3 is on the trunk. (CVS 1303)
FossilOrigin-Name: db84ddf5408d1efe9e0e5eef2f5d875c9e2c8e99
2004-04-23 23:19:59 +00:00
drh 1bdd9b5787 Get the temp_store and default_temp_store pragmas working. Update the
documentation.  Also fix a malloc problem that popped up during the regression
testing. (CVS 1302)

FossilOrigin-Name: 7ace576215367101904677bd69951755ee9cb1a1
2004-04-23 17:04:44 +00:00
rdc 932ee8f4bb Fix windows DLL section of Makefile.in for use with build dir. (CVS 1301)
FossilOrigin-Name: 1e84f70fb98755651e0c04dc2cf0114e2e6fe39c
2004-03-26 23:16:31 +00:00
drh d888544275 Change the ".database" command in the shell to allocate more characters to
the database name and filename. (CVS 1300)

FossilOrigin-Name: 85238f06902851dd5085395501a0ab2d6a2b9814
2004-03-17 23:42:12 +00:00
drh 8b8891bf0a Fix a VDBE stack overflow that occurs when the left-hand side of an IN
expression is NULL and the result is stored on the stack rather than used
to control a jump.  Ticket #668. (CVS 1299)

FossilOrigin-Name: fc7a7975b03c144c2db3566facd008d3701c735e
2004-03-17 23:32:08 +00:00
drh 276fd588d8 The sqlite_trace() API only works for commands started by the user, not for
SQL commands run during initialization. (CVS 1298)

FossilOrigin-Name: 0a12473c4ae370ec34f1f431dd6d7d6ffa25d41a
2004-03-17 18:44:45 +00:00
dougcurrie a8804c82b8 Makefile.in and sqlite.def changes for encode and non-toplevel build; ticket #667 (CVS 1297)
FossilOrigin-Name: 72205a371ce5be4eac0a77d5d2fa8ccb23bb988f
2004-03-16 21:49:49 +00:00
drh 6ff15d0c49 Prototypes for sqlite_encode_binary() and sqlite_decode_binary() added
to sqlite.h. (CVS 1296)

FossilOrigin-Name: 359f0e787ff2d4d10fd23059e2ce99670e93f66a
2004-03-14 22:12:34 +00:00
drh 6da834a8b4 Make sqlite_encode_binary() and sqlite_decode_binary() an official part of
the library. (CVS 1295)

FossilOrigin-Name: 786fe545560ec6c42bb0e344345031f425bf177a
2004-03-14 22:11:59 +00:00
drh 371cb93a2a Updates to the architecture document. (CVS 1294)
FossilOrigin-Name: c661cc81b6981c536c107f40525ad9783b11ea82
2004-03-14 11:57:58 +00:00
drh 6e17529e97 Fix the min/max optimizer so that it works when the FROM clause is a
subquery.  Ticket #658. (CVS 1293)

FossilOrigin-Name: 31c94acc72d318b5dec0fef1485621943add45c8
2004-03-13 14:00:36 +00:00
drh 1a72d72a7f Typecast to work around a bug in {quote: CodeWarrior} Studio v9.1.
Ticket #654. (CVS 1292)

FossilOrigin-Name: 5864fc6937b933b7da0c00e6c4c2ee1b9b939cff
2004-03-10 18:57:31 +00:00
a.rottmann 7972e32a9e Fixed default target. (CVS 1291)
FossilOrigin-Name: af19ab32c5b329b053f3daf3c812eb593b89cd7f
2004-03-10 18:53:09 +00:00
a.rottmann 66eb270d6b * Added rule for rebuilding Makefile from Makefile.in.
* Fixed double-slash problem induced by adding DESTDIR support. (CVS 1290)

FossilOrigin-Name: 957827e35cca65de11894eb2dfc78327f4034dfc
2004-03-10 16:32:03 +00:00
drh a0c9a112de The BTree layer now returns SQLITE_READONLY on an attempt to open a write
cursor on a read-only database.  Previously, the failure would not occur
until there was an attempt to write to the cursor. (CVS 1289)

FossilOrigin-Name: 8a8be4687bf9fd88952b303f30f93aa6fed75b60
2004-03-10 13:42:37 +00:00
drh 06333689a7 The shell program now ignores extra whitespace at the end of dot-commands. (CVS 1288)
FossilOrigin-Name: b6817e99bd97f427b1cfd16328d612e1a7d70d0a
2004-03-09 13:37:45 +00:00
drh a2cfd57491 Version 2.8.13 (CVS 1287)
FossilOrigin-Name: 4d5bbb3dc32412ee7fa5dec42d3278836a362e8c
2004-03-08 13:57:54 +00:00
drh e3f25eb91e Update change log for version 2.8.13. (CVS 1286)
FossilOrigin-Name: 4431e63746311d2e3429203656f8168c227ecb6e
2004-03-08 13:45:24 +00:00
drh 489c4677a0 Bump the version number to 2.8.13. Patch up the limit test so that it works
in spite of ticket #521 - we don't want any tests failing in an official
release even if there are bugs. :-D (CVS 1285)

FossilOrigin-Name: 2c6bd21ed0e212109cfb4a37cfac2a10ab58a024
2004-03-08 13:26:17 +00:00
rdc aa5707cd5e Correct duplicate tracing of SQL statements. (CVS 1284)
FossilOrigin-Name: bb67311b3db49ce772533da14f62497c55432fae
2004-03-04 19:09:20 +00:00
drh 79f14b7240 A vdbe stack element might have a string value even after a call to
Integerify().  Ticket #641. (CVS 1283)

FossilOrigin-Name: 3cac4b7b526d6c5dbf394009b534707bcb65b0da
2004-03-03 01:51:24 +00:00
drh b1aa04fccc Make sure a LIMIT clause on a SELECT cleans up the vdbe stack so that if it
occurs inside a trigger, it won't cause a stack overflow.  Ticket #640. (CVS 1282)

FossilOrigin-Name: 5aaa2939baa972231def086ed5f9d9ba63302532
2004-03-02 18:37:41 +00:00
a.rottmann 9bc8b93f41 Updated aclocal.m4 and configure. (CVS 1281)
FossilOrigin-Name: 76d42921a475c531a77677c3fe73b6da265a878d
2004-02-29 15:18:31 +00:00
drh 0d131ab716 One more fix to the new HH:MM:SS modifier. This time add some test
procedures too. (CVS 1280)

FossilOrigin-Name: 7b3b8968ee9a5349dd6e9ae1e7a311bf8906607c
2004-02-29 01:08:17 +00:00
drh b6829e94bd Try again to get the HH:MM:SS modifier change right... (CVS 1279)
FossilOrigin-Name: e20d51f94ed67b8864a435e5735f61f396662c21
2004-02-29 00:50:33 +00:00
drh 446536a089 Fix a bug in the HH:MM:SS modifier change that was just checked in. (CVS 1278)
FossilOrigin-Name: 248b5500900bc8f401006aaa9b7dac090ae419fa
2004-02-29 00:48:08 +00:00
drh 33a9ad2f8c Allow time modifiers of the form HH:MM:SS.SSS with an option "+" or "-"
prefix.  The specified amount of time is added into the date-time begin
modified. (CVS 1277)

FossilOrigin-Name: 559002a52fe3c42fe71ffce364eff4a036ae6b83
2004-02-29 00:40:32 +00:00
drh 3039c0a896 Fix some compiler warnings in LCC. The warnings did not indicate real
problems.  Ticket #634.  Not all warnings in ticket #634 were fixed. (CVS 1276)

FossilOrigin-Name: e97089b7df3e2fbfcf36062099d02ecb75e9a870
2004-02-29 00:11:30 +00:00
a.rottmann 1d78a38f51 Make Windows .dll build use the real .o files, not the libtool-faked .lo
ones. (CVS 1275)

FossilOrigin-Name: cce5bbf49b0a30c40d24a559bc6cb4585dd9aea5
2004-02-28 18:02:20 +00:00
a.rottmann 964dbb1e6c Build system update:
* Update of generated/libtoolized files: config.guess, config.sub,
   configure, ltmain.sh
* Removal of libtool, which is generated by configure
* Changes to Makefile.in, adding better support for newer libtools (CVS 1274)

FossilOrigin-Name: 22d63bbf78997f0b31bb39054fbcfccf9d974bd6
2004-02-26 19:47:42 +00:00
rdc f146a77677 Add comments and prototype for experimental sqlite_last_statement_changes() API function. Also, allow function to be called from tcl. (CVS 1273)
FossilOrigin-Name: ca99920b0dbf773962b47766d690154fd1276513
2004-02-25 22:51:06 +00:00
drh 268380ca9e Min() and max() functions honor the distinction between TEXT and NUMERIC
data.  Ticket #623.  typeof() is now a user function.  Some tests are
now failing due to ticket #521. (CVS 1272)

FossilOrigin-Name: adbe31adf1ad0ca723203ca3d7dc480324c60d43
2004-02-25 13:47:31 +00:00
drh d41d73d556 Fix the return type of sqliteRunVacuum. Ticket #627. (CVS 1271)
FossilOrigin-Name: 9c9f4a867a4ea708847cbb0839b7279eb33ecd7c
2004-02-25 02:33:34 +00:00
drh f73287ceb0 Shell program saves command-line history on a ".quit". Ticket #614. (CVS 1270)
FossilOrigin-Name: 114b72f8608b8e08fad863a1446fb1ef59610efd
2004-02-25 02:25:37 +00:00
drh 946966f2a1 Disable an assert which (as it turns out) is not always true. Ticket #615. (CVS 1269)
FossilOrigin-Name: 2773c1d384b750eee037e6ccc61bc56b5204d690
2004-02-25 02:20:41 +00:00
drh cd44690ad0 Refactor parts of write operations. (CVS 1268)
FossilOrigin-Name: 5b0147aece7785373e6f7439c32e5f58c6b12562
2004-02-24 01:05:31 +00:00
drh 02f75f19e5 Make sure BEGIN, COMMIT, and ROLLBACK are really no-ops when preceded
by EXPLAIN.  Ticket #626. (CVS 1267)

FossilOrigin-Name: 2af1f065b5eb39fd3ecac00f8a66d1b4186aead5
2004-02-24 01:04:11 +00:00
drh 701a0aebe2 Use sqliteVdbeOp3 instead of sqliteVdbeChangeP3 where applicable. (CVS 1266)
FossilOrigin-Name: 51f1e8f7539596b33bc3365ec8f34041602d049c
2004-02-22 20:05:00 +00:00
drh d383401c6a Code cleanup in build.c. (CVS 1265)
FossilOrigin-Name: 9211e14cf81f4de125bad246d8a289786f2854aa
2004-02-22 18:56:49 +00:00
drh f7a9e1ac87 Use sqliteErrorMsg instead of sqliteSetString whereever practical. (CVS 1264)
FossilOrigin-Name: 69aac043af7f93e7b3f036622c0ac9261cae1839
2004-02-22 18:40:56 +00:00
drh eb9a9e8888 Code cleanup in the date and time functions. (CVS 1263)
FossilOrigin-Name: 9b3bcde1530091602e551435ffd7820eb79727d5
2004-02-22 17:49:32 +00:00
drh 2d3917da29 Rearrange the grammar some so that tokens that are used together appear
together in the grammar file.  This reduces the size of the parser tables
and some of the jump tables in switch statements. (CVS 1262)

FossilOrigin-Name: d372c16ec6621dbab371bff7f1803ca096862984
2004-02-22 16:27:00 +00:00
drh 60d316542f Do not sort terminal symbols by name. The terminals remain in the same order
that they are encountered in the grammar file.  This results in parse tables
that are 25% smaller. (CVS 1261)

FossilOrigin-Name: f36b122d9767fa9e6dc5bcce04b5606d67cad3d9
2004-02-22 00:08:04 +00:00
drh b621c23775 Test cases for printf of double overflows. (CVS 1260)
FossilOrigin-Name: 96a6d2d3ff5bd0aaff188ee1c5e2f02cbea435b2
2004-02-21 19:41:04 +00:00
drh 3e7bc9ca1c Fix a long-standing memory leak that the new last_insert_rowid() tests
brought to light. (CVS 1259)

FossilOrigin-Name: 7d5ede5b6ef515808995d4631f8d19aca95a9105
2004-02-21 19:17:17 +00:00
drh 5f968436e6 Cleanup the printf code to make it smaller and more modular.
Fix a memory leak in the new OP_ContextPush opcode. (CVS 1258)

FossilOrigin-Name: 2756f7af3382fa9d186ab99cf76f469fb891a3c3
2004-02-21 19:02:30 +00:00
drh 8722318f3c Flag pragmas like vdbe_trace now return their current setting if they
are called with no arguments. (CVS 1257)

FossilOrigin-Name: 6a5fb5b89a98307060bb4a92a499b5d3dba74553
2004-02-21 14:00:29 +00:00
drh 905793e249 More code cleanup and size reduction. (CVS 1256)
FossilOrigin-Name: 8e3eda2a909bd80b2b14ace36ab44303750a4409
2004-02-21 13:31:09 +00:00
drh 8eb2cce55c Enhance date/time functions to work with negative years. Ticket #617. (CVS 1255)
FossilOrigin-Name: ffa971934867b6bbe943c004154d5f161e0ea697
2004-02-21 03:28:18 +00:00
drh 8307ac7521 Turn the short_column_names pragma off by default - for the time being. (CVS 1254)
FossilOrigin-Name: 6954d2c3240459842be655b600c6b160e918e74a
2004-02-20 23:34:07 +00:00
rdc 9d524f6b9c Add sqlite.def file required for correct operation of "make implib" option in Makefile.in (CVS 1253)
FossilOrigin-Name: b1b23c410260293f57614f32232cf1276f41c16b
2004-02-20 22:55:41 +00:00
rdc a503d7312a Fixed behaviour of last_insert_rowid() with triggers and add last_statement_change_count() function that works correctly with triggers. (CVS 1252)
FossilOrigin-Name: 6734c923395ca41ce453f56dd7d6e7794fbb3bb5
2004-02-20 22:54:25 +00:00
rdc b0c374ffbb Fixed behaviour of last_insert_rowid() with triggers and add last_statement_change_count() function that works correctly with triggers. (CVS 1251)
FossilOrigin-Name: 3383413a53bff0fef0765144de3bb9a298a5bb5c
2004-02-20 22:53:38 +00:00
drh fcabd4641e The name of a result column is now the name of column it originated from, by
default.  This can be turned off with PRAGMA short_column_names=OFF.  This
is to be more like PostgreSQL.  More testing needed. (CVS 1250)

FossilOrigin-Name: 574dd444e7ff00e0fccc3436fe617ad832daae40
2004-02-20 14:50:58 +00:00
drh 784d86f716 Fix a bug in the parser table compression algorithm of lemon. (CVS 1249)
FossilOrigin-Name: 8d3e924975681a871e0eeac3b6a62cffdb947ac7
2004-02-19 18:41:53 +00:00
drh 9cbe7ca7db Fix a memory leak that occurs if you call sqlite_interrupt() on a query
using aggregate functions where the aggregate function returns a string
longer than 32 characters. (CVS 1248)

FossilOrigin-Name: 2c1e74e58a702fd2be954467a12e69a33b252831
2004-02-18 16:57:23 +00:00
drh fef9765507 Begin updating the architecture description to better describe how things
are currently put together. (CVS 1247)

FossilOrigin-Name: 062ecc1368d6bb6d15da31e8d6f5953e8f5628b9
2004-02-18 16:56:32 +00:00
drh 230680276c Add more tests of the sqlite_interrupt() logic - looking for a reported
memory leak.  (Didn't find it.) (CVS 1246)

FossilOrigin-Name: e4c8b1c3aa9d288f518c6394187354e6fa18978e
2004-02-18 01:31:53 +00:00
dougcurrie 960ac04f4f Avoid line endings munging by Cygwin; ticket #370 (CVS 1245)
FossilOrigin-Name: 50e67948f89380f2f4b536add0b8179e6db960a5
2004-02-17 18:26:57 +00:00
drh d6502758b4 Remove the NullCallback opcode. Handle the empty_result_set pragma inside
the sqlite_exec() function. (CVS 1244)

FossilOrigin-Name: f72134852bf33d13fd2bc6f35251e4b33bc10fac
2004-02-16 03:44:01 +00:00
drh 826fb5a3f8 Eliminate obsolete code associated with the older callback functionality. (CVS 1243)
FossilOrigin-Name: 2dbc4593ca5c1cf75039c8b4471b1e47faa849f0
2004-02-14 23:59:57 +00:00
drh 1d85d93158 Eliminate the use of callbacks during schema initialization. (CVS 1242)
FossilOrigin-Name: af5c2be4aed1c50f69eb9634cf051a26263dcf51
2004-02-14 23:05:52 +00:00
drh 8a6ac0adbc Fix problems with malloc-failure handling. (CVS 1241)
FossilOrigin-Name: 398bc294c839368e7fa75a97ba8cc8d1639f9436
2004-02-14 17:35:07 +00:00
drh a1f9b5ee0b The sqlite_exec() function is now implemented using sqlite_compile() and
sqlite_step().  This opens up lots of opportunity to remove old code. (CVS 1240)

FossilOrigin-Name: 9771ad1e811e02e10bb738550fbea447749083c5
2004-02-14 16:31:02 +00:00
drh b5f70c2ef1 Disable the malloc.test tests if not compiled with -DMEMORY_DEBUG (CVS 1239)
FossilOrigin-Name: 41b6ad78a6097f35bfac6ff40d2e5d6071a1c4cd
2004-02-14 01:39:50 +00:00
drh eceae45cb5 Fix an uninitialized variable in shell.c that would cause a crash if you
specified SQL on the command-line. (CVS 1238)

FossilOrigin-Name: 5a56090dde10ee29863021356d21c3f8c86e3f46
2004-02-13 20:09:41 +00:00
drh e72daeb0ac Begin the process over converting sqlite_exec() over to use sqlite_compile()
and sqlite_step().  The new sqlite_exec() is still commented out. (CVS 1237)

FossilOrigin-Name: b8f2ba7880b761e380b95ae63d8ab721f018443e
2004-02-13 16:30:09 +00:00
drh 50350a15c4 Fix a bug in the query flattener when trying to find the datatype of the
rowid of a view.  Also fix a problem with sqlite_compile() and authorization
failures. (CVS 1236)

FossilOrigin-Name: aa0490ccd4a820a707dfb4905e67c01ffb4f758b
2004-02-13 16:22:22 +00:00
drh 78a7583828 Fix an uninitialized variable introduced by check-in (1202). (CVS 1235)
FossilOrigin-Name: 9f149fdc1c6af1c663b91c878ed1903f82f80245
2004-02-13 14:07:12 +00:00
drh e384a4ed4e Add a new parameter to the (unimplemented) encryption API. (CVS 1234)
FossilOrigin-Name: 5fe8f02306cf1c0af2148835cee0df3003ad0874
2004-02-12 20:49:36 +00:00
drh c602f9ae01 Add the SQLITE_NOTADB return code for cases when you try to open a file
that does not even remotely resemble an SQLite database file. (CVS 1233)

FossilOrigin-Name: 0c77cee70f078152969933c1d340cea1c86286b0
2004-02-12 19:01:04 +00:00
drh 4d189ca48f Add hooks on each attached database connection for storing auxiliary
information.  Add the USING clause to ATTACH. (CVS 1232)

FossilOrigin-Name: 800c11f4bce014a07110eb539992a609e6418406
2004-02-12 18:46:38 +00:00
drh 3054efee07 All REPLACE INTO syntax inside of triggers. Ticket #610. (CVS 1231)
FossilOrigin-Name: a6b862a9db6d409a53cc13e7008b27d4848b5509
2004-02-12 17:28:13 +00:00
drh 70a931c2ac Remove unused variable. (CVS 1230)
FossilOrigin-Name: 74b234264ba2910ebd38e7b7ebbc369108a235cb
2004-02-12 15:32:53 +00:00
drh 8ef83ffed8 Always reload the schema after a rollback. Ticket #594. (CVS 1229)
FossilOrigin-Name: 12c7a83f8e4055c4590983ef212648c781ebd963
2004-02-12 15:31:21 +00:00
drh 93581642d2 VACUUM returns SQLITE_INTERRUPT when interrupted. Ticket #593. (CVS 1228)
FossilOrigin-Name: 2fe9f5101cb0f743532912ece3d37f6c873e7025
2004-02-12 13:02:55 +00:00
drh ab9426e242 Only define _FILE_OFFSET_BITS if it is not already defined. Ticket #605. (CVS 1227)
FossilOrigin-Name: 300c5543dc83c6b7eacb0c81ed06f95004c0f6d8
2004-02-11 16:38:06 +00:00
drh eb8ed70db5 Fix the shells so that they always enable the codec if it is available,
even if no key is supplied. (CVS 1226)

FossilOrigin-Name: 95989717e17d52b2306374f5cf7613c3bd4e7801
2004-02-11 10:37:23 +00:00
drh 7e26d75094 Fix an uninitialized variable in expr.c. Ticket #604. (CVS 1225)
FossilOrigin-Name: 1673bf7c7b64542530ee03328186be33cb88c98d
2004-02-11 10:35:29 +00:00
drh bbd82df617 Refactor the interface to the randomness generator. (CVS 1224)
FossilOrigin-Name: f2bdccf4bb2f796aafb64c33e55f62a1794d750c
2004-02-11 09:46:30 +00:00
drh 9eb9e26b82 Pass all (relevant) regression tests when using the codec. (CVS 1223)
FossilOrigin-Name: 5200e9edc5fdba0285a3cb1cd808cbf66d7a349e
2004-02-11 02:18:05 +00:00
drh d86a39c866 Adjustments to the codec in the pager. (CVS 1222)
FossilOrigin-Name: be5122e99caacbeb5e568a2782fe2faf634ad355
2004-02-10 23:51:05 +00:00
drh fb044c1d1c Perform updates in search order. Ticket #602. (CVS 1221)
FossilOrigin-Name: cf1cec74ae039cd7cbc8a1032d29f067dedb4210
2004-02-10 13:41:52 +00:00
drh 4bc058593b Fix for ticket #603. (CVS 1220)
FossilOrigin-Name: d0624d257789ac3f4cd3a7473bb741030c999b65
2004-02-10 13:19:35 +00:00
drh 57ced9186a Make the pager accessible from the btree structure always, not just during
debugging. (CVS 1219)

FossilOrigin-Name: 9c6b4758a4b13a91f71be17751a76c0c14b4d4c3
2004-02-10 02:57:59 +00:00
drh 2d71ca94a9 Move the file-format-2 to file-format-3 conversion into sqliteInit(). (CVS 1218)
FossilOrigin-Name: dcbe2800be2f805818724a7b9e468c4fd4f02529
2004-02-10 02:27:04 +00:00
drh d0ba193dc7 Allow SQLITE_PAGE_SIZE to be redefined on the compiler command-line. (CVS 1217)
FossilOrigin-Name: 4c7bf714b5f3d2bb7366367ddf906141a7e36407
2004-02-10 01:54:28 +00:00
drh f620b4e2cb After code is generated for a subquery, delete the Select structure in order
to force the temporary table to be used and to prevent the subquery from
being evaluated a second time.  Ticket #601. (CVS 1216)

FossilOrigin-Name: 1cff18868dab5f8ead8ed8d07e088d7fdda04569
2004-02-09 14:37:50 +00:00
drh e2201971ac Add test case for ticket #601. (CVS 1215)
FossilOrigin-Name: 096312dacb9eb2f8da3cec1504aef8629b505e7f
2004-02-09 14:35:28 +00:00
drh b20ea9d225 Add an optional codec to the pager layer. (CVS 1214)
FossilOrigin-Name: 2f0c122cfb84dea58d112324a0bdd8b85552a9fa
2004-02-09 01:20:36 +00:00
drh 8e6283155e Version 2.8.12 (CVS 1213)
FossilOrigin-Name: 1736d415d776aa1cbdd33d987d21365ebf260f11
2004-02-08 18:10:50 +00:00
drh f603871326 Perpare for the 2.8.12 release. (CVS 1212)
FossilOrigin-Name: 93ccd1b1d63b5b914b84b0463f2267bcfaadafa3
2004-02-08 18:07:34 +00:00
drh f1b07b0ca2 Fix a bug in the VDBE that occurs when a CreateTable or CreateIndex fails. (CVS 1211)
FossilOrigin-Name: 42cfd541dcc31d1ef92387e3fd2346db61d0ecbd
2004-02-08 06:17:19 +00:00
drh 585a3d7c22 Add the crashtest1.c program used to test the ability of the database to
survive a program crash or power failure.  Ticket #599. (CVS 1210)

FossilOrigin-Name: 597a59a72d662b291fb09a069547efd08aa5adb1
2004-02-08 06:06:37 +00:00
drh 34e79ceeb6 Fix inaccuracies and add details to comments in the pager. Change the name
of one function to make its purpose clearer.  Ticket #599. (CVS 1209)

FossilOrigin-Name: 48832d35ed0d5ba02908822c749591e76b790c48
2004-02-08 06:05:46 +00:00
drh 240c5795d5 Preliminary fix for ticket #599. More testing and analysis needed. (CVS 1208)
FossilOrigin-Name: dc5be2c82b591a385adf02863d89e113272e2ebd
2004-02-08 00:40:52 +00:00
drh e84a306b91 Remove undocumented extensions from sqlite_mprintf() and friends in order to
make it about 10% smaller. (CVS 1207)

FossilOrigin-Name: 0b3f552b986fd89c48c350b0746be93b9d276ecc
2004-02-02 12:29:25 +00:00
drh 22fbcb8ddd Fix the handling of -init option to the sqlite shell. Ticket #568.
Also add hooks for encrypting the database. (CVS 1206)

FossilOrigin-Name: 3c796de8d1af55944f396f08feaa9e69c1652896
2004-02-01 01:22:50 +00:00
drh 3914aed1de Fix a bug introduced by the previous check-in. (CVS 1205)
FossilOrigin-Name: 04cf22785e68fcd4098e6c10a89386108cd0bf07
2004-01-31 20:40:42 +00:00
drh 2c79c67fcb A few more optimizations to the VDBE. (CVS 1204)
FossilOrigin-Name: 06e7ff4cb8c73fd690c6d5b5f530a30d83f4f10c
2004-01-31 20:20:29 +00:00
drh 6810ce677d Rework internal data structures to make the VDBE about 15% smaller. (CVS 1203)
FossilOrigin-Name: 8273c74bd09d1a044cb5154498b0a39939f6e3ed
2004-01-31 19:22:56 +00:00
drh 00706be366 Rework the VDBE data structures to combine string representations into the
same structure with integer and floating point.  This opens the door to
significant optimizations. (CVS 1202)

FossilOrigin-Name: c0faa1c67a967f028cd018e58988fb08bc814d3d
2004-01-30 14:49:16 +00:00
drh 0c37e6309b Make sure min() and max() optimizations work for subqueries. Ticket #587. (CVS 1201)
FossilOrigin-Name: af73fbca839f8cbe39c21f1f9e439fe9b79005c8
2004-01-30 02:01:03 +00:00
drh e8a63423da Change permissions on the install-sh file to be executable. Ticket #582. (CVS 1200)
FossilOrigin-Name: eafa714d1f0abe7e4822a6d137c2a7c6179ffab3
2004-01-27 17:46:55 +00:00
drh 11437fa6b1 Add a web page describing when it is appropriate to use SQLite and when it
is not. (CVS 1199)

FossilOrigin-Name: d77e47764818ef495894013fb26b1a510f2f1a7e
2004-01-27 15:58:37 +00:00
drh 8141f61ef2 Modularize the column name resolution code so that it is smaller, faster,
and ready for some enhancements that will fix long-standing name
resolutions problems. (CVS 1198)

FossilOrigin-Name: d3648034b409822909d79eb5aa4e64cafa986541
2004-01-25 22:44:58 +00:00
drh b733d03749 Add the ability to group FROM terms using parentheses. Names of columns in
a join no longer include the table name. (CVS 1197)

FossilOrigin-Name: 3626f6d4a1adb4209d5bd9e6477343b52bddbdf2
2004-01-24 20:18:12 +00:00
drh a8d6243bc7 Fix typo. Ticket #577. (CVS 1196)
FossilOrigin-Name: 3dc951951947a9188ecba1b84e48c65e34c4df16
2004-01-22 23:38:21 +00:00
drh 30c84bfd5f In test programs, an SQLITE_SCHEMA return is retried repeatedly, not just once. (CVS 1195)
FossilOrigin-Name: df3509e13dc05751b7a5af07b57bca449fe5244c
2004-01-21 13:35:13 +00:00
drh 0bca353087 Make ATTACH and DETACH work with the non-callback API. Ticket #574. (CVS 1194)
FossilOrigin-Name: c32a80fe3cd6dda5238e59bd48d9dd22b4856304
2004-01-20 11:54:03 +00:00
jplyon a8fbdd36f8 documented pragma foreign_key_list().
updated docs for removed behavior: Oracle join syntax and temp indexes. (CVS 1193)

FossilOrigin-Name: 06bd5070966b59730a91bc4d384df4f8abaadd37
2004-01-19 05:09:24 +00:00
jplyon 4b11c6d3f4 comment typos (CVS 1192)
FossilOrigin-Name: 7972ee321974380a59fef752f5643d98f9df38cc
2004-01-19 04:57:53 +00:00
jplyon cfa5684d47 comment typos (CVS 1191)
FossilOrigin-Name: de35c36ed7657903ebba0c5acff75baaa0453f87
2004-01-19 04:55:56 +00:00
jplyon 8bc03a7acd coment typo (CVS 1190)
FossilOrigin-Name: 0d2683dc5ecb886ae9625484b51e65df49b3235d
2004-01-19 04:54:28 +00:00
jplyon b6c9e6e6c1 coment typo (CVS 1189)
FossilOrigin-Name: 8210b2d818ab83a97b3b71b432770436116f4770
2004-01-19 04:53:24 +00:00
jplyon b1639ffeb5 comment (CVS 1188)
FossilOrigin-Name: fa55c9861e1cc372a36958383a86895dc311bb4b
2004-01-19 04:52:29 +00:00
drh 4d5b836545 Do not use strcpy() on overlapping buffers. (CVS 1187)
FossilOrigin-Name: ed6bd2eb39a0940c4f41d365ddc81ecc7066cf4e
2004-01-17 01:16:21 +00:00
drh 606c369847 Access to free()ed memory problem fixed. Found by electric fence.
Only an issue when doing an EXPLAIN of a CREATE INDEX. (CVS 1186)

FossilOrigin-Name: 6604e5f7d332b484e84d177f93c9d9f2ab54a32b
2004-01-16 20:01:31 +00:00
dougcurrie a70f2d8d72 See ticket #569; eliminates warnings for Cygwin v1.5 and above. (CVS 1185)
FossilOrigin-Name: a0f8b1f3cea9a0542f8d36898bf98df3c59f12e0
2004-01-16 19:11:28 +00:00
drh 51e9a44592 More compaction of expr.c. (CVS 1184)
FossilOrigin-Name: 92e7f78057c4e8f6214b6e0a2d80c3ffcbfdf68e
2004-01-16 16:42:53 +00:00
drh 4efc4754f3 Incremental code compaction in expr.c. Now about 4% smaller.
Lots more work to do. (CVS 1183)

FossilOrigin-Name: d292ba5148059dce3893b80eabdca4af9f75194e
2004-01-16 15:55:37 +00:00
drh 1dba727946 Fix a buffer-overflow problem in the randStr function (used only for testing). (CVS 1182)
FossilOrigin-Name: 42c79edc2e8d1051b3bca915b4b205c601b8077f
2004-01-16 13:58:18 +00:00
drh d1bec47a3d More aggressive retry schedule in sqlite_busy_timeout(). (CVS 1181)
FossilOrigin-Name: 5e85025be7aa4a03b0cfb4d0f28a2e44653b9d3f
2004-01-15 13:29:31 +00:00
drh 23b2db23b4 Allow "<expr> IN <table>" as a shorthand for
"<expr> IN (SELECT * FROM <table>)" (CVS 1180)

FossilOrigin-Name: 01874d252ac44861e927dea3f5534f67e19b1fa8
2004-01-15 03:30:24 +00:00
drh aa940eacfe Reinsert the experimental sqlite_commit_hook() API. (CVS 1179)
FossilOrigin-Name: 72bc84f2f18f6eeb279a4ad670310e85d154f663
2004-01-15 02:44:03 +00:00
drh 751f41217e Fix comparisons of ROWID against floating point numbers so that they work
correctly.  Ticket #377 and #567. (CVS 1178)

FossilOrigin-Name: c9ac3db8e08403398ec344757385334601a59374
2004-01-14 21:59:22 +00:00
drh d43ce86fa7 Version 2.8.11 (CVS 1177)
FossilOrigin-Name: a9f25347de6d2bf843a8aebf7935e9c8a1f2319c
2004-01-14 13:50:59 +00:00
drh 0ee7ae0f0d Bump the version number for the next release. (CVS 1176)
FossilOrigin-Name: 2812dd5fc99c959f41b24b0f6b280b67b06fe9d9
2004-01-14 13:43:43 +00:00
drh 52b36cabe0 Ignore NULLs in a subquery as the right operand of IN. Ticket #565. (CVS 1175)
FossilOrigin-Name: c9e7996fb9080b715e9b273a3ac3ed3744e10a77
2004-01-14 13:38:54 +00:00
drh f6a7ade6b6 Version 2.8.10 (CVS 1174)
FossilOrigin-Name: 8bef75ab85197d926d924ae689769207df9a12f8
2004-01-14 03:49:43 +00:00
drh c713bdc778 Move some files around and bump the version number in preparation for the
release of 2.8.10. (CVS 1173)

FossilOrigin-Name: 74c661850e1899c457d4e822d8284bb66e1dc651
2004-01-14 03:32:37 +00:00
drh 7bdeb312ed Remove an incomplete comment that somehow snuck into the sources. (CVS 1172)
FossilOrigin-Name: ea1ad4653e6248f112d5516a0dcf3a72aa9b60d7
2004-01-14 03:12:42 +00:00
drh 31e95bcc5d On unix, embargo close() operations until all locks have cleared from the
file.  Ticket #561. (CVS 1171)

FossilOrigin-Name: 1ebe5fc7b03a6b070a5d52ffedb95f0d519ab068
2004-01-12 00:39:05 +00:00
drh 7b40e60800 Previous commit of changes to the in-memory backend was not quite right.
This check-in should square things away. (CVS 1170)

FossilOrigin-Name: 75d91e3bca44787768b1970203878dd4b1e31e55
2004-01-12 00:38:18 +00:00
drh 572b6f5614 Make sure the in-memory database can handle malloc failures. (CVS 1169)
FossilOrigin-Name: ba92af182c6c9c6b2e3816006191eedd424cdf1a
2004-01-12 00:21:52 +00:00
drh ba21256f98 Remove unused code and tighten existing code to make the library a little
smaller. (CVS 1168)

FossilOrigin-Name: 34a6b7416c6c9bcdf301f5e7b072a0362a746105
2004-01-08 02:17:31 +00:00
drh 143f3c45a7 Rework the fix to ticket #461 so that we do not have to do redundant tests
of WHERE clause terms looking for NULLs.  See also check-in (1103). (CVS 1167)

FossilOrigin-Name: 5fd581787e88173f0303f870fc956ec9285cca4e
2004-01-07 20:37:52 +00:00
drh d1d9fc3397 Permit sqlite_exec() to be called from within user-defined functions. (CVS 1166)
FossilOrigin-Name: 03636c94a542b1f90a3acfbe65a9c2976872073f
2004-01-07 19:24:48 +00:00
drh a11846b77a Defer the {quote: MoveTo}
opcode in VDBE until the data is actually needed.  Sometimes
the data is never needed, resulting in a performance increase.  On an indexed
order search with a large OFFSET, queries times can be an order of magnitude
faster. (CVS 1165)

FossilOrigin-Name: d3e96da20d269a068188915b3cc0eb02d330d316
2004-01-07 18:52:56 +00:00
drh 912184b0cf Make it safe to call sqliteMalloc() with a request for 0 bytes. Ticket #534. (CVS 1164)
FossilOrigin-Name: 6c858db2c099c7ba73d72e02b19bf6173620db13
2004-01-07 03:41:03 +00:00
drh c5dd9fa8ab Preserve the HH:MM:SS for most date/time modifiers. Ticket #551. (CVS 1163)
FossilOrigin-Name: 70df32b716b0d6a4f72bb3ae6496431e53733b6a
2004-01-07 03:29:16 +00:00
drh 384eef32fd Use "long double" to hold intermediate values when doing ascii to binary
and binary to ascii conversions of floating point numbers. (CVS 1162)

FossilOrigin-Name: 8371f662d22be0a3c58e0503c7511faea1640955
2004-01-07 03:04:27 +00:00
drh 133cdf6eba Add a typecast to work around a bug in the Metrowerks Code Warrior compiler.
Ticket #553. (CVS 1161)

FossilOrigin-Name: 4146f8cc3ff5339b5685e9c5121888ae08ee0807
2004-01-07 02:52:07 +00:00
drh 3a4e19be6b Version 2.8.9 (CVS 1160)
FossilOrigin-Name: d8ae6bddeb70f1450ccd3a4735ccf6fe3a042a07
2004-01-06 02:23:46 +00:00
drh 9d4280d53f Additional integer overflow boundary case tests. (CVS 1159)
FossilOrigin-Name: 532170d4b8fc7a4e596a817257e9e1f81d364940
2004-01-06 01:52:34 +00:00
drh e8e3920a2e Increase the version number and update the change log prior to the next
release. (CVS 1158)

FossilOrigin-Name: b99b68d026a0d58338a1d578e15a40dcdcdb47a9
2004-01-06 01:27:00 +00:00
drh 202b2df74a Fix problem in the code generator were incorrect code was being created if
the SQL source contained a negative integer that was too large to fit in
a 32-bit signed integer variable.  Ticket #552. (CVS 1157)

FossilOrigin-Name: b8381d9fe99273507e8626638110646801afef06
2004-01-06 01:13:46 +00:00
drh e807febbc2 Add the sqlite_current_time variable for testing purposes. (CVS 1156)
FossilOrigin-Name: 23fa407d50741bc0719259792398f28c1d0f12c2
2004-01-06 00:44:24 +00:00
drh b46d162d8d The "EST" timezone designation is ambiguous. Do not use it in the test
scripts. (CVS 1155)

FossilOrigin-Name: 720b565e2d02344e4d38263f4995dfabc60c0860
2004-01-02 15:08:43 +00:00
drh 7739630451 Avoid an assertion fault that can occur with invalid UTF8 on the LENGTH()
function.  Ticket #548. (CVS 1154)

FossilOrigin-Name: 7080fc39eaf98ef7a7d1c1819603f67841f35c72
2004-01-02 13:17:48 +00:00
drh 4ec2e9612f Remove unused code from the integrity_check logic. Ticket #545. (CVS 1153)
FossilOrigin-Name: ee51e205fb6ef412db6a46077e8bc1554aadcca1
2004-01-01 12:33:43 +00:00
drh cf64d8b820 Fix a bug in the SQLITE_PROFILE conditional compilation. (CVS 1152)
FossilOrigin-Name: 597b33f696c0cde84529cd06a8f95a8ccc8f1e8e
2003-12-31 17:57:10 +00:00
drh 89ef0eeb9b Fix for ticket #542. (CVS 1151)
FossilOrigin-Name: 458cfa5ba82f2d676e398437a4b1d26d77582d10
2003-12-31 17:25:47 +00:00
drh 07fa2a60ea Fix a bug (ticket #541) introduced by the previous check-in ((1149)). (CVS 1150)
FossilOrigin-Name: 646244008fb8a6eef4169291d75da59fa1ab26f9
2003-12-31 16:00:19 +00:00
drh dff7ec2cbd Reduce the randomness in the sqliteRandomSeed() routine in order to silence
bogus errors from valgrind.  Tickets #535 and #536. (CVS 1149)

FossilOrigin-Name: cfe0acf9ec6c89f1e77b8be7dcc23029984de1ce
2003-12-31 13:21:18 +00:00
dougcurrie ae53418df4 minor edits for new date.c with mingw/msys on Windows (CVS 1148)
FossilOrigin-Name: 9392c514501be333a3c22b552dc036e083eb22b4
2003-12-24 01:41:19 +00:00
drh f586aa8b96 Update date/time functions so that they correctly handle NULL arguments. (CVS 1147)
FossilOrigin-Name: a5a5fbd60153dd068ec2559455146e84da075b90
2003-12-23 16:34:12 +00:00
drh 7091cb0566 Add localtime<-->UTC conversions to the date functions. (CVS 1146)
FossilOrigin-Name: 8482b8c44766e7f80fc449b3dbdd3f37396c332b
2003-12-23 16:22:18 +00:00
drh 90f405e3ba Test functions tolerate an "0x" before a pointer value. Ticket #452. (CVS 1145)
FossilOrigin-Name: c6c5e07b65ae1c30117f0276a1002d5036697cf1
2003-12-23 03:06:23 +00:00
drh 93a5c6bdf4 Use a built-in atof() function instead of the one from the library to
avoid problems with locale.  Ticket #305. (CVS 1144)

FossilOrigin-Name: 4d9edbc50f7dee64edbadad2e2dc4f93d8248b3b
2003-12-23 02:17:35 +00:00
drh 3ddfdf7ac6 Optimizations to the LEMON parser template. (CVS 1143)
FossilOrigin-Name: 06db29df8f0c1cd29e696537e622f0c5456056f5
2003-12-22 14:53:19 +00:00
drh 2fd2fa0851 Fix some minor problems with the new test4.c module used for doing thread
testing. (CVS 1142)

FossilOrigin-Name: 952924084aac4a7fa84a7cb7aaac869d35db1896
2003-12-20 04:00:52 +00:00
dougcurrie 6194a5fb75 Update configuration and make files for mingw/msys on Windows (CVS 1141)
FossilOrigin-Name: 1e9689672c94e5ab89f07099c1402e157c8b02c1
2003-12-19 20:09:51 +00:00
drh f93e41442e Remove a comma at the end of an enum definition. Some compilers could not
deal with it. (CVS 1140)

FossilOrigin-Name: b1890a5b9c1222086b3aae92e49eb090a17a6492
2003-12-19 12:32:45 +00:00
drh 5202560ee5 Makefile updates for the new "test4.c" module. Also disable large file
tests for archic TCL versions. (CVS 1139)

FossilOrigin-Name: 55e2488912871381959326ab7fa89123ab30d659
2003-12-19 12:31:19 +00:00
drh acf01e7ddd A better fix for ticket #530 - one that is likely to work on unix
implementations in addition to linux.  Also more tests for multi-thread
locking added. (CVS 1138)

FossilOrigin-Name: 7dddbeb586504de30c64a1e61614da447f18c8ba
2003-12-19 08:40:22 +00:00
drh a6064dcf3b Add new thread-testing code and fix locking under Linux threads. Ticket #530. (CVS 1137)
FossilOrigin-Name: b36a4bb61094d539273c21a9e4042384f10a7806
2003-12-19 02:52:05 +00:00
drh 9c4dcca89e Typo on the "datatypes.html" document. (CVS 1136)
FossilOrigin-Name: 80b1e277123c07b2db7441a9e600dd69ef55a0da
2003-12-18 14:19:41 +00:00
drh 0f5c27a168 Version 2.8.8 (CVS 1135)
FossilOrigin-Name: a0451ccf2d0377536073ecaa2d6b70d05f5a5734
2003-12-18 01:22:54 +00:00
drh 0c9c3d06d4 Bump the version number and update the change log in preparation for the
next release. (CVS 1134)

FossilOrigin-Name: 9ad0bdf624e7dba448587c58eacd1e9cd2784316
2003-12-18 00:02:43 +00:00
drh acf4ac96e3 Make sure the pagers in-memory cache states in sync with the disk file.
Ticket #529. (CVS 1133)

FossilOrigin-Name: da00efb13fe8ccf1c27e4e1193df6b53de9463f4
2003-12-17 23:57:34 +00:00
drh 4be295be07 Improvements to the way PRAGMA integrity_check works. More likely to output
userful information when given a corrupt database. (CVS 1132)

FossilOrigin-Name: b92c31d6c138f9462730cecfe14f7dde19778e79
2003-12-16 03:44:47 +00:00
drh 1285a76973 Updates to the homepage - fix the CVS access instructions. (CVS 1131)
FossilOrigin-Name: 653a7dd97ed95e66bd2973169735ee73ee348576
2003-12-15 17:51:19 +00:00
drh 256ada0fda Fix a bulk-memory initialization problem in the expression list logic. (CVS 1130)
FossilOrigin-Name: d6549954408b01e5eaf865b9100739c94de28f16
2003-12-10 03:13:43 +00:00
drh 0f18bfa789 Fix the code generator to a void a VDBE stack overflow on 3-way joins.
Ticket #519. (CVS 1129)

FossilOrigin-Name: 230a4ff2c8a3927533baf5b22edc9f25490d5443
2003-12-10 01:31:21 +00:00
drh 6f8c91caa0 Make the VACUUM command run out of the VDBE like all other commands.
(Ticket #464).  Make the VACUUM command work even if there are VIEWs
in the SQLITE_MASTER table that come before tables they reference.
(Ticket #515) (CVS 1128)

FossilOrigin-Name: 614cbbafa180469744421f8fbe56cb392f48d05f
2003-12-07 00:24:35 +00:00
drh 447623d9aa Fail an ATTACH if the auxiliary database is locked. Ticket #514. (CVS 1127)
FossilOrigin-Name: ac428c8d4a731678cc26cf198689814a8a56d141
2003-12-06 22:22:35 +00:00
drh 41743984bf Always use "(char*)0" to terminate the argument list of sqliteSetString().
This is needed for 64-bit systems that use a 32-bit integer by default. (CVS 1126)

FossilOrigin-Name: 656c90387a4a714b4f31040ece9b0e15e30934af
2003-12-06 21:43:55 +00:00
drh 3a6629d27e Use sqlite_freemem() instead of free() in the shell. Windows needs this.
(Unix does not care.)  Ticket #444. (CVS 1125)

FossilOrigin-Name: e5e6a8481b2225e826c8e890ddc44f06759fe72b
2003-12-04 20:51:41 +00:00
drh 96e9f565ad Version 2.8.7 (CVS 1124)
FossilOrigin-Name: d48b0b018d47470689cc49f3be4cde50db165454
2003-12-04 13:47:04 +00:00
drh 27ff9f87b8 Update change log and version in preparation for the 2.8.7 release. (CVS 1123)
FossilOrigin-Name: 9e79ab6ce06d68fcd7efa207d0ffcd1c51c13d58
2003-12-04 13:44:32 +00:00
drh 4925ca00a3 Disallow temporary indices on persistent tables. (CVS 1122)
FossilOrigin-Name: 72bf73b2c1e3594aa85920e47fc345bba56c80d0
2003-11-27 00:48:57 +00:00
drh 0802fd836d Fix typos in file format documentation. Ticket #505. (CVS 1121)
FossilOrigin-Name: 4eef93814f4a26de4a088c464545443547281abd
2003-11-25 23:48:57 +00:00
drh b3549d43e2 Fix typo in file format documentation. Ticket #502. (CVS 1120)
FossilOrigin-Name: 72f3e7c2b0258271956ed7a43b3388bb74bf62ec
2003-11-24 23:11:08 +00:00
drh 0a5294bc06 Fix a typo in a #define that was commented out. No impact to working code.
Ticket #476. (CVS 1119)

FossilOrigin-Name: 21c2f96e814004d00691e3d7a632f193b0e49ee5
2003-11-11 23:30:35 +00:00
drh 000ca2b208 Added information on MySQL 4.0.16 to the NULL-handling survey. (CVS 1117)
FossilOrigin-Name: e22e3ab53a841b26984240760b0438efc83661d7
2003-11-08 12:07:01 +00:00
drh 7014aff37d Revised date/time functions - now broken out into a separate source file.
See the DateAndTimeFunctions wiki page for additional information. (CVS 1116)

FossilOrigin-Name: 68ef9b45bd3abdedf3721011ad0fb22e8735e721
2003-11-01 01:53:53 +00:00
drh b48484a6d7 Fork the tree for project "shrike" (CVS 1118)
FossilOrigin-Name: 181260c0aa7837feca9e415225ece0e9c4032c7a
2003-10-30 06:59:59 +00:00
peter 63a1e49859 Fix progress test error 1-2 (CVS 1115)
FossilOrigin-Name: c3a495026c7eafd576042a05a9a5f585ba8ba9b9
2003-10-23 15:27:11 +00:00
drh 8548a059ff Comment changes to the lemon parser template. Change some sqliteMalloc() calls
to sqliteMallocRaw() for speed.  Update the website template. (CVS 1114)

FossilOrigin-Name: c637caf13f579959ecdb6b134d0114e8efbcac60
2003-10-22 22:15:27 +00:00
drh fdbf928b08 Fix bugs in lemon associated with the change to a perfect hash table. (CVS 1113)
FossilOrigin-Name: c0d1b26966aeb445fea5792e5a9e93632e758c2a
2003-10-21 16:34:41 +00:00
drh 8b582012de Convert lemon to use a single perfect hash table for storing the actions.
This should make the resulting parser both smaller and faster. (CVS 1112)

FossilOrigin-Name: 4f955c00076b16166ff837749efb84201eab3c3a
2003-10-21 13:16:03 +00:00
danielk1977 348bb5d6c8 Add sqlite_progress_handler() API for specifying an progress callback (CVS 1111)
FossilOrigin-Name: ddb364635a207658664ea92fc677cf16a143a938
2003-10-18 09:37:26 +00:00
drh 4df92bbd44 Update to the date functions. (CVS 1110)
FossilOrigin-Name: 06d4e88394217fb1390b069bad82d6ac71981f72
2003-10-10 02:09:56 +00:00
drh 191c0323c0 Allow quoted trigger names. Ticket #468. (CVS 1109)
FossilOrigin-Name: 54aa0fb236d17b53b194a667d68c71007c8e7687
2003-10-03 00:13:38 +00:00
drh 319e4e7484 All LIKE and GLOB operators to use function notation. "A LIKE B" can be
expressed as "LIKE(B,A)". (CVS 1108)

FossilOrigin-Name: 95b27ebd1322a877112dee514dffddb0937e45fa
2003-09-30 01:54:13 +00:00
drh 4f88c849f3 Patch the spec.template file (for generating RPMs) as suggested by
Jeremy Hinegardner.  Untested. (CVS 1107)

FossilOrigin-Name: 703741ca1e2b0bf79a4e3cda3cf3c6862d7263eb
2003-09-29 12:20:51 +00:00
drh dab3518880 Remove support for the Oracle8 outer join syntax. (CVS 1106)
FossilOrigin-Name: 824430b3ce435386b83ceb882f1510ac9f27d8fa
2003-09-27 13:39:38 +00:00
drh 5b8424b9e4 Add a test case for ticket #464 but leave it commented out for now. We
will fix this problem when VACUUM is rewritten. (CVS 1105)

FossilOrigin-Name: 7ba8dc9b1e5c788f2c0ab32314754324c86aaa49
2003-09-27 01:08:37 +00:00
drh 3775084a75 Add additional backslash escapes to the COPY command for compatibility
with PostgreSQL.  Ticket #460. (CVS 1104)

FossilOrigin-Name: 70a50bdda318f353c8be1ba200f9aedc34642c93
2003-09-27 00:56:31 +00:00
drh 562528c480 Do all WHERE clauses tests, even if an index is used for lookup so that
we know the test cannot be FALSE.  The test might end up being NULL in which
case it would need to be treated as false.  Ticket #461. (CVS 1103)

FossilOrigin-Name: 5aea81488b2d3bcdc009ccf0f0ffcda046e38d79
2003-09-27 00:41:27 +00:00
drh f911221a1e A failed malloc() could have resulted in a segfault. Fixed by this check-in. (CVS 1102)
FossilOrigin-Name: 4bb256ee3ecd44d71d90556e16bb56c0389fd5b5
2003-09-23 10:25:32 +00:00
xdong 3b5543c46d allow -enable-releasemode as an option and allow Makefile to produce version
independent binary like libsqlite-2.8.6.so instead of libsqlite.so.0.0.0 (CVS 1101)

FossilOrigin-Name: 4fdd44a5ee5f7beb3cff11bc54fd3022b975b9e6
2003-09-23 00:36:50 +00:00
xdong 28f79f7bda regenerate configure to take -enalbe-releasemode as an option (CVS 1100)
FossilOrigin-Name: b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38
2003-09-23 00:35:21 +00:00
xdong 225656c50a modify the configure file to allow cross-compile to work at arm and xscale (CVS 1099)
FossilOrigin-Name: 760f2fa2e5db102b970687f59b79bfb6f4d35b32
2003-09-18 21:59:45 +00:00
drh 61b487d02a The tokenizer should never return a negative size of the next token.
Ticket #453. (CVS 1098)

FossilOrigin-Name: 4fbca3ab09596c530da7c50657f3bc9140178dd5
2003-09-12 02:08:14 +00:00
drh 9faae94118 Add test cases that check out sqlite_get_table() on queries with results sets
containing 100 columns. (CVS 1097)

FossilOrigin-Name: f9feedec32c975235c0d0996962033f6a63312ba
2003-09-09 00:47:47 +00:00
drh 82a4851a4b Add initial test cases for the new sqlite_bind() API. Fix bugs that the new
test cases found. (CVS 1096)

FossilOrigin-Name: f6c4908e9b5b6ac9adc4af50dc5110dbb655dae3
2003-09-06 22:45:20 +00:00
drh 7c972dec5c Update Makefile.in for the new vdbeaux.c file. Remove the experimental
"sqlite_instantiate()" routine and replace it with "sqlite_bind()" which
is more like ODBC and JDBC. (CVS 1095)

FossilOrigin-Name: 990bb11898a539bb0795a4a216fcd989943a0fb2
2003-09-06 22:18:07 +00:00
drh 9a32464b54 Split almost 1300 lines of code out of vdbe.c into separate files
vdbeInt.h and vdbeaux.c. (CVS 1094)

FossilOrigin-Name: bfd69391d3d63675f206ffd8ff0401ea1cbcc073
2003-09-06 20:12:01 +00:00
drh 5045789694 The beginnings of changes to support pre-compiled SQL. Mostly untested,
though all regression tests to pass. (CVS 1093)

FossilOrigin-Name: 912f47c72d3597c6d5acff765d94922bd660339a
2003-09-06 01:10:47 +00:00
drh c023e03ea5 Add a logo from Rasmus Schultz. (CVS 1092)
FossilOrigin-Name: aaa84c6202f6e16828bcd6aff2e424f3dba1f82b
2003-09-02 15:26:33 +00:00
drh 1dcafe1ad8 CVS missed a commit (because I pressed Ctrl-C in the middle). This
extra commit will hopefully help clear things up. (CVS 1091)

FossilOrigin-Name: 522c2efeb5bdccadf3306234d458425b94cdbbe3
2003-08-27 22:57:07 +00:00
drh e4c616931d Add locks to the in-memory backend so that recursive writes will be detected
and rejected.  Ticket #436. (CVS 1089)

FossilOrigin-Name: 3403d28a49b27d3059d3d399ca057e8d33eb857a
2003-08-27 22:54:31 +00:00
drh 0d4f801c28 Add locks to the in-memory database so that recursive writes will be detected
and rejected.  Ticket #436. (CVS 1090)

FossilOrigin-Name: 966b1a16f6687df08f8c21787c1c8b1af1d79e1e
2003-08-27 22:52:34 +00:00
drh ec1bd0bd72 Fix compiler warnings under OpenVMS. Ticket #357. (CVS 1088)
FossilOrigin-Name: c95f347cac27732533a2f6fd4ba50bf00eef59f3
2003-08-26 11:41:27 +00:00
drh 8460ea0652 Try to work around a bug in VC++ by only passing unsigned characters to
the isspace() routine.  Bug reported on the mailing list. (CVS 1087)

FossilOrigin-Name: cbe32216966c987902ceb4d85332fc95801dbda2
2003-08-26 11:35:00 +00:00
drh 03ab7336cd Fix a bug in sqliteRealloc() that only occurs if there is memory corruption
and debugging is enabled.  Ticket #421. (CVS 1086)

FossilOrigin-Name: eebc82b77dbf35a18d2eae47336038d4b67806c6
2003-08-26 11:29:07 +00:00
drh 901afd4341 If the database filename is an empty string, open a temporary file to hold
the database.  Ticket #432. (CVS 1085)

FossilOrigin-Name: da53369f0bf133b89b213bbb1ccea13eb93ab6ed
2003-08-26 11:25:58 +00:00
drh 263659be4d Close files before deleting them on test scripts under Win2k.
Ticket #434. (CVS 1084)

FossilOrigin-Name: 2a40b46140720783cf4002fb9993f7f6766dbf5f
2003-08-26 11:18:19 +00:00
drh 6ab95d3e85 Remove extra backslashes from end of lines in the install target of the
Makefile.  Ticket #435. (CVS 1083)

FossilOrigin-Name: 1aa3658ef54fad7f2b7f61d91641472551468cdc
2003-08-26 10:38:58 +00:00
drh 3ca65151d5 Fix a bug in the new "pk" column of the table_info pragma that was added
by check-in (1081). (CVS 1082)

FossilOrigin-Name: ad7b017a1277c00b356343b36ade565baf404d6a
2003-08-24 16:38:17 +00:00
drh 78100cc928 Add a "pk" column to the table_info pragma which is true for each column
that is part of the primary key.  Add a "foreign_key_list" pragma that gives
information about all foreign keys for a table.  Both changes are experimental. (CVS 1081)

FossilOrigin-Name: 5232b0665b84a9339a85918570093a376a0ea91f
2003-08-23 22:40:53 +00:00
drh 73d3667ef2 Version 2.8.6 (CVS 1080)
FossilOrigin-Name: 0bde7ae2ba57de554c3531f3cb7e36bf56d3b12c
2003-08-22 03:00:00 +00:00
drh a866b82244 Change the CVSTrac website to www.sqlite.org. Update change summary for
the 2.8.6 release. (CVS 1079)

FossilOrigin-Name: a4e3e075e3b36e0f5f692067c5bf5e1b660d893d
2003-08-22 02:34:30 +00:00
drh 02b2011cb3 Update the -version-info number on libtool in Makefile.in. (CVS 1078)
FossilOrigin-Name: dc36365eea7d0c8767d8947393a8d2746c02b220
2003-08-21 14:36:38 +00:00
drh 4739470341 Add the experimental "quote()" function to the set of build-in functions. (CVS 1077)
FossilOrigin-Name: 9699c68508db5da6238904e518835a629d430db6
2003-08-20 01:03:33 +00:00
drh 5d9d757626 Add the "onecolumn" method to the TCL language bindings. (CVS 1076)
FossilOrigin-Name: c7b4c28fbc0bca5645af5750fd353f4eca400b40
2003-08-19 14:31:01 +00:00
drh e5e3760e1c Make the compile work under cygwin.
Tickets #327, #213, #316, #322, #349, #373, and #429. (CVS 1075)

FossilOrigin-Name: 7d8d3252df1e9f6bec5e105b6eca3313cb7e226a
2003-08-16 13:10:51 +00:00
drh 9b1b01bb76 Do not delete tables with the same name when dropping triggers.
Ticket #430. (CVS 1074)

FossilOrigin-Name: ef58f163b08d13f8e9b69459bd83e0bf9d5b404b
2003-08-16 12:37:51 +00:00
drh 8e18bac793 Fix a segfault that occurs in the VACUUM command if run on an empty database
with the EMPTY_RESULT_CALLBACKS pragma enabled.  Ticket #427. (CVS 1073)

FossilOrigin-Name: 3563e9cf9d6b20f09e92deb21fdda93bcd8fb583
2003-08-15 13:24:51 +00:00
drh b2446f9bbf Update the NULL-handling chart with new information about Firebird. (CVS 1072)
FossilOrigin-Name: 17bdfeb284880d82cd546e6c191c3a37121ec861
2003-08-13 11:29:23 +00:00
drh 41a8230fef Make the sqliteOsCurrentTime() function work for Windows. Code contributed
by "e4liberty" on the mailing list. (CVS 1071)

FossilOrigin-Name: 02fac304c9ec9012f3cc4f04d2c4cac5e37b0024
2003-08-10 16:16:22 +00:00
drh 87adaa9a99 tighter coding of the date and time functions. Better comments. A bug fix. (CVS 1070)
FossilOrigin-Name: 94243edac14b90ef898093b85e1959c20fa23ae9
2003-08-10 01:50:54 +00:00
drh 771d8c3bae Add experimental date and time functions based on julian day number. (CVS 1069)
FossilOrigin-Name: a6197e2075fdf9db862484255ac16b2855bbef0a
2003-08-09 21:32:28 +00:00
drh 37ed48ed2f Provide a more informative error message when a uniqueness constraint
fails.  Ticket #419. (CVS 1068)

FossilOrigin-Name: 086aa1c9922b7bf399b3ee8b73ba7353d126b119
2003-08-05 13:13:38 +00:00
drh 4305d10360 The {quote: SrcList} object was not being expanded correctly by a call to
sqliteSrcListAppend() if the {quote: SrcList} had previously been duplicated by
a call to sqliteSrcListDup().  Ticket #416. This check-in fixes that problem
by keeping a separate nAlloc field on {quote: SrcList}.  A similar change is made
to {quote: IdList} and {quote: ExprList} to avoid future problems. (CVS 1067)

FossilOrigin-Name: da6273255471673841fdcadc688aeac80722e130
2003-07-30 12:34:12 +00:00
drh a76c82eb0d When creating a new journal file, open a (read-only) file descriptor on the
directory containing the journal and sync that directory once to make sure
that the journal filename entry gets into the directory.  Ticket #410. (CVS 1066)

FossilOrigin-Name: 09c10fe3c99cffc64ed02c2929f206d99c8e3309
2003-07-27 18:59:42 +00:00
drh 98e3e60012 Make sure the schema loader callback can handle EMPTY_RESULT_CALLBACKS being
on.  Ticket #406. (CVS 1065)

FossilOrigin-Name: 8c163fc0c7c721b7a5fa6727b0e90bff4484c782
2003-07-27 17:26:22 +00:00
drh dc2d94de56 In the VDBE, when an integer value will not fit into a 32-bit int, store it
in a double instead.  Ticket #408. (CVS 1064)

FossilOrigin-Name: 7514c3db165e8cc5c696b2b345844949a0e45a61
2003-07-27 17:16:06 +00:00
drh 48647b390b Version 2.8.5 (CVS 1063)
FossilOrigin-Name: 95fba440e79c066c0d6f6205a3d7dcb6c870b1c9
2003-07-22 13:20:28 +00:00
drh 8dd5a314eb Fix a typo in the index.html homepage. (CVS 1062)
FossilOrigin-Name: 510761cf505222c68ce3404aad94e1cc28b703ed
2003-07-22 12:44:53 +00:00
drh ee513831a7 Increment the version number and update the documentation in preparation
for the 2.8.5 release. (CVS 1061)

FossilOrigin-Name: c2115335de4abc25cbc1664d718dc3a6f70ebe6c
2003-07-22 12:41:59 +00:00
danielk1977 999af643a0 Add experimental sqlite_reset() API (allows pre-compiled queries) (CVS 1060)
FossilOrigin-Name: 1d2fcb017811db90e85d63f2ca76867c00ab8f1b
2003-07-22 09:24:43 +00:00
drh 4d87325d61 Make sure temporary file names in windows have a full 15 characters of
random text at the end. (CVS 1059)

FossilOrigin-Name: 6ccb92b14f2e6e01bb60dac10331fa7be0b4525e
2003-07-22 00:39:13 +00:00
drh 7b58daeafe Fix the LIMIT clause so that it applies to the entire query in a compound
query.  Prior to this change LIMITs on compound queries did not work at
all.  Ticket #393. (CVS 1058)

FossilOrigin-Name: 543479e3aed77976a0c689cf40811bf88353f706
2003-07-20 01:16:46 +00:00
drh e5f50722b4 Make sure the min() and max() optimizer works correctly when there
is a LIMIT clause.  Ticket #396. (CVS 1057)

FossilOrigin-Name: c35e50717678703763c696e3e9b265add2ca6454
2003-07-19 00:44:14 +00:00
drh 9347b20050 In the sqlite shell, change the name of function getline() to local_getline()
to avoid a clash with a library function.  Ticket #400. (CVS 1056)

FossilOrigin-Name: 558969ee8697180c74308f3f880d3240eb575af1
2003-07-18 01:30:59 +00:00
drh 9cb733c39d In the test scripts, do not try to delete files that are still open.
Windows does not like it when you do.  Ticket #397. (CVS 1055)

FossilOrigin-Name: 93a2c961b17d2459272e2d8654bd4b972f52fbe1
2003-07-18 01:25:34 +00:00
drh a3b6cfa6cf Fix typo on the homepage. (CVS 1054)
FossilOrigin-Name: c74107d63ace3d0e51da3b7bd7ee250c2a39205b
2003-07-16 17:10:45 +00:00
drh a88dc3f629 Make LIMIT 0 return no rows. LIMIT -1 still returns all rows. Ticket #346. (CVS 1053)
FossilOrigin-Name: a31d0bd90af7cc95f8e36ca8ece21515f872235e
2003-07-16 11:51:35 +00:00
drh ef0cae500d Allow negative values for LIMIT and OFFSET. Add tests for negative LIMITs
and OFFSETs.  Make the OFFSET work even if LIMIT is 0 or negative. (CVS 1052)

FossilOrigin-Name: e6a752bfef24f773973c151c6262ff331a9dc57a
2003-07-16 02:19:37 +00:00
drh d4f5ee2805 Initialize a variable to prevent an MSVC compiler warning. Ticket #394. (CVS 1051)
FossilOrigin-Name: 96e3c539586bf86c4fe8de0ac25de6655f704035
2003-07-16 00:54:31 +00:00
drh da808d56dc An an extra test associated with ticket #387. (CVS 1050)
FossilOrigin-Name: 6a07ac3782bc18f907ffcf66d908ddaa82ab9293
2003-07-09 16:34:56 +00:00
drh 073e5a7751 Allow the output arguments in sqlite_compile and sqlite_step to be NULL
pointers.  Tickets #384 and #385. (CVS 1049)

FossilOrigin-Name: dd84f88f6c4012e4a093a4881f6fe50527bb2006
2003-07-09 00:28:13 +00:00
drh 23af2f6eb2 Enhance the C/C++ documentation to clarify the meaning of the return value
from sqlite_changes().  Ticket #383. (CVS 1048)

FossilOrigin-Name: 303b2da1acd4b7b9d89dec0653e5f88fc10d56b8
2003-07-08 23:42:25 +00:00
drh 3e4c852889 A proported fix for ticket #374. (CVS 1047)
FossilOrigin-Name: a49ee69e98df80b479aa6bb97a9af9c6abf04e3f
2003-07-07 10:47:10 +00:00
drh d0cc954fa1 Update the NULL-handling document to show current behavior of OCELOT. (CVS 1046)
FossilOrigin-Name: 1d4c92c7325f69ee84b901a2de74a306ace134b6
2003-07-07 00:10:39 +00:00
drh 1dd59e0f94 Correctly handle comparing an INTEGER PRIMARY KEY against a floating point
number.  Ticket #377. (CVS 1045)

FossilOrigin-Name: 982aa3356bcc217003cd9e6a829619219c334797
2003-07-06 17:22:25 +00:00
drh 3c8bf55a04 Make sure indices in ATTACH-ed databases are put into the right hash table.
Ticket #354. (CVS 1044)

FossilOrigin-Name: eb4582831d536cd26a1738f9ad197e40486d0958
2003-07-01 18:13:14 +00:00
drh c5aceb33cb Update the null-handling document to show how SQL Anywhere and Borland
Interbase deal with NULLs. (CVS 1043)

FossilOrigin-Name: 9a87f2f326d7fc8bb9f832d0e3fd31141e14e08f
2003-07-01 01:16:30 +00:00
drh ef2d1b100c Documentation change: refer users to the wiki for additional unsupported
features rather than have them send me e-mail. (CVS 1042)

FossilOrigin-Name: a3920b0804e9993bb21e6c46c612e72bd03178a2
2003-06-30 10:36:23 +00:00
drh 631e276202 Version 2.8.4 (CVS 1041)
FossilOrigin-Name: 7f5e8894ae37761d1015c426b5d383d3deef3e25
2003-06-29 20:45:29 +00:00
drh dc339ee29c The prior fix of ticket #360 was incorrect and caused a memory leak. This
check-in plugs the memory leak and correctly fixes ticket #360. (CVS 1040)

FossilOrigin-Name: fc490f677b89e623b41f9e7f5f3bade9b981562c
2003-06-29 20:25:08 +00:00
drh d6ae597393 Fix a bad memory leak in the in-memory database module. (CVS 1039)
FossilOrigin-Name: 9cca95937837333c91f5dee8c48178cf7e06d59f
2003-06-29 18:29:47 +00:00
drh 27fb6f6a99 Bump the version number in preparation for the next release. (CVS 1038)
FossilOrigin-Name: 0532e1a8f5a310bb19b55dc29aa5b1f1172a14da
2003-06-29 16:16:40 +00:00
drh 88c0df2a84 Documentation updates. (CVS 1037)
FossilOrigin-Name: ab21de5fdd8e45be19411cdba647eada0bc9a9f1
2003-06-29 16:11:12 +00:00
drh 82f725df08 Minor change to a comment in encode.c. (CVS 1036)
FossilOrigin-Name: 3f252b72c9d9ea586161a1b2c5ae297594a1cd4a
2003-06-28 16:25:33 +00:00
drh 937dd84de8 Fix a bug in the soundex() code. Ticket #367. Add tests for ticket #261
even thought the problem could not be reproduced. (CVS 1035)

FossilOrigin-Name: e2ca936feee35b3fce99c95c2cf8c0ad05cd9c3b
2003-06-28 16:20:22 +00:00
drh d60ccc6a75 In a SELECT, the rowid of a view or subquery which is really a join is
set to NULL if the join is flattened.  Ticket #364. (CVS 1034)

FossilOrigin-Name: bad8b55833f5120003a19883154dac5146cc36a3
2003-06-24 10:39:46 +00:00
drh 18706c08cb Remove a surplus "return" statement accidentaly left in check-in (1032). (CVS 1033)
FossilOrigin-Name: c697410af4a61d2037e7e319efe8dd78d7b83365
2003-06-23 15:15:03 +00:00
drh 6cb2c52d96 Remove all references to SQLITE_OMIT_TRACE. Tracing is always enabled.
Ticket #361. (CVS 1032)

FossilOrigin-Name: ec31a5292cbc5d2fb68449838b929638f48e31a7
2003-06-23 11:06:01 +00:00
drh 8ce10ba65e Make sure the source of a PULL opcode is not an ephemeral string. Ticket #360. (CVS 1031)
FossilOrigin-Name: cb70ee67ea9f5a47d58820e0e8b28c8f945217ed
2003-06-22 01:41:49 +00:00
drh 44ce7e20f8 Remove unused variable. Ticket #355. (CVS 1030)
FossilOrigin-Name: 5228cecdb84a665b96750fc0dc7c81e3f50a3ce8
2003-06-17 02:57:17 +00:00
drh 7a73eb48f8 Fix compiler errors and warnings win SQLITE_OMIT_AUTHORIZATION is defined.
Ticket #353. (CVS 1029)

FossilOrigin-Name: 6920b633c2e4a94ee5de7d2db3933a873ee3513b
2003-06-16 19:18:12 +00:00
drh d93d8a812e Add the %z format to the sqlite_mprintf() and related functions. (CVS 1028)
FossilOrigin-Name: eca1398eaac67d772aff2676a470d9a6d96a93ca
2003-06-16 03:08:18 +00:00
drh 3fc673e622 Do not flatten a subquery which is the right term of a LEFT OUTER JOIN
if the subquery contains a WHERE clause.  Ticket #350. (CVS 1027)

FossilOrigin-Name: dd8943e8583cf7ed3b662570a5607856fd246dac
2003-06-16 00:40:34 +00:00
drh f817b6be7f Preserve blank lines in the middle of SQL statements in the shell.
Ticket #352 (CVS 1026)

FossilOrigin-Name: bcf5eeecdfd9897bc7c257119d7515fd34d222c1
2003-06-16 00:16:41 +00:00
drh 4d9fc3231b Update the documentation to reflect the new capabilities of PRAGMA
integrity_check.  Rewording in the VACUUM documentation. (CVS 1025)

FossilOrigin-Name: 38461a7acb5281edd7078b1b3f227bb45f281757
2003-06-15 23:49:38 +00:00
drh ed717fe3b2 Enhance the "PRAGMA integrity_check" command to verify that all indices are
correctly constructed.  New calls to integrity_check are made in the test
suite. These changes are intended to prevent any future problems such
as seen in ticket #334. (CVS 1024)

FossilOrigin-Name: c9734c27074d2039a1896a8c6965c08d03711b13
2003-06-15 23:42:24 +00:00
jplyon 3ca691106b Updated sqlite_encode_binary() comments with tighter bounds on output length. (CVS 1023)
FossilOrigin-Name: 826aab43d5967ece2a272c49ce62021fa4a2ceb3
2003-06-15 10:35:04 +00:00
jplyon 1420010fa4 Documented integer values used by PRAGMAs.
Fixed missing end tags in generated anchors. (CVS 1022)

FossilOrigin-Name: 6c24dfbae56a16dd736de5297c1796818773df80
2003-06-15 10:29:24 +00:00
a.rottmann 831961217d * Added -version-info to shared libraries
* Remove config.h and libtool in the distclean target (CVS 1021)

FossilOrigin-Name: e13e8b05b4d146aa4ca9ed06e414e0c6a4fba4e4
2003-06-14 19:29:08 +00:00
drh c45d95f9de Bug fix: sqliteFree() called twice on the same allocation during error
handling in attach.c. (CVS 1020)

FossilOrigin-Name: 9ec40935b9435ddc3749cab517387477e4045f6b
2003-06-14 12:04:07 +00:00
drh e2227f0092 Open the journal file for read-only when doing a playback. Ticket #351. (CVS 1019)
FossilOrigin-Name: 66ac7aea3df8533a49c8c05ba57c5a7015626828
2003-06-14 11:42:57 +00:00
jplyon 892f671cf3 Added missing error string to sqlite_error_string(). (CVS 1018)
FossilOrigin-Name: 3afb7b3586be81202c76692afea9d2b7a63b4b93
2003-06-12 08:59:00 +00:00
drh 2e0d738b60 Suppress the warning message about print_node() being unused in btree_rb.c.
Ticket #347. (CVS 1017)

FossilOrigin-Name: b52f07e1c894a52bb12459d03fd0efcee05dd08c
2003-06-10 02:46:15 +00:00
drh 7571c96c4c Remove redundant "return" statement from btree_rb.c. (CVS 1016)
FossilOrigin-Name: 373d077173f1b31896dc0e0d724371dd506d52f3
2003-06-09 11:53:12 +00:00
jplyon 05e45910ca Documented SQL fns IFNULL() and NULLIF(). (CVS 1015)
FossilOrigin-Name: 190252fee0a86eb6f8c24a2402e36482e3bd514c
2003-06-08 08:36:33 +00:00
drh 6f8fd3c171 Use sqliteOsFileExists() in the debugging hook in vdbe.c, instead of access().
Ticket #341. (CVS 1014)

FossilOrigin-Name: 7d3405b95bae74e0c476a7bdf708ca518723eaf7
2003-06-07 11:33:45 +00:00
drh 94ce4c1e3b Do not assume that a pointer can fit in a long inside the printf() code.
Ticket #342. (CVS 1013)

FossilOrigin-Name: 5dad7c05e9789e101d5ce75a6f3ea2ffb278b29d
2003-06-07 11:29:50 +00:00
jplyon 048aa234ef Major update of vdbe tutorial to 2.8.0 engine. (CVS 1012)
FossilOrigin-Name: 787d986d0f391d26eef7a2639594c465f9599f5b
2003-06-07 08:57:58 +00:00
jplyon 5fa7eb0dd9 Hyperlinks and minor additions/corrections for lang.tcl (CVS 1011)
FossilOrigin-Name: 685a179aae535431ec46922f1aff50a54112e959
2003-06-07 08:56:09 +00:00
drh 81e293b4b2 Extend the authorization mechanism to disallow the ATTACH and DETACH commands.
Ticket #340. (CVS 1010)

FossilOrigin-Name: a97dca73aed0b42d8dcf944360667ae93c5324fd
2003-06-06 19:00:42 +00:00
drh 70dc85a4c2 Add btree_rb.c and opcodes.c to the source built by the "target_source" target
of the main makefile. (CVS 1009)

FossilOrigin-Name: 09546972991601697925c10b6ef31694b0be2385
2003-06-06 16:13:40 +00:00
drh d36a483704 Add a prototype for the sqlite_vmprintf() function to sqlite.h. (CVS 1008)
FossilOrigin-Name: 048cf55c7da92e363f6a2ab594e17280c9573410
2003-06-06 15:44:00 +00:00
drh b5333fa6e4 Fix a typo in speed.html. (CVS 1007)
FossilOrigin-Name: d01e6fbdde314f2edfcd43fcda3dc8bedb6bf2ba
2003-06-05 15:05:34 +00:00
drh 8649d6a1a8 Remove unused code from util.c. (CVS 1006)
FossilOrigin-Name: 1bcaa841a396e4d592de30d10846f7cefbbdcd0e
2003-06-05 14:27:56 +00:00
drh 7d02cb73ca Fix a bug in UPDATE OR REPLACE that was introduced by check-in (999).
Also clean up some compiler warnings for VC++. (CVS 1005)

FossilOrigin-Name: af6f2bdf59fb621ff3e1d061e429f01ebd7d0b42
2003-06-04 16:24:39 +00:00
drh b8ec20925d Adjust test cases to cope with the extra column returned by the database_list
pragma. (CVS 1004)

FossilOrigin-Name: fa10c6df5a80127508fb198c21ef93acfc93ebe2
2003-06-04 15:53:02 +00:00
drh 5e8e1981dc Change the "database_list" pragma to return a third column containing the
filename of the underlying database file.  Always use an in-memory TEMP
database with an in-memory main database. (CVS 1003)

FossilOrigin-Name: f39100f5759d0d8b9c71e18d38a148dee4643020
2003-06-04 15:48:33 +00:00
drh ca3bdaca19 Version 2.8.3 (CVS 1002)
FossilOrigin-Name: 433570e3e6caa52b9e480a22529dde6385a3c7d3
2003-06-04 12:44:27 +00:00
drh b6ec9fed20 Update the version number to 2.8.3. (CVS 1001)
FossilOrigin-Name: c96f5bf0d7b75c8091f78dc2b9e3937949642ce5
2003-06-04 12:40:43 +00:00
drh bc2bca0843 Disable the unreadable file test (attach-6.2) under windows because of
problems in the OS. (CVS 1000)

FossilOrigin-Name: 4bfb30d20bdd33c6e26c8fb8392a75d3cf2ee4bd
2003-06-04 12:31:53 +00:00
drh 5383ae5c12 Avoid corrupting indices when doing a REPLACE on a table with an
INTEGER PRIMARY KEY that also has another index.  Ticket #334. (CVS 999)

FossilOrigin-Name: e813faae0e4086571d13c769f793add7f1f979af
2003-06-04 12:23:30 +00:00
drh 4312db55d9 Additional testing of the ATTACH command with bug fixes for the new problems
that the tests found. (CVS 998)

FossilOrigin-Name: 3e8889d7ce5e99fc855526fc1bb62ddbe282bfc5
2003-06-03 01:47:11 +00:00
drh 1aa4965ae3 The OP_Checkpoint opcode is now a no-op if invoked on a database that already
has an active checkpoint journal.  Ticket #333. (CVS 997)

FossilOrigin-Name: daf7b94017f03638da1ef65830f3762be030b93c
2003-06-02 23:14:13 +00:00
drh 2394e376d6 Fix a bug in the COPY command introduced by check-in (991). (CVS 996)
FossilOrigin-Name: 77ec13dab85b70795ef06ff2c714cca0cd496837
2003-06-02 22:50:25 +00:00
drh ade106c14a Fix an initialized variable in sqliteInitOne. (CVS 995)
FossilOrigin-Name: 89957b09ce746cf98d5d75cab2a23994e27c4937
2003-06-02 18:17:33 +00:00
jplyon 5959abd5d0 Generate anchors in opcode table html for use by new vdbe tutorial. (CVS 994)
FossilOrigin-Name: 3ae36cf158e1878a66ce9302eae4e62f8a88333f
2003-06-02 06:29:31 +00:00
jplyon 02be20d4f5 Added comments. (CVS 993)
FossilOrigin-Name: 1276ddb3074b74e22c579bad6951ea52384c08dd
2003-06-02 06:17:10 +00:00
jplyon 5a56422a29 Additions and corrections to vdbe documentation comments. (CVS 992)
FossilOrigin-Name: b648987de3383d6835df58aa0efee54fa8f10d26
2003-06-02 06:15:58 +00:00
drh a0217ba720 Add the ability to INSERT or UPDATE using the "rowid" column even on tables
that lack an integer primary key. (CVS 991)

FossilOrigin-Name: 903adbe802ca0e987b867e5ad33aae02ad2a43d4
2003-06-01 01:10:33 +00:00
drh f26e09c87f Tighter binding of views, triggers, and indices to their respective
databases.  Ticket #323.  Much more testing needs to be done to the
sqliteFix...() routines in attach.c. (CVS 990)

FossilOrigin-Name: 7202d4f1a8853368954a967b7ccca9d8a6645a2e
2003-05-31 16:21:12 +00:00
drh 8372b8d134 Change the row-size limit back to 1MB. It was temporarily raised to 16MB.
We'll probably move it to 16MB eventually, but not just yet. (CVS 989)

FossilOrigin-Name: b84c4035c6b06469055798cf412fa4da8b50fa17
2003-05-29 17:50:55 +00:00
drh 9ac717d7f6 Modify the windows locking code so that it works correctly for a database
being shared between Win95/98/ME and WinNT/2K/XP systems.  Ticket #310. (CVS 988)

FossilOrigin-Name: 8c402db7e0745622d9950e5ca5d4d8e933da436c
2003-05-29 17:43:08 +00:00
jplyon 124e74e685 Added typeof() operator.
Minor additions for ATTACH/DETACH. (CVS 987)

FossilOrigin-Name: 8b8fa0fff26107912f0bec4e44df207c7885e273
2003-05-29 04:21:38 +00:00
drh 6e1d288a9f Fix segfault that occurs when opening a non-existing database in the shell
then immediately doing ".q". (CVS 986)

FossilOrigin-Name: e8566cf5a381fa7655caacbc0fe95091e1137fea
2003-05-19 23:55:30 +00:00
drh 6b8611126b Additional attach testing. I now believe that ticket #317 was fixed
by check-in (981). (CVS 985)

FossilOrigin-Name: 24191373796b7fd6255ef9b70ce2344326308113
2003-05-17 19:23:51 +00:00
drh 79a519c047 Prevent an infinite loop when deleting a table that has a TEMP trigger. (CVS 984)
FossilOrigin-Name: c8c823b068916711857fa67db10fb479999b55c2
2003-05-17 19:04:03 +00:00
drh 24f1eb74c8 Version 2.8.2 (CVS 983)
FossilOrigin-Name: f542e5fc8896111e5165cc625607f95e4993bb16
2003-05-17 17:52:34 +00:00
drh 369986a75f Bump the version number and update the change log. We are rushing out
release 2.8.2 because of the database corruption problem fixed by
the previous check-in. (CVS 982)

FossilOrigin-Name: e134459d653b03bfacb98eec2c5d91eef7e4ed24
2003-05-17 17:38:37 +00:00
drh 8bf8dc9208 Fix problems with TEMP indices that lead to corrupt databases. These
problems were discovered while working on ticket #317.  No sure yet if
that ticket is fixed. (CVS 981)

FossilOrigin-Name: 01398fb78bab7e5c6f439f2b743f26e82118468a
2003-05-17 17:35:10 +00:00
drh 0594f5b97e Version 2.8.1 (CVS 980)
FossilOrigin-Name: 590f963b6599e4e235d7369f19c63cece4b2ad95
2003-05-17 02:44:32 +00:00
drh 8971527208 Fix the fix for newlines in echo commands. Tickets #311, #282, #256. (CVS 979)
FossilOrigin-Name: baea7aca10e30f30b874e1e8b6cd3b05954ba83c
2003-05-17 02:27:21 +00:00
drh 8625f9fe38 Bump the version number to 2.8.1. Update documentation prior to release. (CVS 978)
FossilOrigin-Name: 0874814ab01ffc0acffec8e6cec34eaab3428d36
2003-05-17 01:39:39 +00:00
drh 299fa266df Escape backslashes in echo commands in the makefiles. Tickets #311, #282, #256. (CVS 977)
FossilOrigin-Name: d614861b8ad9e661b8f08131b95d730e2c2c35c2
2003-05-17 00:24:21 +00:00
drh 9335247003 Fix memory allocation problem in the sqlite_get_table() API. Ticket #315. (CVS 976)
FossilOrigin-Name: f1d955efd91093994db43a1540080d32442d5ac0
2003-05-17 00:05:49 +00:00
drh a996e477d0 Make sure the ON CONFLICT clause on a BEGIN overrides the conflict resolution
specified by an index.  This fixes a bug reported on the newsgroup. (CVS 975)

FossilOrigin-Name: 0f92736d1fbe3b587592fe1f26dfb3558cc49727
2003-05-16 02:30:27 +00:00
jplyon 931634915d Removed 3rd (file) column from PRAGMA database_list until tests are fixed. (CVS 974)
FossilOrigin-Name: 4183cf97676e64d19978941a7c4a3fe521fcb1fb
2003-05-13 08:01:33 +00:00
drh 39581966a0 Fix another twos-complement negation error. Ticket #313. (CVS 973)
FossilOrigin-Name: f267a8a4ff52eb7ee3ac20a8e3a8ab5fe19e445d
2003-05-13 01:52:31 +00:00
drh 3b2129cf77 A change to lemon related to ticket #313. (CVS 972)
FossilOrigin-Name: b59d9033d5556015543ac5ca23110ccbeb4391f0
2003-05-13 00:34:21 +00:00
drh fe4184f8d1 Remove unnecessary "#include <sqliteInt.h>" from the shell code. (CVS 971)
FossilOrigin-Name: 6e5c497a42e52236edae8d99b4892d4b93db43f5
2003-05-13 00:24:41 +00:00
drh e62720d1f1 Fix a #ifdefs that are used to comment-out the VACUUM command. (CVS 970)
FossilOrigin-Name: 22d5324073a727627d4294870a441fa2316fb049
2003-05-13 00:21:59 +00:00
drh 5364f60302 Make sure hash functions always return non-negative. (CVS 969)
FossilOrigin-Name: 39a3e403f0440acb2f85a064ec23d404f9cdfbc4
2003-05-12 23:06:52 +00:00
jplyon 5ca89c3d28 Changed PRAGMA database_list to show the filename. (CVS 968)
FossilOrigin-Name: 3da10d2d02e331f136fcf857dc4c435c67ee7196
2003-05-11 20:09:19 +00:00
jplyon 672a1edfc8 Changed ".databases" command to use PRAGMA database_list. (CVS 967)
FossilOrigin-Name: bad2065337d8dcaacd519b8f1730a90f1c933c3e
2003-05-11 20:07:05 +00:00
drh 5fe2d8c913 Changes to comments. In particular, a lengthy comment was added to encode.c
that explains how the encoder algorithm works. (CVS 966)

FossilOrigin-Name: 8b388b2f690dbfd50eefc0fdede1c7785f78afa1
2003-05-10 03:36:53 +00:00
jplyon a3643a2697 Removed never-used symbol SQLITE_ResultDetails. (CVS 965)
FossilOrigin-Name: 26bd7bb1779e14f19c00e450aaa9529f2aabf131
2003-05-10 03:04:34 +00:00
jplyon f60482044d Removed never-used pragma "result_set_details". (CVS 964)
FossilOrigin-Name: bf558e79524c04339f1174dc935e39d47cb33457
2003-05-10 03:03:34 +00:00
jplyon 9098056e6f Documented the "GO" and "\" command terminators. (CVS 963)
FossilOrigin-Name: 6a76bd9590f372411e697f002285fe36ff3787ee
2003-05-10 02:54:56 +00:00
jplyon df2245df05 Fixed metacharacter coloring with LP, RP, PLUS.
Added more links. (CVS 962)

FossilOrigin-Name: 2bbb08049508829419dd9a3729241b97b017cf36
2003-05-10 02:54:02 +00:00
drh f94e371bbf Format keyword lists in lang.html using a TCL proc. (CVS 961)
FossilOrigin-Name: ca75f1ca12cd88dce688e272d73c3c2282079547
2003-05-07 13:37:31 +00:00
jplyon 3aacc84e45 - Added entries for PRAGMAs database_list, temp_store and default_temp_store.
- Fixed missing end tags. (CVS 960)

FossilOrigin-Name: 55ae7b35ee2dcebc99256d4b1e22a87ea75e3d03
2003-05-07 04:04:17 +00:00
jplyon b2ca13ed4d Cleaned up keywords section. (CVS 959)
FossilOrigin-Name: bb609f96e00fd62d932601c4aa37bc17baa82257
2003-05-07 03:59:10 +00:00
drh 8af4d3ace6 Restrain the flattener in the presence of outer joins. Ticket #306. (CVS 958)
FossilOrigin-Name: 6d4b6597e560578253960d9876dc8c8657f41fef
2003-05-06 20:35:16 +00:00
drh 66b4ebafb2 Added tests trying (unsuccessfully) to reproduce ticket #304. (CVS 957)
FossilOrigin-Name: fda637f453d35b74f676997fcf056a948ccd771b
2003-05-04 20:42:56 +00:00
drh e1e38c4d7d Shell command-line parsing enhancements suggested by Mike Hall. (CVS 956)
FossilOrigin-Name: 5656fe48b192dc84cb5977f826ff99d81684791f
2003-05-04 18:30:59 +00:00
drh 7ad4334add Fix deficiencies in sqlite_complete() pointed out by R. Dennis Cote. (CVS 955)
FossilOrigin-Name: 54b33a5ed9f7a89435c2f1395a3177e8c778bb8a
2003-05-04 17:58:25 +00:00
jplyon 5640433e48 Added shell command ".databases" to list name and file of open ones.
Added several missing shell commands. (CVS 954)

FossilOrigin-Name: dd57d6ae6a247824e44a6073bc7e73ecb3c500fd
2003-05-04 07:31:09 +00:00
jplyon 6a65bb3c06 added shell command ".databases" to list name and file of open ones. (CVS 953)
FossilOrigin-Name: 741a5a8d3975fb5db18914b7879b12aead59279b
2003-05-04 07:25:57 +00:00
jplyon b24fe71970 new section for keywords, more docs for attached databases , links, cleanup (CVS 952)
FossilOrigin-Name: 87e1b6a936972670771cf90670aeb4308ba0a30a
2003-05-04 07:02:55 +00:00
drh e96fa95e8a More documentation updates. (CVS 951)
FossilOrigin-Name: 24b9b569240d2108b17420d85cafdc718c67269f
2003-05-03 19:04:03 +00:00
jplyon 2bfc9dbdcf - added entry for ATTACH DATABASE.
- added entry for DETACH DATABASE.
- added soundex() function.
- added some new TEMP modifiers.
- added new VACUUM behavior.
- added the Oracle8 outer join "(+)" syntax.
- documented the modulus/remainder operator %.
- added ALL as alternative to DISTINCT in SELECT.
- fixed assignment list in UPDATE to use * metacharacter.
- fixed value in PRAGMA to be optional.
- added link from INSERT topic to REPLACE.
- added optional CONSTRAINT <name> before column constraints.
- skip 2 lines before each Section in the TCL source. (CVS 950)

FossilOrigin-Name: fd28c5229ece1d90e24d0ecaa518d8df5a4f55f0
2003-05-03 04:55:19 +00:00
drh e9ffc168d8 Additional tests of the new flattener added. Ticket #272. (CVS 949)
FossilOrigin-Name: 8d9ee45ab487614191e8d6aef845141fdddf832a
2003-05-02 16:44:25 +00:00
drh c31c2eb82c Enhance the query flattener to handle subqueries that are joins.
All regressions pass but new tests need to be added before release.
Ticket #272. (CVS 948)

FossilOrigin-Name: ad57693e9f1b83a8cc4d028264b35018a9a4a701
2003-05-02 16:04:17 +00:00
drh 6a3ea0e6ef VDBE cursors numbers for tables in a join do not have to be consecutive.
This is one step on the road to fixing ticket #272. (CVS 947)

FossilOrigin-Name: be7aed2011b4af868b6a0c370c3d41354ae0cdf4
2003-05-02 14:32:12 +00:00
drh 56e452cf3a Correctly create an index that uses an INTEGER PRIMARY KEY as one of columns
to be indexed. (CVS 946)

FossilOrigin-Name: 6d019e0baa3219614a9bc5b550a0f9fe3f7e731a
2003-05-01 16:56:03 +00:00
drh 44c2eb128d In the shell tool, delay opening the database until it is needed but also
make sure it is opened before trying to use the "db" pointer.  Ticket #302. (CVS 945)

FossilOrigin-Name: 20fcead42bc875f13eec52971530342ff00c5eda
2003-04-30 11:38:26 +00:00
drh a9b1716296 Accept a "/" or "go" on a line by itself as an SQL statement terminator
in the command-line shell.  This allows SQL Server and Oracle scripts to
be played into SQLite without change. (CVS 944)

FossilOrigin-Name: 8211f57b38b87a42c856e267bd243984b5abf9cc
2003-04-29 18:01:28 +00:00
drh 86e5cc058d Allow the ASC or DESC keyword to appear after a column name in a CREATE INDEX
statement.  SQLite indices are aways ASC (ascending) regardless of which
keyword is used. (CVS 943)

FossilOrigin-Name: 1a0c542088618ba24d1efae9b13a8eca104d6cc8
2003-04-29 17:19:18 +00:00
drh 63eb5f294c The sqlite_complete() function should ignore carriage-return characters.
(Oops - some unrelated edits also made it into this check-in.) (CVS 942)

FossilOrigin-Name: c6bf62e41cf44e8ebf740b103204b00e8b826c90
2003-04-29 16:20:44 +00:00
drh 7d8085a8e4 In the test code, make several attempts to convert a pointer to a string
and test each attempt to make sure it works before returnning, in order to
work around incompatibilities between various systems.  Ticket #284. (CVS 941)

FossilOrigin-Name: 333011ffddc0be91f76811458f03ad1ec0331b51
2003-04-26 13:19:38 +00:00
drh 70c7a4b1da Fix the shell tool to do a better job of ignoring whitespace. Ticket #234. (CVS 940)
FossilOrigin-Name: 639957e9f793eddce027050d2655863d82fe8ac9
2003-04-26 03:03:06 +00:00
drh 4328c8b7c7 Only print the "Loading resources from..." line when the output is a TTY.
Ticket #168. (CVS 939)

FossilOrigin-Name: 92ded93376635f37e2f5a7a8f4077c85d5bce735
2003-04-26 02:50:11 +00:00
drh aba46b19f5 Do not use the return value of fcntl() to find the reason that it failed.
Use errno instead.  Tickets #240 and #270. (CVS 938)

FossilOrigin-Name: acf9e9802fa6396df5653ca4e72ab4ec2333509d
2003-04-26 02:40:45 +00:00
drh 524a5bf5f6 Fix the sqlite_complete() routine so that it recognizes /*...*/ comments.
Ticket #277. (CVS 937)

FossilOrigin-Name: ef8eb580fc6c40264219c2ae77a9c4f8a5803c8b
2003-04-26 02:31:54 +00:00
drh 85e2096fb6 Report the correct authorization context in the authorization callback
when coding an INSTEAD OF trigger on an update or delete. (CVS 936)

FossilOrigin-Name: 67746833fc8de3afff80db413bd63a362bb28218
2003-04-25 17:52:11 +00:00
drh 2e6d11bc07 Add tests to insure VACUUM works in the presence of I/O errors. Fix some
problems that came to light by these tests. (CVS 935)

FossilOrigin-Name: 8d3e879349fc9523c72cb46111e0058b57ce9341
2003-04-25 15:37:57 +00:00
drh 9c05dc6298 Work around a name collision problem on windows. (CVS 934)
FossilOrigin-Name: c3b1f84dfce13b2523c9923e4270577862ca0595
2003-04-25 13:28:02 +00:00
drh f7c5753174 Make VACUUM work even if multiple processes have the database open at once. (CVS 933)
FossilOrigin-Name: caa960289f3d1f5e8f35a94e9e4321996c211ed2
2003-04-25 13:22:51 +00:00
drh fd9903de51 Explicit casts to squelch bogus warnings for vc++. Ticket #194. (CVS 932)
FossilOrigin-Name: cb808c14bc14e7bd1cfff134ae5206ace451f2df
2003-04-25 03:13:25 +00:00
drh 45a304ee8c Get VACUUM working again - with test cases. Some other minor cleanups. (CVS 931)
FossilOrigin-Name: 5afb88008fed253e6d1fc0ed5172370b61d3727b
2003-04-25 02:43:08 +00:00
drh 5cf590c128 Fix some issues with INSTEAD OF triggers. (CVS 930)
FossilOrigin-Name: 206b17397b1d2b55179c935927ff1d8215728c32
2003-04-24 01:45:04 +00:00
drh b5a20d3ceb Remove the begin_hook and commit_hook APIs. They were a bad idea. Add a
"trace" method to the TCL interface. (CVS 929)

FossilOrigin-Name: 6289b863590ecc5de3d1efaaa60aa6f3f64fefb3
2003-04-23 12:25:23 +00:00
drh e22a334b78 Update the authorizer API so that it reports the database that table and
indices belong to and so that it reports when actions are taken in response
to a trigger. (CVS 928)

FossilOrigin-Name: c675a5504138f34cae6def782b5d3add2c67d2bc
2003-04-22 20:30:37 +00:00
paul 3837237959 Check for readline libs now adds appropriate curses or termcap lib when needed (CVS 927)
FossilOrigin-Name: 393dd91c252531bb5abfe424b86a5f7eb20edcfc
2003-04-22 08:04:49 +00:00
drh f0f258b11b Add support for TEMPORARY triggers. Such triggers can write temporary or
permanent tables. (CVS 926)

FossilOrigin-Name: 58ddd587b0f5d565ae3b0ba3a1fa5c20d459f3fc
2003-04-21 18:48:45 +00:00
drh 881b890af4 Add more tests for the in-memory database. (CVS 925)
FossilOrigin-Name: 11cab41c4f02cdddc4fd3f57555573ac2814a81b
2003-04-20 23:45:23 +00:00
drh b2fe7d8cb7 Added tests for the in-memory database backend. Also updated some comments
in other modules. (CVS 924)

FossilOrigin-Name: fb89adf4d1325c5ea471759ebfd8df7faa4f9a80
2003-04-20 17:29:23 +00:00
paul 2dc96f9eb8 Align config vars controlling in-memory DB with code (CVS 923)
FossilOrigin-Name: 921656db9e3df865aea6b1abe1bc40b1acbeeb47
2003-04-20 11:46:34 +00:00
paul f00993a30a Reset pCur->eSkip on a MoveTo (CVS 922)
FossilOrigin-Name: d983accf4a702158f03742fb11959d0fd035a4b4
2003-04-20 11:41:04 +00:00
drh ea1ba17cda Update comments. Remove unused field from the Index structure. (CVS 921)
FossilOrigin-Name: 7084e05093e72f6e5b65ff0b574336898396826f
2003-04-20 00:00:23 +00:00
drh 7bdc0c1def Modify the optimizer so that it does not assume that functions are
constant. (CVS 920)

FossilOrigin-Name: 767f1af236d115e8388e1dcc28a4df1be48d6c85
2003-04-19 17:27:24 +00:00
drh 37ea94b8c9 Bug in WHERE clause processing fixed. Ticket #298. (CVS 919)
FossilOrigin-Name: 9b619c98b586a207a87942640d3a94220ff8ab02
2003-04-19 16:34:04 +00:00
drh 9d10f1d0f6 fix a memory leak in btree_rb.c. (CVS 918)
FossilOrigin-Name: 1e3d0d094776c2a429fa2a3eebc036a0b6374862
2003-04-18 22:52:38 +00:00
drh cab20050bb Fix for ticket #297 - bug in sqliteSortCompare(). (CVS 917)
FossilOrigin-Name: 4ded1965eb83dee0f28c27ba935d615c77331571
2003-04-18 17:45:14 +00:00
drh a5f668327b The VACUUM command is now functioning (again). Need to do more testing. (CVS 916)
FossilOrigin-Name: 6e948d9aaea109c683ac4fcc4714e335b545d22b
2003-04-18 02:31:04 +00:00
drh a69d91681d Fix triggers to work in an ATTACHed database. Ticket #295. (CVS 915)
FossilOrigin-Name: 1e5e00fb73c308378efd034cb291caf338c9fe84
2003-04-17 22:57:53 +00:00
drh d4d595f94c Make sure the min() and max() optimizations work on empty indexed tables.
Ticket #296. (CVS 914)

FossilOrigin-Name: 98ef6110068e5ed3cd77a14b004f890b79b731f7
2003-04-17 12:44:23 +00:00
drh 8396566204 Change the shell to use the sqliteIsNumber() routine for determining if
values are numeric.  Modified os.c so that it should now work with DJGPP -
though I have no way of testing this. (CVS 913)

FossilOrigin-Name: 35caefe31750fd103b5f0231ad36f375771063eb
2003-04-17 02:54:13 +00:00
drh 95b5084409 Rollback if a commit hook fails. (CVS 912)
FossilOrigin-Name: 5cea7554ae9d36434cd7261b5b40f3d467b836f1
2003-04-16 21:03:13 +00:00
drh 027850b676 Fix the authorizer so that it correctly interprets attempts to read the
OLD and NEW pseudo-tables of a trigger. (CVS 911)

FossilOrigin-Name: f04bd43254b3ba3fccc842214115d4c298e28138
2003-04-16 20:24:52 +00:00
drh bb07e9a34f Simplify the number processing code. Fix for ticket #281. (CVS 910)
FossilOrigin-Name: 4326b52a39cad4632dc2db37aa53a285a31af138
2003-04-16 02:17:35 +00:00
drh 144f9eadf6 Remove some unnecessary code and complication from the btree interface. (CVS 909)
FossilOrigin-Name: 35cc7c7d37d9ca486e7f300efe80a78a7f1064e2
2003-04-16 01:28:16 +00:00
drh 70ce3f0c58 Get triggers working on tables with INTEGER PRIMARY KEYs. Ticket #291.
This may also fix #159.  Still need to add tests so both bugs remain open
for the time being. (CVS 908)

FossilOrigin-Name: 0b996959b8d8bc2c82eab9cccc190befd0056505
2003-04-15 19:22:22 +00:00
paul 048bd5937b Added btree_rb.c (CVS 907)
FossilOrigin-Name: 93eb6c52aca8de15a88247ec986c36245527ec7b
2003-04-15 17:22:30 +00:00
drh 49449834fc Do not record the inserted rowid on when doing an INSERT within a trigger.
Ticket #290. (CVS 906)

FossilOrigin-Name: 96a717661a3b7108fe0cacb588d81fd8e91eb640
2003-04-15 14:01:43 +00:00
drh f9a2e7bb8d Change lemon to use <stdarg.h> instead of <varargs.h> because GCC no longer
supports varargs.h.  Tickets #288 and #280.  Ironically, lemon originally
used varargs.h because stdarg.h was not supported by the compiler I was
using in 1989 (which was gcc if I recall correctly.) (CVS 905)

FossilOrigin-Name: 7902e4778ec86e25ad949ae7a6d55b63ac0e85f3
2003-04-15 01:49:48 +00:00
drh 13bff81537 Change some variable names and comments in the new in-memory database file
implementation.  Partial (non-working) implementation of the VACUUM command. (CVS 904)

FossilOrigin-Name: e76787f877c456abdc8bc88bfefc50eaeed68744
2003-04-15 01:19:47 +00:00
paul b0208ccaa3 Support in-memory databases for temp tables (CVS 903)
FossilOrigin-Name: 96336bffde6c441af197a521ee9e56fdfd7efff8
2003-04-13 18:26:49 +00:00
drh c11d4f9360 Split the implementation of COPY, PRAGMA, and ATTACH into separate
source code files. (CVS 902)

FossilOrigin-Name: 73359037ea639abb066c74db9c19e84bf1104006
2003-04-06 21:08:24 +00:00
drh e1051c653e Move the implementation of VACUUM into a separate source file. (CVS 901)
FossilOrigin-Name: b123c165fd3d0a5a86ee8a7baa669105dafb481a
2003-04-06 20:52:32 +00:00
drh 73509eee84 Simplify the BTree interface by shortening names. Added two new methods
for accessing the current filename and for changing the name of the
database file. (CVS 900)

FossilOrigin-Name: 185d8dc8d0c26cef36aeba6992823e5124af4056
2003-04-06 20:44:45 +00:00
drh a73af533de More testing of ATTACH and DETACH. (CVS 899)
FossilOrigin-Name: 51f515f28cb1cc3e8f0c3531724dc8876b25f18e
2003-04-05 16:56:28 +00:00
drh 2d4583473b Begin testing the new ATTACH and DETACH commands. (CVS 898)
FossilOrigin-Name: 7a0f8024a1323a15d0c83afe9302400736f01fe8
2003-04-05 03:42:26 +00:00
drh f539f6a7e9 Fix for ticket #276. (CVS 897)
FossilOrigin-Name: 452128c6fd9a0d82bfab21374fc2041638d264db
2003-04-03 19:35:02 +00:00
drh 0d1a643aea Added experimental APIs: sqlite_begin_hook() and sqlite_commit_hook(). (CVS 896)
FossilOrigin-Name: 5efbf62313519d0a6e8b8f5dbb29d3ef428d73e8
2003-04-03 15:46:04 +00:00
drh 048c530c01 Use a intermediate table when inserting a TEMP table from a SELECT that
reads from that same TEMP table.  Ticket #275. (CVS 895)

FossilOrigin-Name: 087d1e83af12b3a9aedd4945f02774a1043b1eb4
2003-04-03 01:50:44 +00:00
paul b95a8864c9 Add infrastructure to suport multiple btree implementations (CVS 894)
FossilOrigin-Name: 79b3aed2a74a67cbad631c4e2e4a43469d80c162
2003-04-01 21:16:41 +00:00
drh 738a68b250 Minor follow-on changes to the recent ATTACH patch. (CVS 893)
FossilOrigin-Name: 11378c5bf988412f8564cdc0314fc241793b292e
2003-03-31 13:36:09 +00:00
drh 665de47ac3 Minor follow-on changes to the recent ATTACH patch. (CVS 892)
FossilOrigin-Name: e80afe75b33d4eacb40ef6128cf688f7c3253984
2003-03-31 13:36:09 +00:00
drh da93d238c2 Add the sqliteErrorMsg() function and use it to generate error message
text during parsing and code generation.  This simplifies the code
somewhat and makes it easier to handle names with a database prefix. (CVS 891)

FossilOrigin-Name: 1d3fc977211abdc7ba3fd51d661863e8ce5aef69
2003-03-31 02:12:46 +00:00
drh 1c2d84148a The ATTACH and DETACH statements are now coded but are still mostly untested. (CVS 890)
FossilOrigin-Name: c7c5e927a54f0fbc2ca625754787aff4d9c4eff1
2003-03-31 00:30:47 +00:00
drh 180487389b Remove the experimental sqlite_open_aux_file() API. It will soon be replaced
by ATTACH and DETACH SQL commands. (CVS 1732)

FossilOrigin-Name: 0a358844e40020557c1aeea5779b194670350930
2003-03-30 19:17:02 +00:00
drh 3aa31a16e6 Remove the experimental sqlite_open_aux_file() API. It will soon be replaced
by ATTACH and DETACH SQL commands. (CVS 889)

FossilOrigin-Name: b6d6e07f3a5cb493f2cf0675bc6061c5afe5c078
2003-03-30 19:17:01 +00:00
drh 9077ba8ee5 Remove the obsolete documentation on how to crosscompile version 1.0 of
SQLite. (CVS 888)

FossilOrigin-Name: ac0622bf5fca9c8907319a20158e991efdaa6402
2003-03-30 18:58:58 +00:00
drh 1dd8c40e8f Detect when a child node of a btree page has zero entries and report that
as a case of database corruption. (CVS 887)

FossilOrigin-Name: 66c80ae232a78ecb010280ab1aa684cb78b0662f
2003-03-30 18:41:22 +00:00
drh 0be9df076a Fix a memory leak in triggers and update tests to show the latest error
message text. (CVS 886)

FossilOrigin-Name: b90d9de32d10a71fe81f5bfd0cf57faae8c5c3b4
2003-03-30 00:19:49 +00:00
drh 812d7a21dd Regression tests now work - except for some changes in error message
text.  The library is now safe to use for experimental work. (CVS 885)

FossilOrigin-Name: 8a593e9c2d57e758739a7ef54fa40ca6a0071a9a
2003-03-27 13:50:00 +00:00
drh 0951d703f2 Fix a segfault in the trigger code. (CVS 884)
FossilOrigin-Name: 7672914b196cd55744edda8e5d8f1b7b86f898f9
2003-03-27 13:01:28 +00:00
drh 1694cab424 Changes to the "sqlite" structure that allow simultaneous operations on
multiple database files.  Many regession tests pass - but not all of them.
Do not use this version except for debugging SQLite itself. (CVS 1731)

FossilOrigin-Name: 9ac71c329e17a0934d2a824eacc33e9a2ebce7c3
2003-03-27 12:51:25 +00:00
drh d24cc427b7 Changes to the "sqlite" structure that allow simultaneous operations on
multiple database files.  Many regession tests pass - but not all of them.
Do not use this version except for debugging SQLite itself. (CVS 883)

FossilOrigin-Name: d2fb2bb50cf1e13feb90995079f291384abd6ba9
2003-03-27 12:51:24 +00:00
a.rottmann 84e6335c0c Re-generated. (CVS 882)
FossilOrigin-Name: f0c5bcf72cf393ea4c5cd126d085cb959eebd5f2
2003-03-24 09:42:16 +00:00
a.rottmann 62507b650a Updated libtool. (CVS 881)
FossilOrigin-Name: b1ca4e13dcab92cc532f4051f24bf5b1be251463
2003-03-24 09:40:34 +00:00
a.rottmann c7e9383a9e Added pkg-config support. (CVS 880)
FossilOrigin-Name: ec1c5a611307047dd0049353e989e75dcaffaa45
2003-03-24 09:39:32 +00:00
drh 113088ec68 Record the database name in addition to the table name for DELETE, INSERT,
and UPDATE statements. (CVS 879)

FossilOrigin-Name: a5d8fc95ee58dc3205a0bbbcadaa3b9c902a941b
2003-03-20 01:16:58 +00:00
drh 001bbcbb8f Modifications to the VDBE to support more than one database file. (CVS 878)
FossilOrigin-Name: 875da9eed981bfa27b98e95025f9fdbed74b4098
2003-03-19 03:14:00 +00:00
drh 9468c7f489 Do not allow an empty string to be inserted into an INTEGER PRIMARY KEY. (CVS 877)
FossilOrigin-Name: 2aba40bea5fc1c4aef8cfd4c790d40808821ca14
2003-03-07 19:50:07 +00:00
drh 2299706c2a Add more tests to make sure that sqlite_changes() works when using the
non-callback API.  Ticket #250. (CVS 876)

FossilOrigin-Name: 13e501d190e327cc6fc16e182819ea9d7bb9c566
2003-03-01 19:53:15 +00:00
drh dde85d9e00 Get the non-callback API working with the EXPLAIN keyword and for PRAGMAs.
Tickets #258 and #257.  Update the API documentation on the sqlite_changes()
routine to explain how it works with the non-callback API.  Ticket #250. (CVS 875)

FossilOrigin-Name: 620e1065e978545dd7bf6fa6fad1e6b93918dbf8
2003-03-01 19:45:34 +00:00
drh 627a71efa7 Fix a memory leak associated with PRIMARY KEY in a CREATE TABLE statement
that fails.  Ticket #249. (CVS 874)

FossilOrigin-Name: 8e9dc567996c3301c14a1f055ff2265770cbc3e1
2003-02-26 13:52:52 +00:00
drh e0194f2bbd Fix a memory leak associated with PRIMARY KEY in a CREATE TABLE statement
that fails.  Ticket #249. (CVS 1730)

FossilOrigin-Name: 66158843dfa073ffb8779a5170e091cebc018855
2003-02-26 13:52:51 +00:00
drh 50cceb36b6 When the right table in a LEFT OUTER JOIN contains an INTEGER PRIMARY KEY
make sure that key is NULL if there is no row in the right table that
matches the current row in the left table.  Tickets #246 and #247. (CVS 873)

FossilOrigin-Name: 6a45fe3bd7e19cf9c20fc6cb65b0269cdd704490
2003-02-20 01:48:12 +00:00
drh e6da3c1816 Fix the parsing of the LIMIT clause when the limit and offset are separated
by a comma.  The offset comes before the limit in that case. Ticket #245. (CVS 872)

FossilOrigin-Name: 6ef91a364b2922f078b7de81816bca3f2ca0fe46
2003-02-20 00:44:52 +00:00
drh 30710453ca Version 2.8.0 (CVS 870)
FossilOrigin-Name: 5db98b3f4048fc8cd28d8fd225f2b0221ccf1d17
2003-02-16 22:49:47 +00:00
drh be992ef9c9 Couple of last-minute changes before 2.8.0. (CVS 871)
FossilOrigin-Name: 8192c937d524fef703d7ba2eb608c3d74e20440f
2003-02-16 22:48:12 +00:00
drh ad636221bb Update the speed comparison documentation to show the improved performance
of PostgreSQL after performance tuning. (CVS 869)

FossilOrigin-Name: 73c904e57a158820705daf5737e0fc825cfe1aea
2003-02-16 22:36:03 +00:00
drh 94e9203247 Added test code to check for file descriptor leaks. All regression tests pass
now on both win2k and linux. (CVS 868)

FossilOrigin-Name: 75ba78280f7ab6b6acce5878859312f3223ee898
2003-02-16 22:21:32 +00:00
drh 99ee360003 Fix more bugs. The new rollback journal implementation now passes all
regression tests under Linux. (CVS 867)

FossilOrigin-Name: d10adc1c5727d76320d5919be55e86d030e9c8bc
2003-02-16 19:13:36 +00:00
drh 4303feedd3 Fix the pager so that correct rollbacks occur when synchronous is turned off.
This check-in also included unrelated documentation updates. (CVS 866)

FossilOrigin-Name: 3ef0ad8a4f2696a58aff9d812f90038c2c63f3fc
2003-02-15 23:09:17 +00:00
drh 32c4a833e0 Update the documentation for the new journal format to be introduced in
version 2.8.0. (CVS 1729)

FossilOrigin-Name: dc53d92141c931fb133149355c3a1ea64030e676
2003-02-13 02:54:03 +00:00
drh 5527f8ff4a Update the documentation for the new journal format to be introduced in
version 2.8.0. (CVS 865)

FossilOrigin-Name: e05a7a552f694158ee449d8682f5c137f1c2f2ac
2003-02-13 02:54:03 +00:00
drh 4a0681ef1b Fix a bug in the rollback logic for the new journal format. (CVS 864)
FossilOrigin-Name: 7c22aa3f817e737cfd943d903856756468e8678b
2003-02-13 01:58:20 +00:00
drh 8ba1b31379 Added the new FULL option to the SYNCHRONOUS pragma. Still need to test it. (CVS 1728)
FossilOrigin-Name: 8968bc063607856775ad63b6594d40c55cf288c0
2003-02-12 14:09:43 +00:00
drh 973b6e333d Added the new FULL option to the SYNCHRONOUS pragma. Still need to test it. (CVS 863)
FossilOrigin-Name: 792a9e157dd066fcaffd4f5b373010151fb4ca61
2003-02-12 14:09:42 +00:00
drh d8d66e8ca0 Fix a bug in the legacy journal format writing logic. (CVS 862)
FossilOrigin-Name: 6c927dd36c19ebb8bb8222b4d18ed67f4fe733e8
2003-02-12 02:10:15 +00:00
drh 968af52acf Modify the journal format to be more robust against garbage that might appear
in the file after a power failure.  The changes are mostly working but more
testing is still required.  This check-in is to checkpoint the changes so far. (CVS 861)

FossilOrigin-Name: 8ec5632536eea31197a3b1fd6abc57881a0cf1d7
2003-02-11 14:55:40 +00:00
drh 324ccefeb5 Make the shell run much faster for inputs where a single SQL statement spans
thousands of lines by avoiding the call to sqlite_complete() unless the
input ends in a semicolon. (CVS 860)

FossilOrigin-Name: e21afb82b53eade9ee267a97c58db0606f0c0a41
2003-02-05 14:06:20 +00:00
drh bb999ef6fa Make the GROUP BY clause work even if there are no aggregate functions. (CVS 859)
FossilOrigin-Name: b68792315883eed8523f5e11856ec8378dc972c1
2003-02-02 12:41:25 +00:00
drh 17e9e29d1e When a CREATE TABLE ... AS SELECT statement fails, make sure the table name
is removed from the internal hash tables.  Ticket #238. (CVS 858)

FossilOrigin-Name: 65264780c553e8a00ec7a40cf76b89a11b245faf
2003-02-01 13:53:28 +00:00
drh dcd997ea2e The sqlite_exec() function now returns SQLITE_AUTH when authorization fails.
Ticket #231. (CVS 857)

FossilOrigin-Name: d93c1aeb544a5b1056424945eb43854213b30e50
2003-01-31 17:21:49 +00:00
drh 88eee38afd Allow double-quoted strings as string constants in the IN operator. As a
side-efffect, allow the GROUP BY clause to refer to columns by their integer
column number.  Ticket #237. (CVS 856)

FossilOrigin-Name: 187d9c405891e543fc706f8ddb41f3966a842214
2003-01-31 17:16:36 +00:00
drh 3a84069da3 Additional testing and bug fixing with the non-callback API. Updated the
C/C++ interface document to describe the non-callback API. (CVS 855)

FossilOrigin-Name: af1e9299468aa70d7d91e7a5445ba391ccc8ff8b
2003-01-29 22:58:26 +00:00
drh 483750ba8a Better error messages on constraint violations. Additional tests and bug fixes
for the callback-free API. (CVS 854)

FossilOrigin-Name: ccc82f1ab4539a60ee5cc2625743c5389f9ccd8e
2003-01-29 18:46:51 +00:00
drh 326dce7451 The callback-free API is now working, though much more testing is need. (CVS 853)
FossilOrigin-Name: 162b259188e6967fe9c3722da26b81aab5655d83
2003-01-29 14:06:07 +00:00
drh b86ccfb26e First code for the new callback-free API. All regression tests pass but the
new API is mostly untested and is unlikely to work. (CVS 852)

FossilOrigin-Name: 065fa818ffc8d7562889172acea16e4e44e773ef
2003-01-28 23:13:10 +00:00
jplyon 70c15b48ae Added section on comments.
Corrected broken </p> end tags. (CVS 851)

FossilOrigin-Name: c957f4f0c6b486f25bc567dafeed186f91c8c315
2003-01-26 15:28:18 +00:00
drh 79740a572e Version 2.7.6 (CVS 850)
FossilOrigin-Name: bdba796f3b89690ab5d53a9e16924383ef72657c
2003-01-25 16:32:13 +00:00
drh a218b6a22a Fix a bug in the rollback validation logic (code that only runs during
debugging).  The problem was introduced by check-in (835). (CVS 849)

FossilOrigin-Name: b6ea0da76a27a4a67a3978c53405840518de2379
2003-01-25 15:43:22 +00:00
drh a3da6fafd7 Remove an unused variable. (CVS 848)
FossilOrigin-Name: 18f4ffaa2ed89784a1ea3c61c864d20e18fa1e9f
2003-01-25 14:34:23 +00:00
drh 2ac83073e0 Preparations for the release of version 2.7.6. (CVS 847)
FossilOrigin-Name: 5143d4814df1dd440a362a90dd3f328c84527565
2003-01-25 14:32:03 +00:00
drh ced87a65a8 Update the speed.html documentation. Recent optimizations have made the
library much faster. (CVS 846)

FossilOrigin-Name: ed47d162a072a2f98b633cc14f2be1474288d90b
2003-01-25 14:25:42 +00:00
drh d62d3d0d24 Add asserts to btree.c that check for the correct size of various typedefs
and structures.  Ticket #233. (CVS 845)

FossilOrigin-Name: c7e647d011b086a6e57420850f6bc4f28fcb23ee
2003-01-24 12:14:20 +00:00
drh 2554f8b0c0 Minor refinements to the pager. (CVS 844)
FossilOrigin-Name: 19221dee5fee4c8800cbae309f009964c8d646a2
2003-01-22 01:26:44 +00:00
drh 4764f161ab fix a typo on the quickstart.html page. (CVS 843)
FossilOrigin-Name: 61869bb51b981a47d783cc8739833cc0c4733b0a
2003-01-21 23:06:57 +00:00
drh 341eae8d35 In the pager, cache a pointer to the first page on the freelist that does not
need to be synced.  This makes a fetch of a page that is not in cache go a
lot faster when the cache is full.  This check-in also adds some performance
instrumentation to the OS layer. (CVS 842)

FossilOrigin-Name: 00f08fc0b5b6b9c5efbf15a62f9a1cc1cfa71283
2003-01-21 02:39:36 +00:00
drh e78e8284ad Update comments. No changes to code. (CVS 841)
FossilOrigin-Name: f6a8706872c43cee3003b48bb427c7b74b1f89e7
2003-01-19 03:59:45 +00:00
drh 79104c9d2a Update the speed comparison page. (CVS 840)
FossilOrigin-Name: 424cb2edb0c51b911791422ce7a9f5284a57f9ce
2003-01-18 22:01:06 +00:00
drh fcb78a4900 Fix datatype reporting and collating sequence selection so that it works
correctly on views and with the UNION, EXCEPT, and INTERCEPT operators. (CVS 839)

FossilOrigin-Name: 71cc292dce59cf8224b205d1cdbff59ad12f1043
2003-01-18 20:11:05 +00:00
drh be4f31c226 Do not report an error if the input to the sqlite shell ends in a comment.
Ticket #211. (CVS 838)

FossilOrigin-Name: 32a8e6e9771d636c0ad3042632d35865bc08585b
2003-01-18 17:05:00 +00:00
drh 799550beb0 Check the validity of the database connection before the trace callback,
not afterwards. (CVS 837)

FossilOrigin-Name: 960a2e4af3b940d74a82f98e8bf19aeec88a05ce
2003-01-18 17:04:08 +00:00
drh 18de4824f6 Add the sqlite_trace() hook for tracing the SQL that an application executes.
The plan is to leave this API undocumented for the time being, in case we
want to make changes to it later. (CVS 836)

FossilOrigin-Name: f67bff8ff3db9694f87daf1a549d24ea9612da6b
2003-01-16 16:28:53 +00:00
drh db48ee02c4 Improvements to the pager to help large updates against a large database run
faster.  Also improved the testing of the pager rollback algorithms. (CVS 835)

FossilOrigin-Name: 717523d3750dce784fa767ed9a8267d1246798ef
2003-01-16 13:42:43 +00:00
drh 2c3831cb23 Finish out the test suite for the new sqlite_set_authorizer API. (CVS 834)
FossilOrigin-Name: 701a73918db22fd134a8b959670ba7a4a908c8c5
2003-01-14 13:48:20 +00:00
drh bf0c78af2f Fix a memory leak in the PRAGMA authorization code. (CVS 833)
FossilOrigin-Name: ba58979f2ff3ec878a21e7c171fbcd8fa79ace6f
2003-01-14 02:54:08 +00:00
drh 77ad4e4133 More tests of the sqlite_set_authorizer() API together with fixes for bugs
that the new tests uncovered. (CVS 832)

FossilOrigin-Name: cc2ae781ac186f9ee1afacdc9117087421955369
2003-01-14 02:49:27 +00:00
drh 7160220495 Make the GLOB work write with upper-case characters. Ticket #226. (CVS 831)
FossilOrigin-Name: 7ea46e706485cc159f9d1c7e69efcdd048a0bb12
2003-01-14 00:44:08 +00:00
drh e5f9c6442f Revise the sqlite_set_authorizer API to provide more detailed information
about the SQL statement being authorized.  Only partially tested so far. (CVS 830)

FossilOrigin-Name: 45de93f913a18026a45de6254963dbcd1b0f1a19
2003-01-13 23:27:31 +00:00
drh 1962bda764 The initial round of tests for the sqlite_set_authorizer() API. More are
needed before release.  Ticket #215. (CVS 829)

FossilOrigin-Name: 5707b3d56efb6e988f816abefb1836f2f3254117
2003-01-12 19:33:52 +00:00
drh e6d01c3a04 Forgot to include the new "auth.c" source file in the previous checkin. (CVS 828)
FossilOrigin-Name: 7601916419489879fe963c83010b452c49ef063f
2003-01-12 18:07:48 +00:00
drh ed6c8671b3 Initial check-in of the code for the new sqlite_set_authorizer() API function.
The code is mostly untested at this point. (CVS 827)

FossilOrigin-Name: 52d5007f64d0af5286b2a0e1f0b9e53c86bece3f
2003-01-12 18:02:16 +00:00
drh 49f0936ec7 Remove an unused variable from the VDBE. Ticket #223. (CVS 826)
FossilOrigin-Name: 0deaf563fd9784bf0795107cd10e6b3269dfecea
2003-01-12 17:35:00 +00:00
drh f27134cdc4 Change the PopStack() routine so that it doesn't confuse bounds checkers.
Ticket #222. (CVS 825)

FossilOrigin-Name: fc11fa50b8f39f5e0b3674d7df832ffbca0d948f
2003-01-12 17:28:19 +00:00
drh fa9e0df21b Remove the aOrder() array from where.c. (CVS 824)
FossilOrigin-Name: b2c1edb47f481cafe6718bafcdb517cca160a44d
2003-01-11 15:02:44 +00:00
drh fd15981daa Fix two compiler warnings from OS-X. (CVS 823)
FossilOrigin-Name: 4c22da76ca91f3c59dac1c529e82ac3b04b767bd
2003-01-11 14:25:39 +00:00
drh 5a38705ecb Document the SHOW_DATATYPES pragma and add tests for it to the test suite.
Make sure datatypes are show even for aliased columns.
Tickets #220 and #221. (CVS 822)

FossilOrigin-Name: e84d3afe7b9153d003fdcca98221f446c004ffa2
2003-01-11 14:19:51 +00:00
drh 836faa4843 Remove the ColumnCount opcode, which had become a no-op. (CVS 821)
FossilOrigin-Name: 86deb12d68026913d181f9498144fa56445899f2
2003-01-11 13:30:57 +00:00
drh 820f3812d8 Port ot MacOS Classic. Ticket #218. (CVS 820)
FossilOrigin-Name: 13f82d67f60ae869d5bf2e31d9357a860aa62bad
2003-01-08 13:02:52 +00:00
drh 9bd47a97c0 Avoid calling truncate() and stat() on the checkpoint journal to improve the
speed of a large number of UPDATEs within a transaction. (CVS 819)

FossilOrigin-Name: 2f89e9e6963cb715f3671f1fdbf4c966aadff6c8
2003-01-07 14:46:08 +00:00
drh 2b8ef743af In the VDBE, allocate space to hold column names when the VDBE first starts.
The ColumnCount opcode now just writes the null terminator into this space. (CVS 818)

FossilOrigin-Name: 46d8f5e377bf790c18a7acdd1f3bc20b538d69eb
2003-01-07 13:55:22 +00:00
drh 371ac44d1c When constructing records and index keys, use static string space rather than
mallocing (when possible) for a small speed improvement. (CVS 817)

FossilOrigin-Name: 657c9fb5133aef93e4edd433912e6942ad9674ec
2003-01-07 13:43:45 +00:00
drh caec2f12a9 More optimizations. (CVS 816)
FossilOrigin-Name: a362981b20fd33254ad498619eedf75b576682e3
2003-01-07 02:47:47 +00:00
drh 32eb7b47ca Optimizations to the tokenizer. (CVS 815)
FossilOrigin-Name: 032b3daa1d3cf3e00a4a6ba0b09624f1aba6445c
2003-01-07 01:44:37 +00:00
drh 3e87c7abeb Remove unnecessary code from the VDBE. (CVS 814)
FossilOrigin-Name: b96ec281ff29aad8af340b30c6ff4e129ffeeefb
2003-01-06 23:54:05 +00:00
drh 8178a75a11 More optimizations. (CVS 813)
FossilOrigin-Name: 5809132f5bf40bae2331f887e87fe5baecc15c46
2003-01-05 21:41:40 +00:00
drh c3b7057705 Parameterize the number of adjacent pages that participate in the balancing
algorithm in the BTree.  But leave the setting at the current value of 3. (CVS 812)

FossilOrigin-Name: 6c304024bbd21a1886a57ada795531349aa627d7
2003-01-04 19:44:07 +00:00
drh bb49aba82a Another optimization to the btree logic. (CVS 811)
FossilOrigin-Name: 03d20673616cae0dca524fd04557798a98fb7069
2003-01-04 18:53:27 +00:00
drh 428ae8cb41 Optimizations to the BTree module for a modest speed improvement. (CVS 810)
FossilOrigin-Name: 39902a70417475225956704a037493515e9b08b9
2003-01-04 16:48:09 +00:00
drh 2c79995565 Allow the rollback journal to be empty except for its header.
Ticket #212. (CVS 809)

FossilOrigin-Name: 1ba41bc2afab18cc295d9a45845296b46bfa57e5
2003-01-03 02:04:27 +00:00
drh 8c1238aebd Code optimizations to help the library run faster. (CVS 808)
FossilOrigin-Name: db745e87dc26cf1a35cdcec18f4b659742e14120
2003-01-02 14:43:55 +00:00
drh 7b39686749 If compiled with the -DVDBE_PROFILE=1 option, special code is inserted that
uses the pentium RDTSC instruction to compute very precise runtimes on all
VDBE opcodes.  (This only works on i586 processors, of course.)  The results
are written into the vdbe_profile.out file for analysis. Hopefully, this
new feature will reveal hot spots that can be optimized to make the VDBE run
faster. (CVS 807)

FossilOrigin-Name: a1c071ea18766932c90275c704e078134c67be68
2003-01-01 23:06:20 +00:00
drh c64e0ba45c Version 2.7.5 (CVS 806)
FossilOrigin-Name: ee95eefe12c48f28412461125c231122e0d4277a
2002-12-28 01:26:07 +00:00
drh 919792ecb9 Update the version number to 2.7.5. (CVS 805)
FossilOrigin-Name: b0864cc9c89a3c2350ac46634ef3c420f97d11c0
2002-12-28 01:10:14 +00:00
drh 80eb79055e Fix an uninitialized variable in the pager. Tickets #208 and #206.
Bug introduced by check-in (795). (CVS 804)

FossilOrigin-Name: f3dc686e0258a9588e1433a89ac46795f76beeae
2002-12-28 01:06:30 +00:00
drh 5d1f0d4c89 Version 2.7.4 (CVS 803)
FossilOrigin-Name: 0224db6f8ce5e3cecc4432f3966b8f59f80e9303
2002-12-17 22:50:45 +00:00
drh 3450e1d3c2 Preparing for the 2.7.4 release. (CVS 802)
FossilOrigin-Name: f685ae15b1179baeadfadbaef0a73b001c96fac5
2002-12-17 14:30:42 +00:00
drh f1337bb5ff If the "fake_big_file" command fails, be sure to close the file before
returning. (CVS 801)

FossilOrigin-Name: fa1b5e2119617b111c6b463bbf641ddcb9972cae
2002-12-17 14:19:49 +00:00
drh f33cb428e5 Make sure the host machine has enough disk space before running the
large file tests. (CVS 800)

FossilOrigin-Name: b1ec547865a76541951433630bd4528d1988a4de
2002-12-17 14:13:48 +00:00
drh e7e8bc7739 Take care not to modify the sqlite* pointer to sqlite_exec() if we suspect
that the pointer is stale - that it has previously been passed to
sqlite_close().  Possible fix for ticket #202.  Prior to this fix, test
misuse-5.3 was causing a change to a buffer that had been previously free()-ed. (CVS 799)

FossilOrigin-Name: f04547edfa1643ce52925d317915badfc676bd8b
2002-12-17 13:05:25 +00:00
drh 3e7a609667 Save the full pathname of the database file so that journalling still works
even if the user changes working directories after opening the databae.
Ticket #200. (CVS 798)

FossilOrigin-Name: 1c58b4fc032c5975dcce9b8ae844c0e516254a17
2002-12-07 21:45:14 +00:00
drh 1a844c380b Fix a bug in the reverse scan logic that comes up when the table being
scanned is empty.  Add additional tests for the reverse scan. (CVS 797)

FossilOrigin-Name: 0051c87d5e8d07fae09da2eb7b0d8cbd1bbd3c8e
2002-12-04 22:29:28 +00:00
drh dd4852c3d1 Fixes to the logic that decides if the ORDER BY can be ignored due to the
use of an index.  Tests updated. (CVS 796)

FossilOrigin-Name: bfb9a2aa939ecffc5dc2c7c23bddd57d357bdf13
2002-12-04 21:50:16 +00:00
drh c045ec51be Scan the table backwards if there is an ORDER BY ... DESC clause that can
be satisfied by an index. (CVS 795)

FossilOrigin-Name: c7a3487981de0ed5b43ea3ff4d46ab4437068dca
2002-12-04 20:01:06 +00:00
drh 2dcc9aa2a8 Add the sqliteBtreePrevious() routine to the BTree module API. This is
in anticipation of implementing reverse order searching of a table. (CVS 794)

FossilOrigin-Name: 0ad1d93879bee0d34b122591c025192a51b8490f
2002-12-04 13:40:25 +00:00
drh c66c5a266b Allow an aggregate function in the HAVING clause even if no aggregates appear
in the result set.  Ticket #187. (CVS 793)

FossilOrigin-Name: 33c6fd6b3dc271fa1f2d4500b4f76c736accefce
2002-12-03 02:34:49 +00:00
drh 174b619591 Honor ORDER BY clauses in VIEWs. Ticket #193. (CVS 792)
FossilOrigin-Name: dbf7893234a6c5d6bb2d931e52080bb05784c0c9
2002-12-03 02:22:52 +00:00
drh da47d7748f Change to the pager to avoid opening journal files unnecessarily. This can
sometimes results in a significant speed improvement. (CVS 791)

FossilOrigin-Name: fa5c042585c601449ede7319d0c5993cd8ba75a4
2002-12-02 04:25:19 +00:00
drh d0d006e29c Fixed large file support under Linux. I'm unable to test under Windows.
Ticket #191. (CVS 790)

FossilOrigin-Name: 9864a1265b5a37c12b0dd8446d81b84c5a3acc43
2002-12-01 02:00:57 +00:00
drh 86bc1c8273 Add the "space_used.tcl" script to the tools directory. This script is used
to measure how much disk space is used by each table and index of a database. (CVS 789)

FossilOrigin-Name: 83b2c27a568cd67cd5162d513766b23ff9fc2227
2002-11-24 14:52:27 +00:00
drh 58f391b36f Automatically determine if pointers are 4 or 8 bytes in size during the
compilation process.  Ticket #190. (CVS 788)

FossilOrigin-Name: dd5396a73a782b6abe9da3de43a5ee11e0dddbb2
2002-11-20 11:55:18 +00:00
drh 7cdbd32c8e Get the new large file code working with the Borland compiler. Ticket #195. (CVS 787)
FossilOrigin-Name: da4a79e2891aa81e2e6d96689f99b3924f940dd5
2002-11-20 11:07:59 +00:00
drh 7d686b2d57 Remove extra </TD> from HTML output. Ticket #189. (CVS 786)
FossilOrigin-Name: dc5d9c129c566bf57d108b824ba486cfe070dda6
2002-11-11 13:56:47 +00:00
drh 4d9ef4c4ef Back out the changes in the pager that sorted pages prior to writing them
to the database.  Additional measurements showed no performance gains. (CVS 785)

FossilOrigin-Name: 745d66395daf5cb8463305bbc9e4219534d2b7cf
2002-11-11 01:04:47 +00:00
drh 32c05e993f Replace the atoi() library routine with a faster home-grown version in the
VDBE.  This gives a dramatic speed improvement for some kinds of queries. (CVS 784)

FossilOrigin-Name: 263a8ca40f7ff66fbdcb43bf9032391d5b1e68bd
2002-11-11 00:05:42 +00:00
drh 03eb96a7b2 Two optimizations to the pager: (1) Write dirty pages back to the database
file in order and (2) Keep a separate list of in-memory pages that are in
the checkpoint journal in order to speed a checkpoint commit. (CVS 783)

FossilOrigin-Name: a6ef6657a4377684dc2fce7be2bbf009fd2d2f37
2002-11-10 23:32:56 +00:00
drh 8766c34348 Try to better detect when the library is compiled for large file support (LFS)
but the support is not available in the host OS kernel. (CVS 782)

FossilOrigin-Name: a29d60ecc5ee3f535142a81f56eecbef7875ef22
2002-11-09 00:33:15 +00:00
drh 829e802992 Add large file support to Windows. Change large file support for Unix so
that it compiles automatically - without requiring special options on the
compiler command line. (CVS 781)

FossilOrigin-Name: 2008b56fe11e49d52e28f47d14ccd70504e6c094
2002-11-06 14:08:11 +00:00
drh 20e9ab16d8 Changes to include files so that the >2GB file patch will compile under BSD. (CVS 780)
FossilOrigin-Name: 81bb1aed5e9094a9655bd03614bb111d79896928
2002-11-06 00:59:44 +00:00
drh f87e9de4c4 Update the FAQ to explain how to enable large file support. (CVS 779)
FossilOrigin-Name: 4caf624e9061fe7489a8e3c6892975036a2272d5
2002-11-05 23:24:38 +00:00
drh 28be87c7c4 Add support for databases larger than 2GB under Unix. Must be compiled
with -D_FILE_OFFSET_BITS=64 and -D_LARGEFILE_SOURCE in order to work with
larger databases. (CVS 778)

FossilOrigin-Name: a3f67fe9121ca4655510094fe775b8603a87800e
2002-11-05 23:03:02 +00:00
drh 647cb0e159 Add the sqlite_version() SQL function as a built-in. (CVS 777)
FossilOrigin-Name: 7c8c0e7633dca00bde7bc7c22075f688c034c200
2002-11-04 19:32:25 +00:00
drh 7bc09d3111 Improvements in threadtest.c (for Unix) and some minor bug fixes that result
from the better testing. (CVS 776)

FossilOrigin-Name: 326e0983c34b584a3c4a2300399bff0a8281b9f8
2002-11-01 01:55:36 +00:00
drh 194a7b6469 Version 2.7.3 (CVS 775)
FossilOrigin-Name: 4051dbdb0552620eaff2ccef02f64a2ff97a8dfb
2002-10-31 00:15:10 +00:00
drh 1f3e905cd0 Fix an assert that might fail if malloc() fails. (CVS 774)
FossilOrigin-Name: 8ad018944c3aa8f58e1c68b1fa634ef922d6476f
2002-10-31 00:09:39 +00:00
drh bd1edfa321 Bump the version number prior to the release of version 2.7.3. (CVS 773)
FossilOrigin-Name: bc7c7d87e550c786d5bdb4169a0ad75db3fb066a
2002-10-30 23:04:27 +00:00
drh 38dd0b4ff0 In the VDBE, check to make sure a set has been initialized before using it.
Ticket #185. (CVS 772)

FossilOrigin-Name: 8c4cbdd05517e91879a0f2c4559d0f0518d2385b
2002-10-30 22:42:58 +00:00
drh 1f16230b5c Minimal support for oracle8 outer join syntax. (CVS 771)
FossilOrigin-Name: 31df3690d0fe4bd4a293cbe8ca9a26c98c3ed3ce
2002-10-27 19:35:33 +00:00
drh 6977fea801 Correctly handle column names and string constants in parentheses.
Fix for ticket #179. (CVS 770)

FossilOrigin-Name: 3b68aa25c451b7c09ece457ac2b70a9a5d93508a
2002-10-22 23:38:04 +00:00
drh e958bb4aef Take care to track ephemeral strings in the VDBE and make copies of ephemeral
strings that need to be preserved.  Ticket #177. (CVS 769)

FossilOrigin-Name: 562da534bbb605a8ce15824135b012ef2d86bbeb
2002-10-22 15:04:34 +00:00
drh edbbbdf8f7 Rework the changes for ticket #176 (check-ins (760) and (761)) to be
more consistent with the rest of the source code. (CVS 768)

FossilOrigin-Name: f50a177b4239bc7a83563ac9361e830ec04e81fb
2002-10-20 18:19:45 +00:00
drh 3c2007a546 The "table_info" pragma reports unspecified column types as "numeric" instead
of "text".  Fix for ticket #174. (CVS 767)

FossilOrigin-Name: 395ab5fac201a37d6eca833ffd6f58ac8a0121a2
2002-10-20 16:00:27 +00:00
drh 275ed72c9b Export the sqlite_function_type function from windows DLLs. Ticket #173. (CVS 766)
FossilOrigin-Name: d5470dfe102ef9b1dac3b15a2f5cc225e3c26129
2002-10-20 15:55:01 +00:00
drh 315555ca50 Work around a bug in the Borland C compiler. Ticket #172. (CVS 765)
FossilOrigin-Name: 3ef2925650bfbeb4ee5dbd0aaf8e606fc4cd2be1
2002-10-20 15:53:03 +00:00
drh 2678058853 Make sure malloc(0) always returns NULL. Fix for ticket #171. (CVS 764)
FossilOrigin-Name: 4622b7ce8f4727a6405ddf4f0af701db86da86bf
2002-10-20 15:46:22 +00:00
drh 32fbe342db Speed improvement by avoiding a call to sqliteBtreeLast() when inserting a
new row into a table. (CVS 763)

FossilOrigin-Name: d0af59fe6b9d5d026786e7cce1c49c208a0335cc
2002-10-19 20:16:37 +00:00
drh 906bf2a316 Fix the URL for pointing to MinGW on the homepage. (CVS 762)
FossilOrigin-Name: 16aad98aad4d8dd4a8400cdee32004b8c4785d60
2002-10-19 20:13:51 +00:00
mike 16aaf451b7 Minor coding fix in getting the windows platform version, when multithreading (CVS 761)
FossilOrigin-Name: b53ab71d074ada47ce22bd161f6aee24587302af
2002-10-17 09:01:31 +00:00
mike 710dcfbde5 fix for locking in Windows (CVS 760)
FossilOrigin-Name: 83add34f64895a4b465881213eba82f3b1f5c964
2002-10-17 00:38:54 +00:00
drh f1f0fa0769 Remove the call to srand() and add better comments to the sqliteOsRandomSeed()
routine.  Ticket #163. (CVS 759)

FossilOrigin-Name: d87a886d8f63f54466848151e2b0e8565b338593
2002-10-12 13:43:59 +00:00
drh c8f8b632c3 Fix a bug in the left outer join logic. (CVS 758)
FossilOrigin-Name: 6c0f44bd6374010f7a4a091e585eb36e0665f96f
2002-09-30 12:36:26 +00:00
drh 294fb92b50 Fix an uninitialized variable that could cause problems when comparing
two NULLs. (CVS 757)

FossilOrigin-Name: 015425001813971f6d4c97c18d64c7f14fa1955f
2002-09-30 01:31:21 +00:00
drh c4ca897b9a Version 2.7.2 (CVS 756)
FossilOrigin-Name: 59ba43449a53fb32e2dd4259285af8b4206c298a
2002-09-25 19:50:17 +00:00
drh d042ddb31b Bump the version number to 2.7.2. (CVS 755)
FossilOrigin-Name: a164528e8c6df3569ab178a3b737744dcccb64e7
2002-09-25 19:26:59 +00:00
drh a226d05408 Bug fix: When multiple SQL statements were passed into a single sqlite_exec() call, execution speed would decrease for each statement executed because VDBE cursors were not being reused. Now the cursors are reused and execution time is linear. (CVS 754)
FossilOrigin-Name: b0d27a377a9f6134f81108fe45c8c868ab4d4411
2002-09-25 19:04:07 +00:00
drh df68f6b768 Make sure memory malloced() for structures is aligned on an even byte boundry.
Solaris segfaults otherwise. (CVS 753)

FossilOrigin-Name: 14ebe30bf5937effdc388e23e998ba1a34fb0a29
2002-09-21 15:57:57 +00:00
drh 3e56c04c4e Fix a bug in the OP_MemStore operator of the VDBE. A realloc() might
occur but pointer to the old buffer were not being moved over to
the new buffer. (CVS 752)

FossilOrigin-Name: 29145746f34438bd830c763872c5e82572150357
2002-09-17 03:20:46 +00:00
drh 995d71b715 Modify the sqlite_encode_binary() routine to return the strlen() of the
encoded string.  Also fix a bug that occurs when attempting to encode
a zero-length buffer. (CVS 751)

FossilOrigin-Name: f12c3a25ba5408c2a7c846a9f160416fd188cd26
2002-09-16 11:44:05 +00:00
drh cabb081971 Do not put a write lock on the main database file when writing to a temporary
table. (CVS 750)

FossilOrigin-Name: 3f253afe15d4f7392555f340a41d780d1248087f
2002-09-14 13:47:32 +00:00
drh 41a3bd0a01 Rename all tests so that the first part of the test name corresponds to the
file that contains that test.  This makes it much easier to find a particular
test after it fail. (CVS 749)

FossilOrigin-Name: 6cb80ae10af60863cc25c22a6442ba1d43b7409c
2002-09-14 12:04:56 +00:00
drh 6eba16f3d7 Update the SQL language documentation to talk about SELECT DISTINCT. (CVS 748)
FossilOrigin-Name: ef7116751ddc4e82228c115b0a332ffb47a22ae5
2002-09-12 14:08:32 +00:00
drh ac82fcf5f0 Fix for ticket #147: Honor the ORDER BY and LIMIT clauses in a SELECT even
if the destination of that SELECT is a subroutine call. (CVS 747)

FossilOrigin-Name: 23fe36c7e88282f6d1b7547ab892ea88f0e65262
2002-09-08 17:23:41 +00:00
drh 85a1c4a609 Modify the build process so that the VDBE opcode numbers and the table
that contains the opcode names are both automatically generated. This makes
it much easier to create new VDBE opcodes. (CVS 1727)

FossilOrigin-Name: c4f0bb02387a6e6f254320e1e5eef3d5d8a3c538
2002-09-08 00:04:54 +00:00
drh 8f619ccd3c Modify the build process so that the VDBE opcode numbers and the table
that contains the opcode names are both automatically generated. This makes
it much easier to create new VDBE opcodes. (CVS 746)

FossilOrigin-Name: eb54d455b0325d3be96daf6c220c4ee3e0da1a85
2002-09-08 00:04:50 +00:00
drh 8c90ebb0e2 Fix a memory leak that occurred when sqlite_open() failed. (CVS 745)
FossilOrigin-Name: a876021304a5de7ede1bf835971da7e328d1af07
2002-09-05 23:21:37 +00:00
drh 96ddd6db58 Rewind the checkpoint journal after each statement to avoid allowing
the file to become too large. (CVS 744)

FossilOrigin-Name: f4288520dfd1587446e50fa7ef23f75f6f63a7cf
2002-09-05 19:10:33 +00:00
drh 4e371ee41c Fix for ticket #146: Correctly handle reads of unused disk blocks at the
end of the file. (CVS 743)

FossilOrigin-Name: f5c2654768a6201fc554b59f1b2f56bcce738bc4
2002-09-05 16:08:27 +00:00
drh b798fa6481 Always fill in the 5th parameter to sqlite_exec if there is an error. (CVS 742)
FossilOrigin-Name: 7f8fd5c75d614f81ef87f0fc952c341cbc5076d0
2002-09-03 19:43:23 +00:00
drh 96f4531077 Add documentation on NULL handling in SQLite versus other SQL database
engines. (CVS 741)

FossilOrigin-Name: dd8867fc479891ed8fa36c5cf2359e49c6754a8c
2002-09-02 14:11:02 +00:00
drh 0e1cfb8574 Detect when the test scripts are being run as root and issue an appropriate
error message. (CVS 740)

FossilOrigin-Name: 9ca2c507704f85446d873d5e8429554f2ad4df9e
2002-09-02 12:14:50 +00:00
drh f74b8d9b89 Relax the locking requirements on BTree cursors. Any number of read and
write cursors can be open at the same time now, but a write cannot occur
as long as one or more read cursors are open.

Before this change, one or more read cursors could be open on a table,
or a single write cursor, but not both.  Both policies have the same
desirable effect: they prevent writes to a table while a sequential scan
of that table is underway.  But the new policy is a little less restrictive.
Both policies prevent an UPDATE from occurring inside a SELECT (which is
what we want) but the new policy allows a SELECT to occur inside an
UPDATE. (CVS 739)

FossilOrigin-Name: 8c2a0836980341faa479cfe6c716409e6057367d
2002-09-01 23:20:45 +00:00
drh c2eef3b32b Parse foreign key constraints and populate internal data structures
appropriately.  Constraints are still not enforced. (CVS 738)

FossilOrigin-Name: 170711ca65dc894d0486b9d575edb8f1708250fb
2002-08-31 18:53:06 +00:00
drh b680a344e5 Version 2.7.1 (CVS 737)
FossilOrigin-Name: 5f51e13d56a58d7c263043cae9898d796017a369
2002-08-31 17:02:43 +00:00
drh 56cdb3b237 Change the version number for release 2.7.1. (CVS 736)
FossilOrigin-Name: b7f788fcc4a26ae42196a209d2e94672321dc154
2002-08-31 17:02:25 +00:00
drh df01cdf9b0 Initial checking of two new test files: format3.test and memleak.test. (CVS 735)
FossilOrigin-Name: 6ffedb90a6478af6548db5298368eeca2b708cdc
2002-08-31 16:52:44 +00:00
drh b7dadd4d85 Fix for ticket #145: Include the func.c source file in the build of testfixture
so that the "randstr()" function will be available. (CVS 734)

FossilOrigin-Name: c5e0c6a782aedc4a273aaf8bc2ef60918797e5f1
2002-08-31 16:33:25 +00:00
drh 1e0ccab9f0 If the database is locked when sqlite_open() is called, sqlite_exec() should
still honor the busy callback and should return an error message together
with the SQLITE_BUSY result code. (CVS 733)

FossilOrigin-Name: 78a0229a7e5e33fe642847381f5514e6ec30f29f
2002-08-29 23:59:47 +00:00
drh 142e30df99 Slightly faster INSERTs from a SELECT by avoiding an intermediate table.
But it didn't make nearly as much difference as I had hoped. (CVS 732)

FossilOrigin-Name: 723362e74f79c784314d042e3a8c8a9bf07cbd5e
2002-08-28 03:00:58 +00:00
drh 66105a8ea0 Change the tokenizer to ignore C-style comments /*...*/ in accordance with
SQL99. (CVS 731)

FossilOrigin-Name: f1534489484afdb835ad8e6f97909fbe76dbe414
2002-08-27 14:28:29 +00:00
drh da30d3696b Fix for ticket #142: Make sure we get the correct sort order even when the
columns being sorted contain NULLs. (CVS 730)

FossilOrigin-Name: 45847390d007718a4b7a4e9fa445136d013113f8
2002-08-26 19:55:07 +00:00
drh d2df27e41d Version 2.7.0 (CVS 729)
FossilOrigin-Name: 9e341d9c934c2111be6834743f1ce30463b095b6
2002-08-25 20:58:11 +00:00
drh 305f99a0fb Documentation updates prior to the releae of 2.7.0. (CVS 728)
FossilOrigin-Name: e2d95f85a3c4beeb5f8e78498f52fc00475f38ed
2002-08-25 20:11:18 +00:00
drh 8c74a8ca5b Fix for ticket #136: Added the OP_RenameCursor VDBE instruction and used it
to make cursor numbers right on nested subqueries.  Also added OP_Gosub and
OP_Return but have not actually used them for anything yet. (CVS 727)

FossilOrigin-Name: c602603e7cd8dc5c8bb9db2748eacab650de5bf0
2002-08-25 19:20:40 +00:00
drh d94a669894 Fix the memory leak introduced by check-in (725). (CVS 726)
FossilOrigin-Name: b957dafc26383af514795df18bc7b8f367c9bd21
2002-08-25 18:29:11 +00:00
drh 4b59ab5e64 Change the way token memory is allocated in an effort to fix ticket #136.
There is now a memory leak when using views of views. (CVS 725)

FossilOrigin-Name: 22d8726e61eec0e53893f492cb2163824b87a23e
2002-08-24 18:24:51 +00:00
jadams 79983d03e8 Fix for ticket #138: Makefile doesn't use exec_prefix, has some install problems (CVS 724)
FossilOrigin-Name: 97fc4a71a12b52cda67b5192c3bd7bd10ac0c7a6
2002-08-22 18:18:35 +00:00
drh bd842babb5 Fix for ticket #137: Use getpwuid() instead of getpwent(). (CVS 723)
FossilOrigin-Name: ea011990c552a7a6019b63f9b4341ad6c8663479
2002-08-21 11:26:41 +00:00
drh f04d5081a7 This COLLATE keyword was not being parsed correctly inside CREATE TABLE
statements - it was being included as part of the datatype.  This fixes
the problem. (CVS 722)

FossilOrigin-Name: 39bd52d33029233d4b22df08975e9ef3c74c260f
2002-08-18 22:41:22 +00:00
drh 6b8b8749d4 Fix for ticket #110: return an error if trying to start a transaction within a
transaction or when attempting to commit or rollback outside of a transaction. (CVS 721)

FossilOrigin-Name: df51cb166bf7c5b8b0530cc86df8d2d68de81a40
2002-08-18 20:28:06 +00:00
drh d8acdb3c36 Documentation updates. (CVS 720)
FossilOrigin-Name: e372a60be8de3332ab6e45d82f21227b8b9acf82
2002-08-18 19:09:22 +00:00
drh cb48588297 Fix for ticket #135: Remove unused variables from three files. (CVS 719)
FossilOrigin-Name: 8cf17f2a24ee9bd5d1ea66484922819626c412dd
2002-08-15 13:50:48 +00:00
drh c277413089 More documentation updates. (CVS 718)
FossilOrigin-Name: 9c0400aa7a0244605828fa6450ea1cc723240b16
2002-08-15 13:45:17 +00:00
drh 310ae7be1e Additional test cases and documentation updates. (CVS 717)
FossilOrigin-Name: 048b16c111693727482642e2a19a74a91458fc80
2002-08-15 11:48:13 +00:00
drh 3d037a91a5 Fixes and test improvements resulting from code coverage testing. (CVS 716)
FossilOrigin-Name: 66a0f6a8e25e3eeed78eba4b63b097f921c79d99
2002-08-15 01:26:09 +00:00
drh b27b83a941 Fix for ticket #134: Change the lemon.c sources to work around a problem with
the AIX C compiler. (CVS 715)

FossilOrigin-Name: 07f6020bb56d6d1bffdd936017f61cfae5bd134b
2002-08-14 23:18:57 +00:00
drh d1efac52d5 Implement probabilistic reader/writer locks under windows so that windows
can have multiple simultaneous readers. (CVS 714)

FossilOrigin-Name: 2127de3f03537ef2f18120e773f7603e0984ff81
2002-08-14 12:56:54 +00:00
drh c330af1dca Disable sorting by indices if there is a COLLATE subclause in the
ORDER BY clause. (CVS 713)

FossilOrigin-Name: 2438da791afb53b4f1c7a9ff9705d393c86f3cbd
2002-08-14 03:03:57 +00:00
drh 0c44e2edf3 Fix for ticket #132: make the working directory the last choice for where
to write temporary files, not the first choice. (CVS 712)

FossilOrigin-Name: 26a4e7e7a3eee62c170ce264cb964a92bc7f52c9
2002-08-14 00:10:44 +00:00
drh fbe4375cae Update documentation to better explain the typelessness of SQLite and to
describe the distinction between text and numeric data. (CVS 711)

FossilOrigin-Name: 4ff0f578eca4a8672cf570923e6c015c3ba6b9f4
2002-08-14 00:08:12 +00:00
drh a9e99aee95 Make the distinction between text and numeric data. (CVS 710)
FossilOrigin-Name: 310ac4fbaf0ed63f98bfacb55259960be03b0c8b
2002-08-13 23:02:57 +00:00
drh 76800328b2 Documentation and makefile updates. (CVS 709)
FossilOrigin-Name: 92c403f485390bbd83a5be472e61c974f76d46b1
2002-08-13 20:45:39 +00:00
drh 72ca3794ab Bug fix to the left outer join logic. (CVS 708)
FossilOrigin-Name: f9d3d4c1230a7f1176b2002d72e94857e251c04e
2002-08-13 13:15:51 +00:00
drh 7f09b3e36b Bug fix to the left outer join logic. (CVS 1726)
FossilOrigin-Name: 957d908e6b84cd599b5cfd82af80c8fac79c1dbd
2002-08-13 13:15:49 +00:00
drh f8b593e964 Version 2.6.3 (CVS 707)
FossilOrigin-Name: ba706aca0af9ed1ecb64edd4ab327bd5a5a32044
2002-08-13 00:02:10 +00:00
drh 74587e5567 Updates prior to release 2.6.3. (CVS 706)
FossilOrigin-Name: 34c4149eea7a48927e36867f4e25ff7fac40c66e
2002-08-13 00:01:16 +00:00
drh 94f3331a0b Fix for ticket #9 (again). The rollback journal files should now also be
byte-order independent. (CVS 705)

FossilOrigin-Name: 2fb3fdcdf06c1206bf14da640c2f9e599455f0eb
2002-08-12 12:29:56 +00:00
drh 0d316a40cc Fix for ticket #9: Add the ability to read little-endian database files
from a big-endian machine and vice versa. (CVS 704)

FossilOrigin-Name: ce4b943bf68c160445a58ffccfbabbbd30d9829b
2002-08-11 20:10:47 +00:00
drh 6e397e447e Fix typos the source to webpages html files. (CVS 703)
FossilOrigin-Name: 61bb3af7405aa7b54f3e5519537ea483879eed39
2002-08-06 12:04:59 +00:00
drh 68d2e5918a Fix for ticket #131: When a SELECT contains a GROUP BY clause it cannot
use an index for sorting.  It has to sort as a separate operation after
the GROUP BY is complete. (CVS 702)

FossilOrigin-Name: 18745c67acdf7ebec378f5538174117970e9f5cc
2002-08-04 00:52:38 +00:00
drh e0e5ef1471 Remove the restriction that a transaction cannot be started by one linuxthread
and continued by another.  Leave in the documentation the warning about not
carrying a database connection across fork() but do not test for it any more.
Ticket #130. (CVS 701)

FossilOrigin-Name: bdbdb866f2e76abd1f8f545adadc9a900ed0cd1a
2002-08-02 10:36:09 +00:00
drh f1351b6759 Fix for ticket #124: Fix a stack VDBE overflow problem on joins on an
INTEGER PRIMARY KEY. (CVS 700)

FossilOrigin-Name: fe329e078fa209faf62e08599a00c7efa75b8501
2002-07-31 19:50:26 +00:00
drh 4eb9c6b9fd Version 2.6.2 (CVS 699)
FossilOrigin-Name: 223a2150ac1fa34d4bd01dd32b5fed9e90aa38d4
2002-07-31 00:38:06 +00:00
drh 4dec5b40ec Update version number and change log for the 2.6.2 release. (CVS 698)
FossilOrigin-Name: 4f196de07d258dc44b6fd20d776120e2aadd3224
2002-07-31 00:37:36 +00:00
drh f573c99ba7 Fix for ticket #104: Make triggers on views work properly even after closing
and reopening the database.  Also fixed an unrelated bug in the version
2.6.0 database format upgrade logic.  The upgrade logic bug was found while
testing the trigger fixes. (CVS 697)

FossilOrigin-Name: 04973fc2a6a0c93877de7e564618e0e9fcffc06c
2002-07-31 00:32:50 +00:00
drh 92ed08a9d7 Fix for ticket #114: Correctly handle SQLITE_BUSY if it occurs during
database initialization. (CVS 696)

FossilOrigin-Name: 5b814b5df667ccc91d85fbb7f96e523483e9219b
2002-07-30 18:43:40 +00:00
drh c51d204464 Fix for ticket #111: Update the documentation to explain that you may not
start a transaction in one thread and complete it in another thread under
Linux Threads where each thread has its own process ID. (CVS 695)

FossilOrigin-Name: 0b0c0492cc1e55c1c4feba6e92765ea09896096c
2002-07-30 17:42:10 +00:00
drh 62160e798c Fix for ticket #71: Correctly handle CR and CRLF line terminators in the
input files for the COPY command. (CVS 694)

FossilOrigin-Name: be1315755ef801b5ec07f469134e0d33a3ece990
2002-07-30 17:20:40 +00:00
danielk1977 368c7f6df1 UPDATE triggers on TEMP tables were broken. (CVS 693)
FossilOrigin-Name: c080ed01ea51628b86050762f097e702e3aeafdf
2002-07-21 23:09:55 +00:00
drh 77fc55904e Version 2.6.1 (CVS 691)
FossilOrigin-Name: 610b7bc70a12b271994255bd01a76b3525421535
2002-07-19 19:04:04 +00:00
drh 096c497eb3 Rig the ident string so that it is not changed by RCS on checkin. (CVS 692)
FossilOrigin-Name: 773d36c8d94bdcd0c78401282e48432ddd9b61d6
2002-07-19 19:03:41 +00:00
drh 26b3e1bc06 Fix an assertion failure that occurs when attempting to delete all rows of
a table while the "count_changes" pragma is turned on.  Up the version number
to 2.6.1. (CVS 690)

FossilOrigin-Name: 612df004017b241651074ee859096dd0ee5062b8
2002-07-19 18:52:40 +00:00
drh 426cc56a6b Add static ident strings (such as picked up by the RCS "ident" command)
containing the library version number. (CVS 689)

FossilOrigin-Name: 712ee3914e988f0077e9a3d6170ff8db496a9600
2002-07-19 18:13:35 +00:00
drh c231172f3f Better detection and reporting of errors when initializing from the
sqlite_master table. (CVS 688)

FossilOrigin-Name: c8a7b725b7cec792d2148455a4cecbce9dfebe80
2002-07-19 17:46:38 +00:00
drh b782325617 Version 2.6.0 Release 2 (CVS 687)
FossilOrigin-Name: cc4f824b155138326f1a62066a99c65d0f32fb8b
2002-07-18 11:10:30 +00:00
drh ac729e224e Fix a bug in the publish.sh script that was causing the windows DLL to not
be built. (CVS 686)

FossilOrigin-Name: ee8c2758a222251fed0197d2a364346d05728240
2002-07-18 11:07:19 +00:00
drh 199e3cf1b6 Change the name of variable "near" to "nearby" since MSVC mistakenly belieaves
that "near" is a keyword. (CVS 685)

FossilOrigin-Name: 9761a2a0fbfd3e98f719a813bcc544950968aef2
2002-07-18 11:01:47 +00:00
drh bd44700073 Version 2.6.0 Release 1 (CVS 684)
FossilOrigin-Name: dde65e9e060b9154e848d53d15272a0dcc7c2723
2002-07-18 02:50:51 +00:00
drh 3c2c354e0e Update documentation prior to the release of 2.6.0. (CVS 683)
FossilOrigin-Name: f2d9191381e956900a14bd80e50678b9d49e19e5
2002-07-18 02:07:07 +00:00
drh 8e5ba84643 Make the automatic database upgrade work even if there are triggers. Add
tests for automatic upgrade and for failing if reading a more advanced version
of the database.  Ticket #107. (CVS 682)

FossilOrigin-Name: 0493e39c1cbbe4a38e990a2370181a79606af222
2002-07-18 01:27:17 +00:00
drh 491791a827 Fix for ticket #107: Fix a design defect in indices that was causing queries
to fail when using an index on a column containing an empty string.  This
fix is an incompatible file-format change. (CVS 681)

FossilOrigin-Name: 20d152fcddb4fa53556a9c93c7a869600a7c5183
2002-07-18 00:34:09 +00:00
drh 53e3fc70bf Fix for ticket #105: Fix the UPDATE command so that it works properly with
indexed tables when there is a subquery in the WHERE clause.  Add tests
to verify correct operation. (CVS 680)

FossilOrigin-Name: bbca16f88d00cd33ac7229edf3ee4623eff6e62f
2002-07-16 17:22:50 +00:00
drh 0c36cbe0c2 Fix for ticket #100: Correctly handle ON and USING clauses of JOINs within
a VIEW. (CVS 679)

FossilOrigin-Name: 93710f7ed7e1baa6acbf4bc32982e046f61ffa44
2002-07-16 02:05:43 +00:00
drh 704027f16d Fix a syntax error in the tclsqlite.c file. (CVS 678)
FossilOrigin-Name: 47997d7f3ad2dd486a00dc13b7a8c48bb4751e5d
2002-07-15 20:58:47 +00:00
drh ad16844f35 Fix for ticket #102: Honor the ORDER BY clause in subqueries. (CVS 677)
FossilOrigin-Name: 7e918c8b0df5120e3630811f164defb8c9fedd6d
2002-07-15 18:55:24 +00:00
drh 7f953e2052 Fix for ticket #64: Better error reporting in the shell. (CVS 676)
FossilOrigin-Name: e1842e04c4f47e1ce79575b5c787a164add5d559
2002-07-13 17:33:45 +00:00
drh 70562cd342 Partial fix for ticket #96: Return SQLITE_MISUSE from sqlite_exec() if called
from a child process with an active transaction that was started in the parent. (CVS 675)

FossilOrigin-Name: 72a609ec6492e7d740b6e6184fa14a5e6b04a5dc
2002-07-13 17:23:21 +00:00
drh 289f6c2336 Fix for ticket #99: Added documentation on the sqlite_mprintf() API. (CVS 674)
FossilOrigin-Name: d918de5f06d187c76aab0879b728c89a7d4ae55a
2002-07-13 17:18:36 +00:00
drh 674d712126 Added a document describing how to do a security audit. (CVS 673)
FossilOrigin-Name: cff271837796d84471b09147c59cb7601d16b358
2002-07-13 16:52:35 +00:00
drh 25197f4835 Fix for ticket #54: Export additional APIs to the Win32 DLL. (CVS 672)
FossilOrigin-Name: 072fd2ad588332b1f1f725515bedfbc0cf035315
2002-07-13 14:41:49 +00:00
drh 485b39b401 Fix for ticket #95: Do not allow automatically created indices (associated
with UNIQUE or PRIMARY KEY constraints) to be dropped. (CVS 671)

FossilOrigin-Name: 0603eb74e6aca48f62bd95cb6c236b9e559af850
2002-07-13 03:11:52 +00:00
drh 5080aaa7ab Turn of the reporting of datatypes in the 4th callback argument unless the
SHOW_DATATYPES pragma is ON.  Eliminate the NULL pointer that used to separate
the beginning of datatypes from the end of column names so that the callback
can test to see whether or not datatypes are provided.  This is an
incompatible changes, but since the prior behavior was never documented, we
will let it in. (CVS 670)

FossilOrigin-Name: b98727246d5fcc1b097b577be498a77e954c5dc4
2002-07-11 12:18:16 +00:00
drh fa173a764a When reporting back the datatype of columns, use the text of the datatype
as it appears in the CREATE TABLE statement, if available.  Also: removed
the ".reindex" command from the shell. (CVS 669)

FossilOrigin-Name: ff8b6f4ee8099a7170cb786b8ead9a3e42ab5869
2002-07-10 21:26:00 +00:00
drh 6276c1cbf0 Add support for TEMPORARY views. The code is here but it is mostly untested. (CVS 668)
FossilOrigin-Name: 87cd10c1f638db5d1f47bc12669f150485415b3e
2002-07-08 22:03:32 +00:00
drh bea00b9a2b In the BTree subsystem, when using pages from the freelist, attempt to select
pages close to related pages in order to keep data structures near each other
in the database file.  This improves access speed in some circumstances. (CVS 667)

FossilOrigin-Name: fd7e41f0eed80fb1c7e18eb84834ec3cea74a649
2002-07-08 10:59:50 +00:00
drh 6b30867ff6 Make the BTree balance() routine a little faster by reusing database
pages locally rather than freeing and reallocating them. (CVS 666)

FossilOrigin-Name: 3c2dea4310af491d6cb09856d4bc5236d6dc44ac
2002-07-08 02:16:37 +00:00
drh 6f08d709b1 Version 2.5.6 (CVS 664)
FossilOrigin-Name: 111c78e6835306fcd8b6d22b9ae68dfb9ab4febe
2002-07-07 17:13:00 +00:00
drh 5e5377fb80 Fix for Win32: The %p format on Win32 does not prepend a "0x" as it should. (CVS 665)
FossilOrigin-Name: ee86704daf184307fe98b5631f22ceb3d701afce
2002-07-07 17:12:36 +00:00
drh 193a6b4142 More rollback problems: Fix two more errors introduced by checking (410) that
can cause database corruption after a ROLLBACK.  Also add new tests to make
sure everything is working this time. (CVS 663)

FossilOrigin-Name: f6e24d5ccbcfcf5863ffbd65860dafa2f5663e99
2002-07-07 16:52:46 +00:00
drh af1c9661a4 Version 2.5.5 (CVS 662)
FossilOrigin-Name: 6284c65c174bb2cd049fd1db81de52be3abf4000
2002-07-06 16:34:20 +00:00
drh 0de8c11292 Prepare for the 2.5.5 release. (CVS 661)
FossilOrigin-Name: 00f83c2576f4a9689720d344788f66219c1f6827
2002-07-06 16:32:14 +00:00
drh 8e298f92f6 Fix for bug #94: Be sure to journal pages that are added to the freelist then
removed from the freelist and reused during the same transaction. (CVS 660)

FossilOrigin-Name: db178646a01483d59e6f9af302e9bbe394956d93
2002-07-06 16:28:47 +00:00
drh 38640e15af All the code is now in place for SQLite to distinguish between NUMERIC and
TEXT datatypes.  Still need to turn on the new code and test it. (CVS 659)

FossilOrigin-Name: b4737a16c997a6c139d616211fb6bc4b0fae181c
2002-07-05 21:42:36 +00:00
drh 2f2c01e51d Fix for ticket #92: Correct the sqliteExprCompare() function so that is takes
into account the iTable and iColumn fields of the Expr structure.  Otherwise,
"min(a)" and "min(b)" will compare equal to each other in views. (CVS 658)

FossilOrigin-Name: 85793a4f03250166c21007cab3525709592d0866
2002-07-02 13:05:04 +00:00
drh 1f66c57a9c Fix for ticket 91: Modify the "publish.sh" script to use the new mingw
cross-compiler installed on the development platform. (CVS 657)

FossilOrigin-Name: 3cac283de4939538f09cd11e2cbdc84e9a9602f2
2002-07-02 11:55:32 +00:00
drh ea1c936a1e Version 2.5.4 (CVS 656)
FossilOrigin-Name: f7159fde6b8692f91fa8a3c928dc219d0f3d8884
2002-07-01 12:35:51 +00:00
drh a4db7ee12d Update the change log and the version number for the next release. (CVS 655)
FossilOrigin-Name: f9d77140aed301775b2b8dd88d464cc38edfe192
2002-07-01 12:34:36 +00:00
drh 5ad1a6c8c4 Fix for tickets #90 and #89: Make the AS keyword optional again. (CVS 654)
FossilOrigin-Name: 1f8a73b1c3833e3924196458d4c1ecca90f63662
2002-07-01 12:27:09 +00:00
drh 6cbe1f1bc4 Added additional tests. No new errors found. (CVS 653)
FossilOrigin-Name: 8924a7f5bab790ab552332d6359028d0d1825e4a
2002-07-01 00:31:36 +00:00
drh a9f9d1c08b Add a few more tests and fix a few bugs that the tests uncovered. (CVS 652)
FossilOrigin-Name: 91c0db66c86facb21b5b522afadd83d91a488256
2002-06-29 02:20:08 +00:00
drh 3b167c7583 Additional test cases added. The following bug fixed: A segfault was occurring
if a VIEW consisted of a join with a USING clause. (CVS 651)

FossilOrigin-Name: 96515b813eb57e1f48c28d357d1f38639b2fdcfa
2002-06-28 12:18:47 +00:00
drh 83dcb1ad37 Fix for ticket #84: If the WHERE clause is too complex, issue an error message
and refuse to do the SELECT.  The cutoff is a WHERE clause with 100 terms. (CVS 650)

FossilOrigin-Name: c07e493b62125e85eaea36b6945f1e146e2792b8
2002-06-28 01:02:38 +00:00
drh ac83f718fc Fix for ticket #88: A typo in the documention of the "sqlite" shell command. (CVS 649)
FossilOrigin-Name: 16552a7a29450a23765f0f05a9f4058638eafd74
2002-06-27 13:21:01 +00:00
drh 06b2718a5f In the TCL interface, the "sqlite" command now always returns the address
of the "sqlite*" pointer that sqlite_open() returns.  It used to do this
only when compiled with the SQLITE_TEST macro defined. (CVS 648)

FossilOrigin-Name: 9ca6368525fe81fe9c78c6911f4d23009ce858d5
2002-06-26 20:06:05 +00:00
drh b13632063d The datatype of the i-th column in the result set is given by the
azColName(argc+1+i) parameter to the callback. (CVS 647)

FossilOrigin-Name: bdb006b809feb0f29342eb5138c0884d34e95599
2002-06-26 02:45:03 +00:00
drh 411995dc0d Add the sqlite_open_aux_file() API. (CVS 646)
FossilOrigin-Name: 332164d6455658ca633a1dc49811d9fb0fd4b01c
2002-06-25 19:31:18 +00:00
drh e3c163e4e0 Version 2.5.3 (CVS 645)
FossilOrigin-Name: d5cb675432cbaeac2c1a8a08181613b9d1eb5ca1
2002-06-25 15:19:02 +00:00
drh ee6bfdf99c Fix a spelling error in the change log. (CVS 644)
FossilOrigin-Name: 37cc40442bab50506978f428001b77f23d3a4e4c
2002-06-25 14:46:58 +00:00
drh 8124a30f82 Bug fix: When the database file grows in size during a transaction, make sure
the last page of the file gets written to disk even if that page is on the
free list and contains no data.  Otherwise the disk file will be too small
which can lead to database corruption in subsequent transactions. (CVS 643)

FossilOrigin-Name: 36fc0add660f9f3676783765d37280aa874caecb
2002-06-25 14:43:57 +00:00
drh 2150432e7c Enhance the INTEGRITY_CHECK pragma to test the auxiliary database file in
addition to the main database file. (CVS 642)

FossilOrigin-Name: 52eba4de301121f254174b74042015bf6069ef11
2002-06-25 13:16:02 +00:00
drh 90c0bb0b07 Version 2.5.2 (CVS 641)
FossilOrigin-Name: 756310cad23668785eac679ef0842d1f37c306ee
2002-06-25 01:09:30 +00:00
drh e0bc4048a0 Added support for the "sqlite_temp_master" table. Increased the version
number to 2.5.2. (CVS 640)

FossilOrigin-Name: 9c1432bf7485258e485bd652e3acdaeabbfe8850
2002-06-25 01:09:11 +00:00
drh 1cc093c2b5 Partial fix for a problem with LEFT OUTER JOIN. It used to be that the test
for the right-hand table not matching the left table occurred after all
ON, USING, WHERE clause processing.  The test should occur after ON and
USING clauses are checked but before the WHERE clause is check.  This fix
works as long as the total number of "AND" separated terms in the ON, USING,
and WHERE clause does not exceed 32.  To do: make this work for any number
of terms and add test cases.
that (CVS 639)

FossilOrigin-Name: 8b6574cfa86daaae910f8f3ee3c4723a21fb9e53
2002-06-24 22:01:57 +00:00
drh bf5cd97ed7 Fix a VDBE stack leak in LEFT OUTER JOIN. Fix a bug in the code generator
for JOIN ... USING(...). (CVS 638)

FossilOrigin-Name: d861489e1f7dffd1105c271fe8597f73e5b1703c
2002-06-24 12:20:23 +00:00
drh f46f905a1e An optimization: avoid the use of an intermediate table on UNION ALL if there
is no ORDER BY clause. (CVS 637)

FossilOrigin-Name: 8aa73ce61268a50d353d9a5c878461290195525f
2002-06-22 02:33:38 +00:00
drh d11d382c99 Fix for bugs #77 and #80: Rework the LIMIT mechanism to be reentrant and to
clean up the VDBE stack properly. (CVS 636)

FossilOrigin-Name: 9d5523107937e3700c76666fb058694babdd672c
2002-06-21 23:01:49 +00:00
drh 7aa128dbc5 Fix for ticket #76: Fix a database corruption that might occur when
dropping tables or indices. (CVS 635)

FossilOrigin-Name: 7936b0325024c81ed8d4bab192d7350d045ec999
2002-06-21 13:09:16 +00:00
drh bb3a6dbd2e Fix for ticket #78: Avoid an assertion failure when sqlite_close() to be
called in the middle of a transaction. (CVS 634)

FossilOrigin-Name: 2532792a5875f9cc0f7d8eaf90dd49d1f6025ca3
2002-06-21 11:55:48 +00:00
drh ef1360635c Update the file-format change document to describes the changes between
versions 2.4.12 and 2.5.0. (CVS 633)

FossilOrigin-Name: d28a2ecc91c0a6d64725887dcf2758f69553eb59
2002-06-20 11:41:58 +00:00
drh c9b84a1fb1 This patch contains the beginnings of the data-typing infrastructure.
The new build-in TypeOf() function is added.  New opcodes for doing
pure text comparisons are added.  Most changes are disabled pending
the 2.6.0 release. (CVS 632)

FossilOrigin-Name: cbbc858d973c2d515c6a2464981316549a241b73
2002-06-20 11:36:48 +00:00
drh c926afbc2d Fix for ticket #73: The ORDER BY clause is significant for subqueries.
This passes all regression tests, but more testing is needed to exercise
all paths through the new code. (CVS 631)

FossilOrigin-Name: 43c5aff5d078bce9292683cd40311e0dcc81ac14
2002-06-20 03:38:26 +00:00
drh 27a32783ab Fix for ticket #75: Autoincrement INTEGER PRIMARY KEY fields on an INSERT
even if the data is coming from a SELECT statement. (CVS 630)

FossilOrigin-Name: d599f75b659809a6e5eee09b0e9e6e90bde5af1e
2002-06-19 20:32:43 +00:00
drh 9bc542e999 Version 2.5.1 (CVS 629)
FossilOrigin-Name: 5e8a3131aba25e22f3e25b9b1c051019381f11d1
2002-06-19 14:27:22 +00:00
drh e31847449e The query optimizer now attempts to satisfy an ORDER BY clause using
an index.  Sorting is still used if there are no suitable indices. (CVS 628)

FossilOrigin-Name: f09e19b43ef61073713cf32282c90ea666229eba
2002-06-19 14:27:05 +00:00
drh c2bb7c3dd9 Version 2.5.0 (CVS 627)
FossilOrigin-Name: 9baef3e240c4ffd90881ac4664efd205bd9e65f4
2002-06-17 17:26:38 +00:00
drh af33486ebb Update the change summary for version 2.5.0 (CVS 626)
FossilOrigin-Name: 7a216adea5aa5a82718f8c85f8961ba36ab51bb4
2002-06-17 17:15:46 +00:00
drh 8e2ca029a3 Add preliminary logic for the eventual move to having separate TEXT and
NUMTEXT datatypes.  Also change the version number to 2.5.0 in preparation
for an interim release. (CVS 625)

FossilOrigin-Name: 05783a9db585c1ead42135252dca97d2bc6e2118
2002-06-17 17:07:19 +00:00
drh e0140fc13a Expose an additional internal API routine (sqliteInitCallback()) for
use by private code. (CVS 624)

FossilOrigin-Name: cd74495f995803eeb5c2b900d536deb52e5584eb
2002-06-16 18:21:44 +00:00
chw 4d60361fe3 Added explanation and examples for %Q format specifier. (CVS 623)
FossilOrigin-Name: 633ce4dd252ac351b04bdb7bed2d5374ee9a3f12
2002-06-16 04:57:32 +00:00
chw b22f1b58ac Added printf-4.(2-4) test cases to test new %Q format specifier. (CVS 622)
FossilOrigin-Name: 7d5fc35b5d38230230344b4f70763f75940ab908
2002-06-16 04:56:36 +00:00
chw 0cfcf3fbd1 Added %Q format specifier: like %q but automatic enclosing in
single quotes, NULL pointers replaced by NULL w/o single-quotes. (CVS 621)

FossilOrigin-Name: b9c7ecc2f9d8d7d57c51dc4ba0aaa520e89eb31f
2002-06-16 04:55:48 +00:00
chw f220b24fc6 Changed sqlite_mprintf_str to allow a NULL string parameter.
Command template now is cmd FORMAT INT INT ?STRING?. When
STRING omitted a NULL is passed to sqlite_mprintf. (CVS 620)

FossilOrigin-Name: 8bc711571d752a81957007be22ed8a3c6877f676
2002-06-16 04:54:28 +00:00
drh df199a25bd Make the LIMIT clause work even if the destination of the SELECT is
something other than a callback.  (Ticket #66) (CVS 619)

FossilOrigin-Name: 699cf362083043615eb88635a228bfa46a315c9c
2002-06-14 22:38:41 +00:00
drh c27a1ce4bd Improvements to comments. No code changes. (CVS 618)
FossilOrigin-Name: 7e10e60bb78b680bb822908a0b7763f8f5e3ee5a
2002-06-14 20:58:45 +00:00
drh c67980bedc Fix for bug #72: Make sure the file descriptors are properly closed if
sqliteInit() fails for any reason. (CVS 617)

FossilOrigin-Name: e67ac0fec51788aca0429d04310f86c9c1cf9d13
2002-06-14 20:54:14 +00:00
drh 6ca62f21e3 Fix for bug #70: Correct a typo in the documentation. (CVS 616)
FossilOrigin-Name: 3387d5b6d62fbafea69fac7bb8256c37d5c6a4ba
2002-06-12 22:33:54 +00:00
danielk1977 c3d2ac6561 Documentation that should have been checked in along with checkin (614) (CVS 615)
FossilOrigin-Name: 10da13612583caacc6fefe3a1f24187bfae2ebd7
2002-06-11 22:33:47 +00:00
danielk1977 6f34903e85 Add RAISE() function, which allows more advanced flow-control in trigger programs (ticket #55) (CVS 614)
FossilOrigin-Name: d4a2fb10067203a0d49317db747759872e62927e
2002-06-11 02:25:40 +00:00
drh 28f4b6885b Fix the spelling of sqliteRegisterBuiltinFunctions(). (CVS 613)
FossilOrigin-Name: 74d297d97e66452acc5c21048ee8ddf2a90c846f
2002-06-09 10:14:18 +00:00
drh 48185c15c7 Added tests for the new IN operator optimizer and fixed a bug that the
new tests found.  This completes the implementation of enhancement #63. (CVS 612)

FossilOrigin-Name: 2a710e18176c486525f0abb06644a511a2cd1d7a
2002-06-09 01:55:20 +00:00
drh d9e3093038 Fix for ticket #65: If an integer value is too big to be represented as a
32-bit integer, then treat it as a string. (CVS 611)

FossilOrigin-Name: ad9624798edbd6d0c4652fed3d74fe87498844ff
2002-06-09 01:16:01 +00:00
drh d99f70680f Add optimizations for the IN operator in WHERE clauses. This is a partial
implementation of enhancement #63.  Still need to add test cases. (CVS 610)

FossilOrigin-Name: 8481e841ebdeabe07bf780246bda1aa053eb60b7
2002-06-08 23:25:08 +00:00
drh f5db2d3ea2 Bug fix: do not segfault if a SELECT without a FROM clause includes
the * wildcard in the result column list. (CVS 609)

FossilOrigin-Name: d939294994e5f6c7862b66573301e111e56a2681
2002-06-06 23:42:27 +00:00
drh d5c644c0b1 Fix for ticket #59: Add documentation for the || operator. Also added
documentation for the new SQL92 join syntax. (CVS 608)

FossilOrigin-Name: a0abef62bfe1b0f8c6249ba520dd2735190783a5
2002-06-06 23:30:58 +00:00
drh 5df72a5ad6 Fix for ticket #62: Do not report an SQLITE_READONLY error until the application
actually tries to write data into a readonly file.  It is OK to start a
transaction on a read-only file, and doing so will get you a read lock.  This
change allows TEMP tables to be read/write even though the main database is
readonly. (CVS 607)

FossilOrigin-Name: 9ef795d1d756a404d2123ebc19df1985b19c9888
2002-06-06 23:16:05 +00:00
drh 34e33bb835 Additional grammar cleanup resulting from the %fallback directive. (CVS 606)
FossilOrigin-Name: c0cb3a012e02df1a7965413a92f9b5a77331edb4
2002-06-06 19:04:16 +00:00
drh 0bd1f4ea5a Added the %fallback directive to the lemon parser generator and used this
in the parser to make the parse tables much smaller.  This reduced the size
of the library by 15K. (CVS 605)

FossilOrigin-Name: 7ac5bd293cbb2bf252f31f1571f7efac7e77280a
2002-06-06 18:54:39 +00:00
drh bd790ee395 Fix a compiler warning. (CVS 604)
FossilOrigin-Name: 637ee587b5438c54ba2d8bd8fc15e584abb70946
2002-06-02 18:22:06 +00:00
drh 04738cb9ff Add the ability to parse FOREIGN KEYs. Foreign keys are still ignored,
but at least they now do not cause a syntax error. (CVS 603)

FossilOrigin-Name: 6fdcee3c99e994ef3ab83a0cc57344cdb16210df
2002-06-02 18:19:00 +00:00
drh e4de1feb3e Enhance the ORDER BY clause so that an integer term means to sort by the
corresponding column. (CVS 602)

FossilOrigin-Name: 7acbf84b492202d8b5a05276a95b475027eb5f58
2002-06-02 16:09:01 +00:00
drh 1288c9561d Multiplying NULL by zero gives NULL, not zero. I misread the test data
and coded it wrong.  This check-in fixes the problem. (CVS 601)

FossilOrigin-Name: df9cc852ad02dbec5558d3915a0303f7e7b79b2b
2002-06-01 21:41:10 +00:00
drh f570f011eb Refinements to NULL processing: NULLs are indistinct for DISTINCT and UNION.
Multiplying a NULL by zero yields zero. In a CASE expression, a NULL comparison
is considered false, not NULL.  With these changes, NULLs in SQLite now work
the same as in PostgreSQL and in Oracle. (CVS 600)

FossilOrigin-Name: da61aa1d238539dff9c43fd9f464d311e28d669f
2002-05-31 15:51:25 +00:00
drh 0f89253e21 Once it is opened, leave the checkpoint journal file open for the
duration of a transaction, rather than closing it and reopening it
for each statement.  (Ticket #53) (CVS 599)

FossilOrigin-Name: 7a24336d50e72006b2cc0e4feb292b946e79d5f3
2002-05-30 12:27:03 +00:00
drh 461c281a2e Bug fix: bad code was generated for when the first operand of a CASE
was NULL. (CVS 598)

FossilOrigin-Name: 4debc8db929fdc201759ba211acdeadc4e30e8af
2002-05-30 02:35:11 +00:00
drh 739105c72c Built-in aggregate functions (MIN, SUM, AVG, etc) should ignore NULL entires. (CVS 597)
FossilOrigin-Name: 19ae12bef210ae5fe171f10833faa38d640c129f
2002-05-29 23:22:23 +00:00
drh f1756d2a79 Remove extra \ characters from temporary filenames under windows.
(Ticket #52) (CVS 596)

FossilOrigin-Name: ed11abc81e638c21ec1aa0445a6d59de91343095
2002-05-29 12:44:52 +00:00
danielk1977 993b173e55 Update trigger2.test to match checkin 591. Also fix ticket #51 (by documenting problem) (CVS 595)
FossilOrigin-Name: 5e74d0964b8fd99eda798e3737217aa499cc1726
2002-05-28 06:55:27 +00:00
drh d7489c3987 A SELECT statement inside the body of a TRIGGER uses the SRT_Discard target
to discard the query results.  Such selects are intended to be used to call
user-defined functions for their side-effects.  They do not return results. (CVS 594)

FossilOrigin-Name: f8041f3d4d3350b4086cd6ba3e9006bdde8546a9
2002-05-27 12:24:48 +00:00
drh c754fa5486 Fix the "alias.*" bug found by Bernie Cosell and reported on the newsgroup. (CVS 593)
FossilOrigin-Name: f562d542304c0c1b18b0cee78b1ecc353327a02e
2002-05-27 03:25:51 +00:00
drh bb113518f9 Bug fixes and additional test cases for the distinct-NULL patch. (CVS 592)
FossilOrigin-Name: 0e268d0c0faa02c3f95e1567cf631b7a04bfbdf0
2002-05-27 01:04:51 +00:00
danielk1977 d702fccbce Require the INSTEAD OF syntax to create triggers on database views. (CVS 591)
FossilOrigin-Name: d9e48cd5180e2aae7672b9d54e18c37d0fe5258a
2002-05-26 23:24:40 +00:00
drh 8912d106e1 Change functions to handle NULLs correctly. Added the NULLIF() function. (CVS 590)
FossilOrigin-Name: 46ce1a9ab6e527958ebc757fa2175c488299cd84
2002-05-26 21:34:58 +00:00
drh f5905aa7be NULL values are distinct. A comparison involving a NULL is always false.
Operations on a NULL value yield a NULL result.  This change makes SQLite
operate more like the SQL spec, but it may break existing applications that
assumed the old behavior.  All the old tests pass but we still need to add
new tests to better verify the new behavior.  Fix for ticket #44. (CVS 589)

FossilOrigin-Name: 9051173742f1b0e15a809d12a0c9c98fd2c4614d
2002-05-26 20:54:33 +00:00
drh 195e6967fb Additional testing of LEFT OUTER JOIN. (CVS 588)
FossilOrigin-Name: d8d04c14f18d1feba89ccea0be70530a18248c51
2002-05-25 00:18:20 +00:00
drh ad2d8307ac Initial implementation of LEFT OUTER JOIN including the expanded SQL92 join
syntax. The basic functionality is there but there is still a lot of testing
to do. (CVS 587)

FossilOrigin-Name: 99bd1f5b9a1a20bfeefe15c00d96a34a5f40923e
2002-05-24 20:31:36 +00:00
drh 01f3f25376 Add support for the full SQL join syntax. This is just a parser enhancement.
We now recognize all kinds of joins, but we don't actually do anything with
them yet. (CVS 586)

FossilOrigin-Name: e238643efdbe1394c7ff85e34e486f7c6082b6cc
2002-05-24 16:14:15 +00:00
drh 2e392e2c53 Added tests for multi-column primary keys. (CVS 585)
FossilOrigin-Name: ffc49e56b13096b35e6cbb1a2f7d546843d4a91d
2002-05-24 02:14:50 +00:00
drh ad3cab52fe Split the IdList structure into IdList and SrcList. SrcList is used to
represent a FROM clause and IdList is used for everything else.  This change
allows SrcList to grow to support outer joins without burdening the other
uses of IdList. (CVS 584)

FossilOrigin-Name: a167b71d8c27e870bc3079c6132e483bffc83298
2002-05-24 02:04:32 +00:00
drh bd5a451d5d Change the names of the PushList and PopList opcodes to ListPush and ListPop
so that they will appear together with the other List opcodes in the
documentation. (CVS 583)

FossilOrigin-Name: c53b0b9283c5c34def87d58b03fd979d03dc0890
2002-05-23 22:07:02 +00:00
drh 0b4efed236 Fix for ticket #50. (CVS 582)
FossilOrigin-Name: 82b74a494ac7c751a13e67dcfa7fffb1b98ec808
2002-05-23 13:15:37 +00:00
drh 07d6e3a74c Partial fix for ticket #49. The correct result is computed, but now we have
a memory leak.  I'm not sure if the memory leak was pre-existing or a result
of this change. (CVS 581)

FossilOrigin-Name: 4d27ee411902a197cd72416ca9da9197d3f87f13
2002-05-23 12:50:18 +00:00
drh e4697f5e90 Fix some places where a malloc() failure would lead to a segfault. (CVS 580)
FossilOrigin-Name: 01ad352c3c82a86d9c94010cbc85d098b8fbc08a
2002-05-23 02:09:03 +00:00
drh 1873cd508a Do not allow triggers on the SQLITE_MASTER table. (CVS 579)
FossilOrigin-Name: 275ba356f351abcf9a079ac16b765c9443750f0e
2002-05-23 00:30:31 +00:00
drh 97fc3d060a Fix for ticket #46: Report an error if a CREATE TABLE contains two or more
columns with the same name. (CVS 578)

FossilOrigin-Name: ba1953abd04671232cf9e93ab3f962fedbbdc508
2002-05-22 21:27:03 +00:00
drh 2ce1a6ec60 Fix for ticket #47: Use a cast to avoid a warning about discarding a "const"
inside of hash.c. (CVS 577)

FossilOrigin-Name: 0c903461533fabca7815e8cccbd3b712bcd22ddc
2002-05-21 23:44:30 +00:00
drh 2398937b7f Double-quoted strings resolve to column names if possible. Single-quoted
strings continue to be interpreted as string literals. (CVS 576)

FossilOrigin-Name: 55e7d65496624c8e48673d8747f3123786bfedbc
2002-05-21 13:43:04 +00:00
drh 1d1f30555d Clean up some compiler warnings. (CVS 575)
FossilOrigin-Name: 3399b01219b9e75b93587b5634d199d9e6fb6e42
2002-05-21 13:18:25 +00:00
drh b05789ff2b Modify the shell so that when it is doing a ".dump" it always uses single
quotes and not double quotes for quoting literal strings.  This is for
portability to other databases that only support single quote string literals. (CVS 574)

FossilOrigin-Name: f795afd63f19ab61c2b3b96621cb6dda31ce0379
2002-05-21 13:02:24 +00:00
drh 79b0c95687 Fix for ticket #45: Allow an UPDATE statement to change the INTEGER PRIMARY KEY
to itself without triggering a constraint error. (CVS 573)

FossilOrigin-Name: 592da1346872e1373bd13525d05d0f33c1056709
2002-05-21 12:56:43 +00:00
drh c977f7f596 Additional code cleanup resulting from a review of the new trigger code. (CVS 572)
FossilOrigin-Name: 37dbdd551e88440933066133ec9cc1e10b03fc1a
2002-05-21 11:38:11 +00:00
danielk1977 f29ce55958 Style fixes to triggers code in various *.c files (partial fix to ticket #39) (CVS 571)
FossilOrigin-Name: 8a4195c7466962291a296e8f53034ea8cb25005f
2002-05-19 23:43:12 +00:00
danielk1977 633ed08d95 Stylistic changes to src/trigger.c (partial fix to ticket #39). Also more comments. (CVS 570)
FossilOrigin-Name: b1d72cb5847a9f5f08e40b36ad117b5493232ea7
2002-05-17 00:05:58 +00:00
danielk1977 d99bc930f7 Fix for ticket #42: Added comments to structs Trigger, TriggerStep and TriggerStack. (CVS 569)
FossilOrigin-Name: 9ec8a2b139ce38312284d7b4eb61221b1e1e3052
2002-05-16 00:13:12 +00:00
drh b6b2de0c35 Fix a typo in the c_interface.html documentation file. (CVS 568)
FossilOrigin-Name: 454879fa400f8c67456a483e69342bf48e3a02a4
2002-05-15 23:26:22 +00:00
drh ce9079c8f2 Fix for ticket #41: Better handling of CREATE TRIGGER in the sqlite_complete()
function. (CVS 567)

FossilOrigin-Name: f45c4b767a6b1451787836060235ff7499dea0de
2002-05-15 14:17:44 +00:00
drh dc3794561f Beginning to clean up the trigger code. Still lots of work to do. (CVS 566)
FossilOrigin-Name: b10346818b25940c6dc85e94de8e36d20954161c
2002-05-15 12:45:43 +00:00
drh 9adf9ac4e4 Remove all tabs from the beginning of source code lines. Replace tabs with
the appropriate number of spaces. (CVS 565)

FossilOrigin-Name: 690f9a163173c4c7af7e8e92e942cee4184c7974
2002-05-15 11:44:13 +00:00
drh 5b87fa2a57 In the "lang.html" documentation file, put the CREATE TRIGGER and DROP TRIGGER
sections in alphabetical order. (CVS 564)

FossilOrigin-Name: d1d8642b57bd0765ade730248012d58b0859c12c
2002-05-15 11:43:16 +00:00
danielk1977 b38f58b51a Add the Makefile.in that was forgotten with checkin #562 (CVS 563)
FossilOrigin-Name: 29b8330ca6bfe32c499a045189683100f2b15246
2002-05-15 08:43:10 +00:00
danielk1977 c3f9bad209 Added FOR EACH ROW triggers functionality (CVS 562)
FossilOrigin-Name: 794bf67b6b36fce8854d5daff12f21dbb943240c
2002-05-15 08:30:12 +00:00
drh 9456bcc975 Version 2.4.12 (CVS 561)
FossilOrigin-Name: 06cdaf1c80f7bc25fc555c7c8a35258faed2d2e9
2002-05-10 14:41:54 +00:00
drh 4d908a3b43 Update the misuse.test script so that it will work under Windows. Changes
to the speed testing script to support version 2.4.12. (CVS 560)

FossilOrigin-Name: 232b7ef2c8207eb6d2564a641446267d3dec97af
2002-05-10 14:37:30 +00:00
drh c22bd47d55 Improvements to the SQLITE_MISUSE detection logic. Also added test cases
for this logic, including the new test file "misuse.test". (CVS 559)

FossilOrigin-Name: f42907ce457e012592f8c043dc6c915e87258b35
2002-05-10 13:14:07 +00:00
drh 247be43d60 Attempt to detect when two or more threads try to use the same database at
the same time and return an SQLITE_MISUSE error.  Also return this error
if an attempt is made to use a closed database. (CVS 558)

FossilOrigin-Name: a05fabd2df1cb38c555a7b2f31b0ca687db500c2
2002-05-10 05:44:55 +00:00
drh d5feede1ff Fix for ticket #35: Ignore any ORDER BY clause on a subquery in a FROM clause. (CVS 557)
FossilOrigin-Name: 1b0ee944c9af10078aba628e85d79f8682afa2b6
2002-05-08 21:46:14 +00:00
drh 0f18b450ad Fix for ticket #34: VIEWs ignore their ORDER BY clause. (CVS 556)
FossilOrigin-Name: 5f22d21571acedbd6348b61445a7c408cde8d229
2002-05-08 21:30:15 +00:00
drh 891da435d6 Version 2.4.11 (CVS 555)
FossilOrigin-Name: b13151794b42109a59ed34e6b9bce6ce90de537b
2002-05-08 12:03:50 +00:00
drh 685b941542 Increase the version number and update the change log in preparation for
the 2.4.11 release. (CVS 554)

FossilOrigin-Name: f6e406aa0422d9b5a3cfe89b0d38def535f8fe9b
2002-05-08 11:57:09 +00:00
drh 0bb28106be Fix for tickets #32 and #33: Generate the names of the result set early, before
doing the flattening optimization or evaluating subqueries.  Otherwise, the
result set column names are generated incorrectly or after they are needed. (CVS 553)

FossilOrigin-Name: 08f27cb36805d38648274b6fe91dec43a5910057
2002-05-08 11:54:14 +00:00
drh cc47c28068 Added documentation about the new CASE expression. (CVS 552)
FossilOrigin-Name: cc541b10302774b9004babbfb3a11b1f65d4b863
2002-05-06 11:47:32 +00:00
drh 0fface6e33 Fix typos in the man-page (sqlite.1) and remove two unused files.
Patches from Andreas Rottmann. (CVS 551)

FossilOrigin-Name: 5772d31934ced7e35842d7c7689ff4878b7e80f5
2002-05-06 11:34:26 +00:00
drh 133224676a Version 2.4.10 (CVS 550)
FossilOrigin-Name: 5f3618142f7e4654e85ca08383d6d7c1b3395c66
2002-05-03 00:18:11 +00:00
drh 2e18abf43c Update the change log prior to releasing version 2.4.10. (CVS 549)
FossilOrigin-Name: 67838bbc800a1acdd91af8e43f5a65494fb9d690
2002-05-03 00:17:54 +00:00
drh 08192d5f76 Fix for ticket #31: Do not attempt the flattening optimization if the
subselect does not contain a FROM clause.  Handle the special case where
a WHERE clause is constant. (CVS 548)

FossilOrigin-Name: 24e4cf73d22bb41d26bf3c833f1854a9c90923e8
2002-04-30 19:20:28 +00:00
drh ef9f708e8f Fix for ticket #28: Export the "sqlite_changes" function in Windows DLLs. (CVS 547)
FossilOrigin-Name: f7cea4634dd53204b4aa8a3630b9c55c40fdc4b3
2002-04-26 09:47:20 +00:00
drh f7bd5d75db Update the test logic and the comments on the encoder.c module. (CVS 546)
FossilOrigin-Name: 18c28519d973944756694b2c213bfef3153f4b1b
2002-04-25 23:06:47 +00:00
drh e8a49c12a6 Added the "encode.c" source file that contains two utility subroutines that
can be used to encode binary data for use in INSERT and UPDATE statements.
This is just an initial checking.  The code has not yet been integrated into
the library. (CVS 545)

FossilOrigin-Name: 57f7c59713299b03b10ba9c1a5883e2c08a8b138
2002-04-25 11:45:41 +00:00
drh 7caf776079 Fix for ticket #26: Document the fact that CREATE TABLE might not be
immediately visible to other processes that are holding the database open. (CVS 544)

FossilOrigin-Name: 18b31b7ab90ab330e271e0ed5d316f63846845be
2002-04-25 00:21:50 +00:00
drh 41202ccae2 Fix for ticket #22: In the code generator for compound SELECT statements, take
care not to generate column name headers if the output is an intermediate table.
Otherwise the column headers are not generated correctly if a compound SELECT
statement appears as an expression in part of the WHERE clause. (CVS 543)

FossilOrigin-Name: a06d9acdd5af0dc69b3a4d024de082631254aead
2002-04-23 17:10:18 +00:00
drh 60ea3720f2 Version 2.4.9 (CVS 542)
FossilOrigin-Name: 0691720a4b94141635734ab0a8c4072cab189a33
2002-04-22 00:35:06 +00:00
drh 85b988c803 Update the version number and changes log for 2.4.9 (CVS 541)
FossilOrigin-Name: a91da82f8ae2b375bf9f5e064f16d6a5770e20b6
2002-04-22 00:33:23 +00:00
drh e98d4fafe4 Fix for ticket #21 (I think): Do not return an "out of memory" error if we
can not find the users home directory. Instead, just report that we could
not find the home directory. (CVS 540)

FossilOrigin-Name: 8a50c57cc3342de9c6eca6c2567d3aa42b407f10
2002-04-21 19:06:22 +00:00
drh 77155c480a Version 2.4.8 (CVS 538)
FossilOrigin-Name: d703a2c5c4fa3e792e203fd9895b59570b5fdfd1
2002-04-20 14:45:31 +00:00
drh 57809db9c5 Update the change log for the 2.4.8 release. (CVS 539)
FossilOrigin-Name: c01bc2d19e8592fe3b1a5202926be649af96c783
2002-04-20 14:44:01 +00:00
drh 0ac6589202 Fix for ticket #1: Implement the GLOB and LIKE operators as functions that
can be overridden.  This way, a developer can change the LIKE operator to
be case sensitive, for example. (CVS 537)

FossilOrigin-Name: 51572bf71774d7631c7083be90b806e621bc9bee
2002-04-20 14:24:41 +00:00
drh 67505e78c6 Add support for saving the sqlite shell command-line history across sessions. (CVS 536)
FossilOrigin-Name: ca4abf3fe1f0e66802f9f98a20e0c8b82a6459aa
2002-04-19 12:34:06 +00:00
persicom c8cacb3704 Added rights release for Matthew O. Persico (CVS 535)
FossilOrigin-Name: 6c32c07e8218caffebd4503e7d8a90226ac81cdc
2002-04-19 01:00:12 +00:00
drh dd45df8a5b Change shell.c so that it will compile under windows. Shorten the help
command somewhat.  Add the state of ".header" to the output of ".show". (CVS 534)

FossilOrigin-Name: 0582168b8b853559b484f4a024d28c67192160c4
2002-04-18 12:39:03 +00:00
persicom 45698a3a03 Updated to match new shell.c functionality. (CVS 533)
FossilOrigin-Name: ff67ad40106a20fb85797cca4c495dc34ad5519b
2002-04-18 02:53:54 +00:00
persicom 1d0b872d43 Mistake in help text. Spurious trailing whitespace removed. (CVS 532)
FossilOrigin-Name: 4bdd040e4810565c91bcbb5f065580520c5e3c45
2002-04-18 02:53:04 +00:00
persicom 7e2dfdd726 General:
o Added global static chars mainPrompt and continuePrompt.
o Moved Argv0 declaration to head of file. Needed in do_meta_command,
  previously found below that.
o Added struct previous_mode_data to support new .explain toggle
  functionality.
o Added nullvalue, explainPrev and outfile members to
  struct callback_data.
o Added modeDescr array for number/text translation ofdisplay modes.
o Modified zHelp to match new functionality.

callback():
o Added support for .nullvalue

do_meta_command():
o Output filename is now saved to callback struct. If using stdout,
  then the string "stdout" is saved.
o Explain is now a toggle. When it is turned on, the current values of
  mode, header and colWidth are saved if not already in explain mode.
  When turned off, those values are restored.
o Allow .mode plurals columns and lines and dot command plural
  .headers.
o Added processing for new keywords .quit, .nullvalue, .show, .prompt.

main():
o Added -init as an option to override .sqliterc.
o Added -nullvalue as a command line option.
o Processes .sqliterc.

main_init():
o Genesis. Moved some initialization code here from inside main() so
  that it can be called initially by main and again if -init is
  specified.

one_input_line():
o Now takes prompts from settable values.

process_sqliterc():
o Genesis. Read .sqliterc from user's home directory and pass it to
  process_input(). File should contain meta commands for setups. (CVS 531)

FossilOrigin-Name: e751338c468cdad79efcc5cd5b924eb2c1eb3c3a
2002-04-18 02:46:52 +00:00
drh a168045f7d Fix for ticket #19: Do not call sqliteOsSync() if the only changes were
changes to TEMP tables. (CVS 530)

FossilOrigin-Name: 33da20b9c1a8eef16ad7ab5929bb8937c75090f2
2002-04-18 01:56:57 +00:00
drh fc6cdfe9dc When doing a ".dump" command in the command-line shell, make sure VIEWs
are created after TABLEs. (CVS 529)

FossilOrigin-Name: 7edd13468e24d79939f0fa1e58f3b686422ca826
2002-04-13 23:42:24 +00:00
drh 6b0e620fda Version 2.4.7 (CVS 528)
FossilOrigin-Name: 977abbaebe5433c66516d0376a1c229e45b5ab1f
2002-04-12 13:12:25 +00:00
drh adbe353fc6 Add tests to prevent a recurrance of bug #16. Also: put a hyperlink to the new
ticket screen on the main page of the website. (CVS 527)

FossilOrigin-Name: cdab6dad323dd1e95ec8b7684a7c4b06c75905e0
2002-04-12 13:11:52 +00:00
drh c8d30ac109 Fix for bug #15: Add the sqlite_changes() API function for retrieving the
number of rows that changed in the previous operation. (CVS 526)

FossilOrigin-Name: 6e71493b9dc77d508c3ce90562766789e87e6d80
2002-04-12 10:08:59 +00:00
drh b04a5d8768 Fix for bug #16: Check for invalid functions in the VALUES clause of an
INSERT statement. (CVS 525)

FossilOrigin-Name: 43a77f019d34e1a6b3f502ad0ec31a00c8fdbe6e
2002-04-12 03:55:15 +00:00
drh feeb1394ee Fix for bug #11: Output the correct row count when and INSERT does an
IGNORE action. (CVS 524)

FossilOrigin-Name: bb83642e9a6c1c9ade861618496933c9f922a8f8
2002-04-09 03:28:01 +00:00
drh fe1a1773a8 Fix for bug #10: Pop the stack by the right amount on an IGNORE so that the
stack does not grow without bound. (CVS 523)

FossilOrigin-Name: f46acfc3b828620e4e97b09f9aff119b9313e5d7
2002-04-09 03:15:06 +00:00
drh 8b32e17d26 Add a -column option to the sqlite command-line utility.
Patch from Matthew O. Persico. (CVS 522)

FossilOrigin-Name: 760bf568c882d7b28746b1e004309ef08d2ff4c0
2002-04-08 02:42:57 +00:00
drh 6ed41ad735 Added the last_insert_rowid() SQL function. (CVS 521)
FossilOrigin-Name: 6aca3f86bc08849e9d806fdd490f98e4daf71025
2002-04-06 14:10:47 +00:00
drh bf3a4fa4cb Make the FROM clause on a SELECT optional. If omitted, the result of
the SELECT is a single row consisting of the values in the expression list. (CVS 520)

FossilOrigin-Name: 28ce42f7872e2660faa22e66b508db9b1f046af0
2002-04-06 13:57:42 +00:00
drh 41e941dda6 Add an fflush() call to shell.c to insure that all output has been written
before we prompt for a new line of input. (CVS 519)

FossilOrigin-Name: 932274187e045ce331177b1a640ed62da4a22d94
2002-04-04 15:10:12 +00:00
drh 5447322939 Fix for bug #2: Add support for TABLE.* in SELECT statements. (CVS 518)
FossilOrigin-Name: c2320eabfe44d6eb05c02b76547e5bd48a29943c
2002-04-04 02:10:55 +00:00
drh f238f700c2 Added a hyperlink to the SQLite-PHP project. (CVS 517)
FossilOrigin-Name: ffdeec3087e168acaa04a6331e91369e2e0f8345
2002-04-03 20:50:21 +00:00
drh 7b7307fb7c Version 2.4.6 (CVS 516)
FossilOrigin-Name: 5ae7efd87f1a8e2f3e927bf373fbcb5c692d1a02
2002-04-02 13:27:43 +00:00
drh 3f6b548961 Fix for bug #8: Correctly handle terms of a WHERE clause in a join where the
term does not use a comparison operator. (CVS 515)

FossilOrigin-Name: abb12259a09418eb6e3cf573ea718ac58c91ac7b
2002-04-02 13:26:10 +00:00
drh 11f61696bc Version 2.4.5 (CVS 514)
FossilOrigin-Name: b18a7b777cf22249c81b74baafa1a74ad5a1836b
2002-04-02 02:00:02 +00:00
drh dd579122da Fix for bug #6: Correctly handle functions in the WHERE clause of a join. (CVS 513)
FossilOrigin-Name: bdd8ce584e16fe288a7e8386f897cb36a60e8431
2002-04-02 01:58:57 +00:00
drh 5efc18b6da Fix for bug #7: Correctly display the P3 operand in a VDBE trace when the
operand is really a pointer to a structure. (CVS 512)

FossilOrigin-Name: 734dde765b38d61feaa5520e6481c77022367892
2002-04-02 01:44:50 +00:00
drh 29f5befc43 Remove from the index page of the website hyperlinks that are not directly
related to SQLite. (CVS 511)

FossilOrigin-Name: 0cb5cfa814bceecea1a346535cac24ec8e2941d7
2002-04-01 12:15:02 +00:00
drh e1e68f4974 When an attempt is made to insert an explicit NULL into an INTEGER
PRIMARY KEY column, automatically convert the NULL value into a unique
integer key.  This was already happening when an implied NULL was
inserted - when the INTEGER PRIMARY KEY column was omitted from the
list of columns being inserted.  Patches from Christian Werner. (CVS 510)

FossilOrigin-Name: 9e3cf4aa2cb44932015b8bd3fd800d7678cb09b6
2002-03-31 18:29:03 +00:00
drh 035bd01d6a Version 2.4.4 (CVS 509)
FossilOrigin-Name: c4b6c0be00b9688a432bbd23736564a042f5d8ee
2002-03-30 15:32:08 +00:00
drh 132ebed2bf Update the change log to include the previous commit. (CVS 508)
FossilOrigin-Name: 81c4b749614cb0ca50bc52a3d4aac189af0222cd
2002-03-30 15:27:56 +00:00
drh f18543ca39 Fix for bug #3: Allow VIEW as a column name. Also allow COPY. (CVS 507)
FossilOrigin-Name: d2bdc0feeb3a3595850f40ab211df7a3963d6c30
2002-03-30 15:26:50 +00:00
drh edaa6ebfdd Describe the difference between the binary RPMs in the download.html file. (CVS 506)
FossilOrigin-Name: 8ce9a1fad2d8b20876b0557fa57515e0df74ed05
2002-03-30 14:15:51 +00:00
drh 203c211064 Combine the homerpm.sh file in with publish.sh. Update the website files to
refer to the new RPMs that are now being built.  Fix a small problem with
the spec file. (CVS 505)

FossilOrigin-Name: 57d4c7704794d0a28cbf67be3f90dbf81bf3b05d
2002-03-29 18:16:04 +00:00
doughenry 1d36650fa3 added a section to create a spec file and build the rpm files (CVS 504)
FossilOrigin-Name: e529143967a6fd4e65dea6a5ff68a7aabc36f787
2002-03-29 01:29:53 +00:00
doughenry 3c0d1ec01c these files are needed by publish.sh to build rpms (CVS 503)
FossilOrigin-Name: 3c25359376814e9c3912246d79528614a3499e5b
2002-03-29 01:28:45 +00:00
drh 2676a611ec Two typos fixed in the documentation (lang.html). (CVS 502)
FossilOrigin-Name: f0f241e1cc322ebed8f215b4b8ddcc0f5ee2ff65
2002-03-28 14:20:08 +00:00
drh d4037e801a Update the documentation to refer the reader to the CVS server for the change
log, bug lists, or the latest sources. (CVS 500)

FossilOrigin-Name: 2478ba866646d6d445b370554af9cd3d362b0e10
2002-03-27 12:52:47 +00:00
drh 41f03d1d26 Update the change log. (CVS 438)
FossilOrigin-Name: 9637b9aa5d405427ead52438eed8c626feac8658
2002-03-26 03:11:27 +00:00
drh 17a7f8ddab Added support for CASE expressions - patches from Dan Kennedy. (CVS 437)
FossilOrigin-Name: 836b59d057c3fb4087b138c9bfbc03392ddfb89d
2002-03-24 13:13:27 +00:00
drh 6b54e74cf4 Version 2.4.3 (CVS 440)
FossilOrigin-Name: 99d6764e57ddc7f0a321229cc1b7aa9a76f1aae5
2002-03-23 00:59:59 +00:00
drh f1a7a13928 The sqlite_get_table() function now returns an error if you pass in two
or more SELECT statements that return different numbers of columns. (CVS 436)

FossilOrigin-Name: e2558c34034cf49524084ec819df58934a8af983
2002-03-23 00:52:01 +00:00
drh 1cc3d75f69 Fix a bug in subquery generation when the subquery is a compound select.
Also added new tests to cover this case. (CVS 435)

FossilOrigin-Name: aaf7fd4cef04d3d70a0444aad1b606bfc663c3e8
2002-03-23 00:31:29 +00:00
drh 545c23dc42 Version 2.4.2 (CVS 441)
FossilOrigin-Name: 49d032325553fa1dd7f31b852753cc6c9226d8f7
2002-03-20 01:05:00 +00:00
drh 27a3220c54 One more change before 2.4.2: Make the os.h header file more robust in
detecting whether to use unix or windows. (CVS 434)

FossilOrigin-Name: c2e0b79057c9c643e7432e62c90399c8f34339f9
2002-03-20 00:00:29 +00:00
drh 5aed9c7410 Version 2.4.2 (CVS 433)
FossilOrigin-Name: b0805b606904e18800c9850b5aa33724c4619de8
2002-03-19 23:51:12 +00:00
drh f2d74ffb74 Fix an uninitialized variable in AggReset() (CVS 432)
FossilOrigin-Name: 3dcdeae7f620736c1eae52ad78db1efb886ea9c3
2002-03-18 13:03:54 +00:00
drh 84e5920738 Bug fix: allow ROWID as a column in SELECT statements where the FROM clause
includes views which are flattened. (CVS 431)

FossilOrigin-Name: a3a360b308e45eaaf19efda80e30f2d420799cf2
2002-03-14 14:33:31 +00:00
drh 38b360bb80 Version 2.4.1 (CVS 442)
FossilOrigin-Name: 9f12b8805fd2f9a3422ed2a46190cfc881c87b36
2002-03-13 18:59:59 +00:00
drh 51fa3215fa Version 2.4.1 (CVS 430)
FossilOrigin-Name: 9333ecca1e48bfca613d6909498f91ca3a53d53d
2002-03-13 18:54:50 +00:00
drh 094b2bbfc7 Fix bug in anonymous subquery in a join. Parser requires a semicolon or
end-of-input before executing. (CVS 429)

FossilOrigin-Name: c0e3f1c592f583a0659901743a368aff1927f1cb
2002-03-13 18:54:07 +00:00
drh 56c0e926f1 Fix the return type of the xStep function in the FuncDef structure
definition. (CVS 428)

FossilOrigin-Name: 753adb789e1624ceeb52066df350dcd99aa4e3df
2002-03-12 23:10:04 +00:00
drh 1f245e488a Change the way that lemon handles %extra_argument. (CVS 427)
FossilOrigin-Name: ffc387a48a9864b7f323314fbf8295b5bb2a3bd1
2002-03-11 13:55:50 +00:00
drh 54ea6427df Version 2.4.0 (CVS 443)
FossilOrigin-Name: d3f66b44e501ac30aededefbec7ebe224cf080ad
2002-03-11 02:15:00 +00:00
drh 28b4e4890b Preparing for the 2.4.0 release. (CVS 426)
FossilOrigin-Name: 9f5b241cb2fc89f66d3762b4b4978b8e114caf53
2002-03-11 02:06:13 +00:00
drh 7218ac7098 Bug fix: updates within a transaction would fail if there was existed
a temporary table. (CVS 425)

FossilOrigin-Name: 02cc2d60b2a5ee50efdbd90df90810ba559a453f
2002-03-10 21:21:00 +00:00
drh 5191b7e699 Added prototypes to sqlite.h for sqlite_freemem(), sqlite_libversion()
and sqlite_libencoding(). (CVS 424)

FossilOrigin-Name: 145516c93b1a03231e7d84f7f799a39655d7aa99
2002-03-08 02:12:00 +00:00
drh acd4c69580 Fix a bug in the sorting of compound selects. (CVS 423)
FossilOrigin-Name: 0a51323561b7235d46621d9fa25c7111b81c528f
2002-03-07 02:02:51 +00:00
drh 2a0e11df42 Beta 2 (CVS 422)
FossilOrigin-Name: 6c3fb5470ea94bfc99833ff1c78981262c9165eb
2002-03-06 22:04:21 +00:00
drh cd61c2816f Added the default_cache_size and default_synchronous pragmas. Added additional
tests for pragmas.  Added a new speedtest script. (CVS 421)

FossilOrigin-Name: 161c0c5f5db66815e4345c9b5f7a600c03a67475
2002-03-06 22:01:34 +00:00
drh e684090012 Optimizations to the processing of integer comparisons. (CVS 420)
FossilOrigin-Name: b7a7dae919be0e4c35b1fe8cb24fa7359a4b1200
2002-03-06 03:08:25 +00:00
drh 4b845d7ef4 Change the pager locking mechanism so that we don't have to write page 1
to the journal and to the database unless it actually changes. (CVS 419)

FossilOrigin-Name: 480eef1a3a4f049bc0d0cbee32dc8a8d138597c6
2002-03-05 12:41:19 +00:00
drh 603240cf5d Add the ability to turn of calls to fsync() using the "synchronous" pragma.
Increased the default cache size from 100 to 2000 and made the "cache_size"
pragma persistent. (CVS 418)

FossilOrigin-Name: 414da4af1f4aebc3936ca339fbc7932add081912
2002-03-05 01:11:12 +00:00
drh ef2daf547d Updates to the documentation. Changed version number to 2.4.0-beta1 (CVS 417)
FossilOrigin-Name: 36a8fe0ad0ee2a67afafc04125dcc085ec1b5a13
2002-03-04 02:26:15 +00:00
drh 4ff6dfa7de More bugs fixed for views. (CVS 416)
FossilOrigin-Name: 813077623087ffc6cd506f57cf6d1e3d9239f806
2002-03-03 23:06:00 +00:00
drh 417be79cd1 VIEWs are bound to tables when they are used, not when they are first
entered.  This works around the problem of what to do if a table is deleted
that a view refers to. (CVS 415)

FossilOrigin-Name: 6121e5ab9328c90c64d40ade3de73ad11d4aaf4e
2002-03-03 18:59:40 +00:00
drh 75148a27b4 Fix a memory leak in expression processing. (CVS 414)
FossilOrigin-Name: dfe431c9b70bc3a1bf5148826edce0846737e66b
2002-03-03 03:42:31 +00:00
drh c0a165b304 Additional tests of flattening (CVS 413)
FossilOrigin-Name: e1d93c5923195507642d882fff8cd85c454f69ee
2002-03-03 03:11:15 +00:00
drh 2d0794e325 Suppress superfluous OP_OpenTemps when flattening subqueries. (CVS 412)
FossilOrigin-Name: 000441c8fec48cc172894eb767ae9549b8ed8c34
2002-03-03 03:03:52 +00:00
drh 1b2e032999 Bug fixes and additional tests for the subquery flattener. (CVS 411)
FossilOrigin-Name: 2c05389eda391e38894fc6969e29766df82a8fec
2002-03-03 02:49:51 +00:00
drh 30e58750c1 Pager optimization: do not write or journal free pages. This results in
a 2x performance gain for large INSERTs and a 5x performance gain for
large DELETEs. (CVS 410)

FossilOrigin-Name: cf1ebcfb741786f84a596c406f4c492f68cbe881
2002-03-02 20:41:57 +00:00
drh f9ffac96a7 Change the btree node balancers to sort nodes into accending order. This
improves insert and delete speed by 25%. (CVS 409)

FossilOrigin-Name: abbb999d4fc3fe142567b6ede5e625e7bf0da714
2002-03-02 19:00:31 +00:00
drh 832508b7ea Subquery flattening is implemented and passes all regression tests.
We still need to add addition tests to the suite to further exercise
the flattener, however. (CVS 408)

FossilOrigin-Name: d5d3e79cc58da5bd315cc1fea1f7cbf46274da16
2002-03-02 17:04:07 +00:00
drh 567c604bb5 Bug fix when -DMEMORY_DEBUG is off. (CVS 407)
FossilOrigin-Name: e14b0c82f3514f41934a7c0d173b6fdb186aafc8
2002-02-28 04:10:29 +00:00
drh 47c8a67907 Fix bugs in substr() for UTF-8. (CVS 406)
FossilOrigin-Name: e9fd9e7b0fed445b48e7024ecde0354fff1478a6
2002-02-28 04:00:12 +00:00
drh 653bc75992 Remove unused opcodes from the VDBE and fix a bug in the substr() function. (CVS 405)
FossilOrigin-Name: e8611e0c052ddac477f83df485fa5dc882593de0
2002-02-28 03:31:10 +00:00
drh fbc990826c Change the IFNULL and NVL functions to COALESCE. Change MIN and MAX so that
they require at least one argument. (CVS 404)

FossilOrigin-Name: 7d86749d4a78d05930bae2b6491d9428f06fe836
2002-02-28 03:14:18 +00:00
drh 89425d5e02 The new function code passes regression tests. (CVS 403)
FossilOrigin-Name: b00cf110b1cc671b7200a5ce8b9e704f660763c9
2002-02-28 03:04:48 +00:00
drh f55f25f02f Fix the coredump. There are still problems in the test suite though. (CVS 402)
FossilOrigin-Name: 6af10cc53acc1ffa60de3f0d5880a6b72815404c
2002-02-28 01:46:11 +00:00
drh 3212e18238 Added IFNULL and NVL functions. (CVS 401)
FossilOrigin-Name: c6a85c8ee3d653a294bcc033ac6cab2b6de06f96
2002-02-28 00:46:26 +00:00
drh 0bce8354b4 Completely remove the old SQL function system and replace it with the
new user functions.  The code currently compiles but it coredumps on the
test suite.  Do not use in its present state. (CVS 400)

FossilOrigin-Name: 50797fee5066ec9ea23b720e5ab7e8fc8ccc1988
2002-02-28 00:41:10 +00:00
drh dd5baa95e8 Try to reduce the number of malloc() for user-defined functions. Begin
transfering built-in functions over to the user-define function
mechanism. (CVS 399)

FossilOrigin-Name: c4f9e017b449d4036fa8d2bf77b931d4c31d74f7
2002-02-27 19:50:59 +00:00
drh 1350b030c1 Revise the API for user-defined functions. (CVS 398)
FossilOrigin-Name: 633951f0fa11c91f93aa2862df84691750c01e73
2002-02-27 19:00:20 +00:00
drh 4e0f995347 The user-defined function routines failed to detect a malloc() failure. (CVS 397)
FossilOrigin-Name: 085b0d671a1dac964693d69d866224de155dfe4c
2002-02-27 01:53:13 +00:00
drh ff78bd2f07 Bug fixes in the VIEW implementation. (CVS 396)
FossilOrigin-Name: 668ef6380eba256ef82477b63aef850249a619a0
2002-02-27 01:47:11 +00:00
drh a2ed56016f Comment changes only. (CVS 395)
FossilOrigin-Name: 63b87f2ea6cd78f039bf40026d21b18de20b3ba7
2002-02-26 23:55:31 +00:00
drh cd7d2732bf Fix a bug in the quoting of .dump output. By Rajit Singh. (CVS 394)
FossilOrigin-Name: f2310f36d53e9176be7af620ecdf1e5a1dfd4388
2002-02-26 23:24:26 +00:00
drh d3a149efca Added a "stddev()" aggregate function for testing the new user aggregate
function interface. (CVS 393)

FossilOrigin-Name: 2198109712ccf988f93db5740a4f248e80fb9f5d
2002-02-24 17:12:53 +00:00
drh e5095355d6 Code for user-defined aggregates added. Legacy tests all pass but there
has been no testing of the new user-defined aggregate code. (CVS 392)

FossilOrigin-Name: 1e037eb303d8508cb2ea3418e71b03315d895fbd
2002-02-24 03:25:14 +00:00
drh dc04c58360 Move the build-in function definitions into a new source file "func.c". (CVS 391)
FossilOrigin-Name: 530b0f4f2def89e200b7b0724a5967bf981bd91d
2002-02-24 01:55:15 +00:00
drh 8e0a2f903a Added support for user-defined normal functions. Support for user-defined
aggregates is pending. (CVS 390)

FossilOrigin-Name: c490a1ff951c5d4a2de8e4f8d349189bfaef7f74
2002-02-23 23:45:45 +00:00
drh b29b0a5227 Modify lemon to use much less memory for its parser tables. This reduces
the size of the library by 50K, which is important for an embedded library. (CVS 389)

FossilOrigin-Name: 67a135a051e7c96ddbfe85976539b4b8372c7026
2002-02-23 19:39:46 +00:00
drh b59499c73b Bug fix in lemon: 3-way conflicts (SHIFT/REDUCE/REDUCE) were not detected or
resolved.  This is now fixed.  Also, table compression works a little better. (CVS 388)

FossilOrigin-Name: 8da0ac9a8bb859377613dd18f4f423eb49c7338b
2002-02-23 18:45:13 +00:00
drh a76b5dfca6 Code to implement CREATE VIEW is in place. A quick smoke test shows that
it works, but there are probably still many bugs. (CVS 387)

FossilOrigin-Name: 39fed2df11382b9855d518502a6c2ca200fa66b8
2002-02-23 02:32:10 +00:00
drh 17f7193434 Change the SQLITE_MASTER format to version 2 in preparation for adding views. (CVS 386)
FossilOrigin-Name: b2a9807fed544e83002366149b9a363759338c5d
2002-02-21 12:01:27 +00:00
drh 2af0b2d78f Do not allow dot-commands to occur in the middle of a real SQL command. (CVS 385)
FossilOrigin-Name: ffb00bf36a9a5851ea4a69f9c7dd7ce412553e3b
2002-02-21 02:25:02 +00:00
drh 77c679c096 Fix a comment. (CVS 384)
FossilOrigin-Name: 953928537c350e6c9df157553114c6d9d44712d5
2002-02-19 22:43:58 +00:00
drh 5cf8e8c7fa New ROWIDs are numbered sequentially. (CVS 383)
FossilOrigin-Name: 1686196a8aea326f616bc8205df99cd84d955ec4
2002-02-19 22:42:05 +00:00
drh 9562b55115 Optimize simple min() and max() queries. (CVS 382)
FossilOrigin-Name: cc5abfe392bdb8c3ed00e0610bc2b41851bfc9d7
2002-02-19 15:00:07 +00:00
drh aaab5725db Change the name of the sanity_check PRAGMA to "integrity_check" and make
it available on all compiles. (CVS 381)

FossilOrigin-Name: c6e9048e66c8d8e2d5f6c62aa724eef3e9d9f572
2002-02-19 13:39:21 +00:00
drh a80a1e6ae4 Version 2.3.3 (CVS 444)
FossilOrigin-Name: 72c5a92aa6e3ae712af152cff8d1dc5b997b538e
2002-02-19 00:30:00 +00:00
drh 9e2751da83 Final changes before 2.3.3 (CVS 380)
FossilOrigin-Name: a53de7625ac300ba3e61eed2e983010da8fa027b
2002-02-19 00:15:12 +00:00
drh b1feb840df Added a C wrapper program to test threading under Unix. (CVS 379)
FossilOrigin-Name: 8d5634a4470a8145c0fbd0b843d55371d2f95e81
2002-02-18 22:50:26 +00:00
drh 0a36c57eb0 Bug fix: CREATE TABLE, followed by DROP TABLE within the same transaction is
working now. (CVS 378)

FossilOrigin-Name: 553579f936b3a4477c6adfd991adccd06280bfd2
2002-02-18 22:49:59 +00:00
drh 969fa7c128 Add support for CREATE TABLE AS. (CVS 377)
FossilOrigin-Name: 78a50971e9adc8739e7888201c79465a40e1a152
2002-02-18 18:30:32 +00:00
drh e64e7b203e Allow general expressions in the VALUES clause of an INSERT statement. (CVS 376)
FossilOrigin-Name: ec1f3fae6f8cd8466892cd370e1802e492a76e6e
2002-02-18 13:56:36 +00:00
drh cf9095061c Additional tests for the sub-query feature. (CVS 375)
FossilOrigin-Name: a0019fce701fc858134f0a33bda9a511e41a09f8
2002-02-18 13:35:33 +00:00
drh 5ae7af7cc2 Enhancement to Windows "file-exists" function by Joel Lucsy. (CVS 374)
FossilOrigin-Name: d3d59261da9bef3250e99444167ad6ef98764574
2002-02-18 12:48:45 +00:00
drh d820cb1b75 Test and documentation updates for sub-queries. (CVS 373)
FossilOrigin-Name: 607c0c49b2098771020514198cb1076de8245a62
2002-02-18 03:21:45 +00:00
drh 22f70c32f0 Add support for subqueries in the FROM clause of a SELECT. Still need
to add tests for this feature. (CVS 372)

FossilOrigin-Name: 89ffa9ff132858b62a91df1fb7fe49b2d58c01e7
2002-02-18 01:17:00 +00:00
drh 1d83f05257 Make the sqliteParseInfoReset() function locale to the select.c file. (CVS 371)
FossilOrigin-Name: 2336b1eadaedf2556a1988acc7bdf133135154dc
2002-02-17 00:30:36 +00:00
drh 2f4392ff5b All identifiers to be quoted in square brackets, for compatibility with
MS-Access. (CVS 370)

FossilOrigin-Name: e17a858c9eeb70c62f54c88e6be5897e58d67301
2002-02-14 21:42:51 +00:00
drh cffa014dc3 Version 2.3.2 (CVS 446)
FossilOrigin-Name: 4d067000077ee8f0221a7940232dc658c7f04b49
2002-02-14 12:59:59 +00:00
drh 1e336b42f1 Fix an incorrect assert() in pager.c. (CVS 369)
FossilOrigin-Name: 08a68e098a677c508652ba2ff4bd63185cab7546
2002-02-14 12:50:33 +00:00
drh 3cf9084a37 Version 2.3.1 (CVS 445)
FossilOrigin-Name: 846148d6e3fd0529abfef3f819e4a7cb91e44422
2002-02-13 23:29:59 +00:00
drh 976658734c Bug fix: if PRAGMA full_column_names=ON is set and you do a query like this:
"SELECT rowid,* FROM ...", then an assertion failed.  Bummer. (CVS 368)

FossilOrigin-Name: df6bf627a51358e8b14297403feab7b888c38580
2002-02-13 23:22:53 +00:00
drh 3e3a8ab13f Version 2.3.0 (CVS 447)
FossilOrigin-Name: 4c7dfd93530a2a3e50e78235f4e691a5fec109fe
2002-02-03 19:30:00 +00:00
drh 8c87e6e0ff Reenable testing code even if NDEBUG is defined. (CVS 367)
FossilOrigin-Name: 0090c279d83ee355fbac8a484401d29bfa50b0dc
2002-02-03 19:15:02 +00:00
drh 24e97df9c7 Fix a serious bug in INSERT when the source is a SELECT. (CVS 366)
FossilOrigin-Name: 20ea737536700b016385c70105a2af8b2bffce2b
2002-02-03 19:06:02 +00:00
drh 1bffb9c84f Put in PRAGMA SANITY_CHECK in place of VACUUM. (CVS 365)
FossilOrigin-Name: 7c65029e5bf26eb640aef529a7421cd0d6ffd1a9
2002-02-03 17:37:36 +00:00
drh 1dd397f091 The VACUUM command now does a database sanity check. (CVS 364)
FossilOrigin-Name: 95d1f8389dd5e168bdf0290169662296b6a0f6d9
2002-02-03 03:34:07 +00:00
drh 0d65dc0e90 Five-algorithm conflict resolution appears to be working. (CVS 363)
FossilOrigin-Name: 0115518f8e4591123582e3d2bb67282111ebcf60
2002-02-03 00:56:09 +00:00
drh 663fc63a77 Get the ABORT conflict resolution algorithm working. (CVS 362)
FossilOrigin-Name: 9be4d4c6f12056782966396dca0b8e2d384d0cf2
2002-02-02 18:49:19 +00:00
drh fa86c4127d Checkpoint code added to the pager. Regression tests work but the new APIs
have not been tested yet. (CVS 361)

FossilOrigin-Name: aaa53e113ef849e34883ead8ae584c722ad967db
2002-02-02 15:01:15 +00:00
drh 1c92853dac Change to five conflict resolution algorithms: ROLLBACK, ABORT, FAIL,
IGNORE, and REPLACE.  This checkin is code only.  Documentation and
tests are still needed.  Also, ABORT is not fully implemented. (CVS 360)

FossilOrigin-Name: d0e7cf4a83e6abad7129bed356b7492dddaff474
2002-01-31 15:54:21 +00:00
drh b419a926d4 Added ON CONFLICT support to COPY. Updates to documentation. Bug fixes. (CVS 359)
FossilOrigin-Name: cf1538d71c9ce12d5e59f367e03642cbcaf6b717
2002-01-30 16:17:23 +00:00
drh ef6764a1d9 Better testing of the ON CONFLICT logic. (CVS 358)
FossilOrigin-Name: 9bbddb8e013b47547164f71f2d7abd995f8d7385
2002-01-30 04:32:00 +00:00
drh bb37fdc782 More bug fixes in the ON CONFLICT enhancement. (CVS 357)
FossilOrigin-Name: 8229b5f6a348a56432a4a609ee125520c5831973
2002-01-30 00:54:55 +00:00
drh 0ca3e24b2e The new ON CONFLICT logic is in and passes the legacy tests. But the
new capabilities have not been tested and are likely broken. (CVS 356)

FossilOrigin-Name: ac8a4189e2a0c41161ee359db25de94435420368
2002-01-29 23:07:02 +00:00
drh 9cfcf5d4f6 Beginning to insert the infrastructure for ON CONFLICT clauses. (CVS 355)
FossilOrigin-Name: e00a9ff8f99dd58f7cb19a6195fac21f4c8b4af9
2002-01-29 18:41:24 +00:00
drh 881a99e493 Version 2.2.5 (CVS 448)
FossilOrigin-Name: af3bb80810c6cd302a884a106cc70591a738e102
2002-01-28 15:59:59 +00:00
drh 6b12545f4f Bug fix: The IN operator was not working if either side derived from
an INTEGER PRIMARY KEY. (CVS 354)

FossilOrigin-Name: dbcfe198fbaa155874ef82a96b6a4b993ccf3931
2002-01-28 15:53:03 +00:00
drh 71172c5c51 Do not escape the backslash character in shell output. (CVS 353)
FossilOrigin-Name: 5f8c097ebef28315ac2335a768d101e995ccbba2
2002-01-24 00:00:21 +00:00
drh a0f07f1919 Version 2.2.4 (CVS 449)
FossilOrigin-Name: 16712dae4feedd001d8153141a55e298b3a80a94
2002-01-22 14:15:00 +00:00
drh 9208643d2a Constant ORDER BY or GROUP BY expressions are an error. (CVS 352)
FossilOrigin-Name: 035984a5b00b4a1a6505405f40b15c7695283c0a
2002-01-22 14:11:29 +00:00
drh 7613bfae56 Fix a bug in the -separator command-line option. (CVS 351)
FossilOrigin-Name: 593c986f694b14839b2a2ed1da4da468c53fefa5
2002-01-22 12:39:24 +00:00
drh a2e00042a1 The right-hand side of an AS in a SELECT can be used within expressions of
the WHERE, ORDER BY, GROUP BY, and/or HAVING clauses. (CVS 350)

FossilOrigin-Name: 3684beab0f8a71ebdf453871bbde7a9ab1f65385
2002-01-22 03:13:42 +00:00
drh 555fcb489b Version 2.2.3 (CVS 450)
FossilOrigin-Name: a4fe893ce7cdec0d8a4f8cdc640b8967dce7763e
2002-01-16 21:04:59 +00:00
drh af9ff33ac1 Added the last_insert_rowid API function. Improved documentation of
the random ROWID algorithm. (CVS 349)

FossilOrigin-Name: f74d61aaf3fec06cde2c4a6f1465f86ac9058ad2
2002-01-16 21:00:27 +00:00
drh a297b5c3cf Added implementations for sqliteOsEnterMutex() and sqliteOsLeaveMutex(). (CVS 348)
FossilOrigin-Name: f8a026a3ca14ef0b0d562029dd6b184f060457f4
2002-01-15 18:39:43 +00:00
drh 1ab4300ebc Fix warning messages in VC++. Patches from nicolas352001. (CVS 347)
FossilOrigin-Name: f3038d218c91b44b70b75a7b881ea24c87fa6a02
2002-01-14 09:28:19 +00:00
drh 75c3edf8eb Version 2.2.2 (CVS 451)
FossilOrigin-Name: 7da00a33fece0b03b88c5103ce2b57e4d74ba2e4
2002-01-14 03:00:00 +00:00
drh 9647ff85fe Fix a bug that could cause UPDATE to fail for a table that contains
both an INTEGER PRIMARY KEY and an index. (CVS 346)

FossilOrigin-Name: 96cd07a881d7bea86a66d7dfe54713be9c81cb4c
2002-01-14 02:56:24 +00:00
drh da9e034610 Fix a problem with the way temporary tables mask permanent tables. (CVS 345)
FossilOrigin-Name: ba89da603135e5f63f6f97ba3adad02682375c07
2002-01-10 14:31:48 +00:00
drh be67d9cb4b Version 2.2.1 (CVS 452)
FossilOrigin-Name: 61c38f3bfef430f39aa98e9e7fa37324132b4381
2002-01-09 13:44:59 +00:00
drh af989ba546 Homepage changes prior to version 2.2.1. (CVS 344)
FossilOrigin-Name: e78b1ea23ccda4bc476fbb070586dcac2cc83331
2002-01-09 13:35:11 +00:00
drh d229ca9406 Continued work on the DROP/CREATE problem. (CVS 343)
FossilOrigin-Name: 0a3aa99e11ec9803cea646092bc21676e75a6670
2002-01-09 13:30:41 +00:00
drh 74e24cd0fa Working on a bug: Dropping and recreating a table within a transaction
causes an assertion failure. (CVS 342)

FossilOrigin-Name: b3656a5cfef91c89de2cbb9790087d0d53c03e6f
2002-01-09 03:19:59 +00:00
drh 3a88fbda19 Added a manpage from A. Rottmann. (CVS 341)
FossilOrigin-Name: 7deb62241300ff23af5a78dd855f0f69e5f16ffd
2002-01-07 19:58:43 +00:00
drh 462768612b Makefile changes from Andreas Rottmann (CVS 1725)
FossilOrigin-Name: 7910bc7885ddbd90400c3c50014bba499e34d53d
2002-01-07 19:04:22 +00:00
drh e638bbf820 Makefile changes from Andreas Rottmann (CVS 340)
FossilOrigin-Name: e7004afbf808b6389e67e8a335c610227c76101b
2002-01-07 19:04:21 +00:00
drh aacc543e23 Comment updates most. Also some small changes to the VDBE. (CVS 339)
FossilOrigin-Name: 9b0be4fcc1cbca69f5fee906f86dfb36a323fe84
2002-01-06 17:07:40 +00:00
drh c6b52df32d An attempt to delete a single row using a WHERE clause that specifies
the rowid would result in an error if the rowid did not exist.  This
problem has been resolved. (CVS 338)

FossilOrigin-Name: 011be9a9d2632d261489005d97c69b0a0bc5a108
2002-01-04 03:09:29 +00:00
drh c839258651 Comment changes. Change the use of BTree so that either the key is
an integer or the data is empty. (CVS 337)

FossilOrigin-Name: 18e606f7486eb3a4ab128504d88a44f53d39e5b2
2001-12-31 02:48:51 +00:00
drh f7f07c7aef Version 2.2.0 (CVS 453)
FossilOrigin-Name: 6bb62d8fab621b79b2fd1601669b1d4c8a547774
2001-12-22 21:59:59 +00:00
drh 9aa028daa2 Bug fix in the out-of-order INSERT. (CVS 336)
FossilOrigin-Name: a26d0880b20ca5534400a3689d1da31fe6aaa934
2001-12-22 21:48:29 +00:00
drh e7ec22019d Update documentation for the 2.2.0 release. (CVS 335)
FossilOrigin-Name: 14392258c5b6385091be8d684e3ea6841941b483
2001-12-22 19:27:39 +00:00
drh 8aff10153e Bug fixing in the new integer primary key code. (CVS 334)
FossilOrigin-Name: 29cab124b4f7eae9d9feb60d2f3a2c443fd9b9aa
2001-12-22 14:49:24 +00:00
drh 4a32431ce7 Added support for the INTEGER PRIMARY KEY column type. (CVS 333)
FossilOrigin-Name: 236a54d289e858a1e0505a20d907a2a40c01b521
2001-12-21 14:30:42 +00:00
drh 7c917d196f Added the ability to say things like "SELECT rowid, * FROM table1;" (CVS 332)
FossilOrigin-Name: ffbdd43f5de62e7bf81631c83473aca29c3a6c98
2001-12-16 20:05:05 +00:00
drh 6446c4dc67 Comment and documentation changes. (CVS 331)
FossilOrigin-Name: e8595579a5218aa3f344f967a23ac52ea89daca1
2001-12-15 14:22:18 +00:00
drh a3cf986fa5 Version 2.1.7 (CVS 454)
FossilOrigin-Name: 0d44465347125c8e7e962ffb67213f9953a9b7ab
2001-12-15 03:04:59 +00:00
drh c38f3d510c Typo in change log fixed. (CVS 330)
FossilOrigin-Name: 3a31daf6465b989a2b0790a2d1ba22ff955486a0
2001-12-15 03:00:42 +00:00
drh 4cbd68f805 Release 2.1.7 (CVS 329)
FossilOrigin-Name: 71cb9e8ad7616b1f84dc04700685bd4dc157d2db
2001-12-15 02:58:18 +00:00
drh 0ce92edd57 Fix a bug in the sqliteBtreeFirst() function which was causing the first
row of a table to be repeated during a scan. (CVS 328)

FossilOrigin-Name: 1404ac076b2155778b6b21546b30df6f45ea7ba7
2001-12-15 02:47:28 +00:00
drh 653851f577 Fix a critical bug in the creation of temporary tables. (CVS 327)
FossilOrigin-Name: 96f707413699eec16053a0323affbe8bf3760c14
2001-12-15 02:35:59 +00:00
drh 251d4b870d Version 2.1.6 (CVS 455)
FossilOrigin-Name: 6ecd90b6c3f3616af78b5ac6323e0f2e883a61c9
2001-12-14 15:14:59 +00:00
drh a7fcb05988 Fix a race condition in the locking code that would sometimes cause
SQLITE_PROTOCOL or SQLITE_CORRUPT to be returned when SQLITE_BUSY should
have been returned. (CVS 326)

FossilOrigin-Name: b0d218876442187af08161d989e6887b1cb4130c
2001-12-14 15:09:55 +00:00
drh 6a6cfb9b31 Version 2.1.5 (CVS 456)
FossilOrigin-Name: 8e90ad552fad83568297202848fe7eb2b63db33d
2001-12-06 13:30:00 +00:00
drh 2cf65aad6c Bug fix in the sqliteOsLock() and sqliteOsUnlock() routines of POSIX.
Version 2.1.5. (CVS 325)

FossilOrigin-Name: 669454060867593290c1ce8c45bd87d011976289
2001-12-06 13:24:14 +00:00
drh 7df884e0d6 Version 2.1.4 (CVS 457)
FossilOrigin-Name: 121c522e673cc2a2176582981cc5cd8694095337
2001-12-05 00:59:59 +00:00
drh 208611fbca Minor changes prior to 2.1.4 (CVS 324)
FossilOrigin-Name: 2fb22adbd15740d5e1581d4114cdf5149e0b62dc
2001-12-05 00:46:02 +00:00
drh 03c1e9262e Version 2.1.4 (CVS 323)
FossilOrigin-Name: 003f967e8749903af859ad81a8a57767ea20ddec
2001-12-05 00:22:00 +00:00
drh b8ca307e7b Bug fix: sqlite_exec() would sometimes return SQLITE_PROTOCOL when it
should have returned SQLITE_BUSY.  There was also a deadlock that the
previous bug was masking. (CVS 322)

FossilOrigin-Name: 585ed5ebf1c1afc8ae1d569b121208018d8ecd49
2001-12-05 00:21:20 +00:00
drh 6ff13859d5 Add the ability to do a single .command as the second argument
to the command-line shell. (CVS 321)

FossilOrigin-Name: 653f37c365a0b5d59c11b7dbba57905ffaeff2dc
2001-11-25 13:18:23 +00:00
drh e68fefdaa5 Fix typos. (CVS 320)
FossilOrigin-Name: 3be8a189e8ccf8a82acc4ee72cc75b6cc92aa193
2001-11-24 13:50:53 +00:00
drh e91d6fd3c3 Typos fixed. (CVS 319)
FossilOrigin-Name: e86a68c5ace984da09d3ce44dae5d501ec0d0eec
2001-11-24 13:36:30 +00:00
drh 59fefbab1a Update the FAQ. Change the GMT timezone label to UTC on all files. (CVS 318)
FossilOrigin-Name: f1a5808288e4204aee03531de0b9e6646062bd94
2001-11-24 13:23:04 +00:00
drh 44ebccbe26 Version 2.1.3 (CVS 458)
FossilOrigin-Name: 974d42839b6ced9c9b9ea14abec0c4723388a991
2001-11-24 00:45:00 +00:00
drh 7a7c73905d Fix comparison functions so that they are consistent with the order
of elements in indices.  Fix the handling of large integers. (CVS 317)

FossilOrigin-Name: fc2aae04578c305304a45ec6b76d3ab216cc7526
2001-11-24 00:31:46 +00:00
drh ece4ea4af4 Version 2.1.2 (CVS 459)
FossilOrigin-Name: f14835df32b4a16c840b8827f0c17f0e6d526312
2001-11-23 00:30:00 +00:00
drh f5bf0a78be Fix a bug in DROP TABLE that could cause SQLITE_MASTER table corruption.
The root problem was that the sequence of BTree operations (Delete, Next)
would not always leave the cursor pointing at the first entry after the
entry that was deleted.  A consequence of this error was that a DROP TABLE
on a table with indices would not always remove every index associated
with that table from the SQLITE_MASTER table.  Subsequent attempts to
open the database will fail when the index for the missing table was
parsed.  Changes have also been made to ignore extra indices in the
SQLITE_MASTER table so that a database previously corrupted by this bug
is once again readable. (CVS 316)

FossilOrigin-Name: 8a984667113564f2bac7412165b6ff8b7e3e8f70
2001-11-23 00:24:12 +00:00
drh c3a64ba0a6 Fix a bug in the locking protocol. (CVS 315)
FossilOrigin-Name: a9db1c12c5a4d5741de0e5eb5aa87c647a5646b8
2001-11-22 00:01:27 +00:00
drh 5a2c2c20af Attempting to add support for 64-bit platforms. (CVS 314)
FossilOrigin-Name: 03673adbfe0c8a92d79f86ddf1136736594208ad
2001-11-21 02:21:11 +00:00
drh bc1bd58acf Version 2.1.1 (CVS 460)
FossilOrigin-Name: be228cd13a4dcb7fdf7014910b7c61d502cb9a01
2001-11-13 19:44:59 +00:00
drh f6e515b804 Bug fix: Be sure to sends NULLs to the callback when the column value is NULL. (CVS 313)
FossilOrigin-Name: 207a57ad2e4e1a44a4c0231b1ba334594402d6cd
2001-11-13 19:36:55 +00:00
drh a84f6005a9 Bug fix: Sometimes NULL results were not being passed as nulls to the
callback function. (CVS 312)

FossilOrigin-Name: 94ce8282360d4a0dd2032564aae06f0f1902cb5b
2001-11-13 19:35:14 +00:00
drh 606c0ddcfc Version 2.1.0 (CVS 461)
FossilOrigin-Name: 56d8390e47bbf8f97fa602863af4c65ac755964e
2001-11-12 14:00:00 +00:00
drh 7900eaded1 Update change log prior to release of 2.1.0. (CVS 311)
FossilOrigin-Name: 6b3ccb37bf4c10b2d8f96ef8efc22ed8253f1886
2001-11-12 13:51:43 +00:00
drh 84e6b7b5ae Fix to the SUBSTR() function and to the bigrow test. (CVS 310)
FossilOrigin-Name: 8437076c25330759ae058918a8190df26d0881da
2001-11-12 13:10:52 +00:00
drh 778326010c Version 2.1.0 prerelease (CVS 309)
FossilOrigin-Name: 4f4ac42214610d900a5d6db63a511d9e7b22f0f9
2001-11-12 12:43:22 +00:00
drh 58a11680d1 Comment changes (CVS 308)
FossilOrigin-Name: 2d2ad264aad6fbdcef586e73d750e3fde842252f
2001-11-10 13:51:08 +00:00
drh 04096485f4 Minor bugs fixed. (CVS 307)
FossilOrigin-Name: 6e7e7dbf8e93d00eced88404aed792fcf9e75b7d
2001-11-09 22:41:44 +00:00
drh ce927065c2 Bug fixes. (CVS 306)
FossilOrigin-Name: 84997fda33fd6ce93b821d3da3a7251cf60e06ec
2001-11-09 13:41:09 +00:00
drh 487ab3ca18 The new code for taking advantage of inequalities in WHERE clauses
is in place.  It appears to work. (CVS 305)

FossilOrigin-Name: 262bcd17df19f45def6144b5a7e0602ca5b03deb
2001-11-08 00:45:21 +00:00
drh 6b56344d4a New Next opcode and indexing style implemented. (CVS 304)
FossilOrigin-Name: decbeb9151885fee473b3fa58c8cf78a2338d2d8
2001-11-07 16:48:26 +00:00
drh 8721ce4ae7 Incremental update. We are in the middle of modifying the index system
to support range queries without doing a complete table scan. (CVS 303)

FossilOrigin-Name: e6ca23fa4569bc33065bf57ce7ce6132cd6a9de0
2001-11-07 14:22:00 +00:00
drh 17e24df621 Added support for LIMIT. (CVS 302)
FossilOrigin-Name: 177012249ae93dbea4a11fb50faaae7912848bd0
2001-11-06 14:10:41 +00:00
drh 9bbca4c1c0 Implement indices that occur in sort order and the LIMIT...OFFSET clause
of SELECT statements. (CVS 301)

FossilOrigin-Name: eb07768ae93f14bf6c150c1c4329948857a9d01c
2001-11-06 04:00:18 +00:00
drh 80ff32f5be Increase maximum row size to 1MB. (CVS 300)
FossilOrigin-Name: 7dd58fad398253608f55867cf1c7749eef005657
2001-11-04 18:32:46 +00:00
drh b70ce0c69c Version 2.0.8 (CVS 462)
FossilOrigin-Name: 0fd2874205f1a4b89fc069cb429c1b0c7a0b99c1
2001-11-04 00:00:00 +00:00
drh 0f24678d8c Version 2.0.8 (CVS 299)
FossilOrigin-Name: 0a8c2f4f9812ffa7d43be0e3b59648dca40fa83c
2001-11-03 23:59:16 +00:00
drh 9f71c2e002 Added "const" to lots of "char*" parameters in the API. (CVS 298)
FossilOrigin-Name: 1c448f1fd2a2e103e7464df896174534d02152ed
2001-11-03 23:57:09 +00:00
drh a8b38d286e Remove cruft: restrict the number of sorters and lists in the VDBE to one
since no more than one was ever used anyway.  This eliminates several
op-codes and simplifies the implementation of several others. (CVS 297)

FossilOrigin-Name: e1370276c2a0d045b29c981ddcb59f737e19a91c
2001-11-01 14:41:34 +00:00
drh 18b81e5a93 Comment changes only. (CVS 296)
FossilOrigin-Name: b2cb118fb7c6713684d32a48a7ba8ffffe596687
2001-11-01 13:52:52 +00:00
drh 33f51c9b71 More documentation updates (CVS 295)
FossilOrigin-Name: f65df59e554c281ad1efa830f13f87488eb16845
2001-10-31 15:44:46 +00:00
drh ba99af57ac Make lemon 64-bit clean (CVS 294)
FossilOrigin-Name: 475e2fedda2256cc1cfdffa1b12745bc401e552d
2001-10-25 20:37:16 +00:00
drh 6c32cf70d2 Version 2.0.7 (CVS 463)
FossilOrigin-Name: b0442cb9c64682b6f98bf8f26f50bb54bdfd9013
2001-10-22 03:00:00 +00:00
drh 6d4abfbee5 More changes for 2.0.7. (CVS 293)
FossilOrigin-Name: f8328a5f11801c5124f9a8dace22df3c1cfb2191
2001-10-22 02:58:08 +00:00
drh 01a346616f 2.0.7 (CVS 292)
FossilOrigin-Name: a835658e507fc7d0c684959c0f0afb9018b6a8d4
2001-10-20 12:30:10 +00:00
drh af27914d2a Version 2.0.6 (CVS 464)
FossilOrigin-Name: c8535a0de90fb7a22df15018984db590a85decfb
2001-10-19 16:44:59 +00:00
drh 6a535340bc Version 2.0.6 (CVS 291)
FossilOrigin-Name: 8467d84fc6e67bd93051f54338a8f6c9b1711ee1
2001-10-19 16:44:56 +00:00
drh 98808babd3 Support for UTF-8 and ISO8859 characters in identifiers. Bug fix in
the column name generator for selects (was coreing). (CVS 290)

FossilOrigin-Name: 22948fc685299ca888907eea68edb8a6e87c3f49
2001-10-18 12:34:46 +00:00
drh a411288fe8 Version 2.0.5 (CVS 465)
FossilOrigin-Name: e2d84f71ed39cbb75884205521aa9e316ab3b56c
2001-10-15 00:45:00 +00:00
drh 1bee3d7b43 Added support for the COUNT_CHANGES pragma in order to help out the
ODBC driver.  Fixed a but on count(*) when applied to empty tables. (CVS 289)

FossilOrigin-Name: 747bf1b30b74cfd0e9c27e7c0bc5172637f35520
2001-10-15 00:44:35 +00:00
drh f2d6a64495 Version 2.0.4 (CVS 466)
FossilOrigin-Name: 444447007a32f9ebd9e0714c6cbe0d9a63e193b1
2001-10-13 21:59:59 +00:00
drh e21a57320e Bug fix. Raised version number to 2.0.4. (CVS 288)
FossilOrigin-Name: 26972afd645e21e0d16de9a0bb0d03754e909044
2001-10-13 21:56:34 +00:00
drh e73e180933 Version 2.0.3 (CVS 467)
FossilOrigin-Name: a8fee23f86c268c1bdb3575f3f6069da18de12a8
2001-10-13 03:00:00 +00:00
drh bf4133cba1 2.0.3 (CVS 287)
FossilOrigin-Name: 75e90cf09b64ee1fcb39a711fc9ac6d3d2b849a5
2001-10-13 02:59:08 +00:00
drh 99fcd718e1 Remove the P3 and label arguments from the internal sqliteVdbeAddOp()
function.  This makes the code easier to read and perhaps smaller as
well. (CVS 286)

FossilOrigin-Name: 288ef1247b94c6c933451d120cdc78e471efc14e
2001-10-13 01:06:47 +00:00
drh 81a20f21d5 Fix an assertion failure when the disk fills up. Add tests for a full
disk situation. (CVS 285)

FossilOrigin-Name: 0a7848b6190981cb7eb673bbe68cb217694daf2e
2001-10-12 17:30:04 +00:00
drh 4299020922 Version 2.0.2 (CVS 468)
FossilOrigin-Name: 44d00a6f58c71ca11423df12530177baaa054a01
2001-10-09 14:00:00 +00:00
drh 3109e02ec5 The sqlite_busy_timeout() function was interpreting its second argument
as seconds, not milliseconds as advertised.  This patch fixes the problem. (CVS 284)

FossilOrigin-Name: abe5a25b9dcf1e47f3cb37fd419f620db03bd4da
2001-10-09 13:46:01 +00:00
drh 9d31976c3d Remove files before rebuilding. (CVS 283)
FossilOrigin-Name: 6307641d463eefd5ec346d299830e822acbc0938
2001-10-09 12:44:43 +00:00
drh ff0839c0b6 More changes prior to release 2.0.2. Mostly comment changes. But there
was also a minor change to temptable.test so that it would work under
Windows. (CVS 282)

FossilOrigin-Name: 864349de6fba5b38a3fbf7ab502922937b1b61e5
2001-10-09 12:39:24 +00:00
drh 286f11a23c Version 2.0.2 (CVS 281)
FossilOrigin-Name: 765359c77ebae22e42b78636e70a57b010aaa18e
2001-10-09 04:21:50 +00:00
drh ad75e9874b Fix the locking protocol. (CVS 280)
FossilOrigin-Name: 484b82d8a1c84f3d9725a509de93276b9fa9b294
2001-10-09 04:19:46 +00:00
drh f57b339988 Support for temporary tables added. Still need more testing. (CVS 279)
FossilOrigin-Name: 9368c62e4097aae3081a325962c1dec167fd253d
2001-10-08 13:22:32 +00:00
drh 382c0247c7 Adding table column query capability to support ODBC. (CVS 278)
FossilOrigin-Name: b63b3f3684a3d584ef99f54cde76b6c483bbfef7
2001-10-06 16:33:02 +00:00
drh 480bf1769d Version 2.0.1 (CVS 469)
FossilOrigin-Name: e4980849403a8d7bd63753c9b7f275519bd7df4f
2001-10-02 13:05:00 +00:00
drh 100569d862 Remove C++ comments from btree.c. (CVS 277)
FossilOrigin-Name: 4b7710e2daadffb716bd88f3a213f94ffbb750ef
2001-10-02 13:01:48 +00:00
drh 33048c0b92 The .dump output uses INSERT instead of COPY now. Expression syntax
of the form "expr NOT NULL" is now supported. (CVS 276)

FossilOrigin-Name: 20382325c7c8c6b11bd45b23060d0f7fdb4d8fd1
2001-10-01 14:29:22 +00:00
drh 61090c5f32 Version 2.0.0 (CVS 470)
FossilOrigin-Name: c0a8a1fb4224c63bcbb438cfd2ca0d4e0bb5b824
2001-09-28 23:15:00 +00:00
drh b0bf726fe3 Documentation updates. (CVS 275)
FossilOrigin-Name: 4b4bfc6290f05c6672338690911f68fd8bb418c9
2001-09-28 23:11:24 +00:00
drh a5e2e92f59 Remove reference to GDBM in the documentation of the "sqlite"
command-line utility. (CVS 274)

FossilOrigin-Name: 0ffab36d1fc29125fdcf0d732073f77012dfcad4
2001-09-28 18:14:17 +00:00
drh 66f95a65f8 Line tclsqlite.so against the stub library. (CVS 273)
FossilOrigin-Name: 7e79e91b03e21058bbae2c0aab8f3e8ce09ae7f9
2001-09-28 18:10:55 +00:00
drh 90ca975338 Version 2.0.0 (CVS 272)
FossilOrigin-Name: 1df5386a5557c1fc6a5433e9dbd23009026be369
2001-09-28 17:47:14 +00:00
drh 71eb93eaa3 Put in the new LIBTOOL build system. (CVS 271)
FossilOrigin-Name: 00575d167aea567bc38f8a329aeff7b814eb91c8
2001-09-28 01:34:43 +00:00
drh 743daaafd4 Added more tests of unique indices. (CVS 270)
FossilOrigin-Name: 3ae952933997c6422ec53b26391ba362c6e5c44a
2001-09-27 23:57:06 +00:00
drh 60c309bf48 Alpha-3 (CVS 269)
FossilOrigin-Name: a70d445070c905690dd8ec080981232594e1a969
2001-09-27 15:13:40 +00:00
drh adbca9cfde Fixed the support of UNIQUE and PRIMARY KEY. (CVS 268)
FossilOrigin-Name: 116fdad06868acf6aca9e75c2c3497c0511a42c3
2001-09-27 15:11:53 +00:00
drh 717e640294 Added basic support for enforcement of UNIQUE on indices and primary
keys.  Support for addition constraints is to follow. (CVS 267)

FossilOrigin-Name: 34c42967f3d52dfb65d9f31db4f6995d098ec1f7
2001-09-27 03:22:32 +00:00
drh 4502a0d7e9 Fix an RCSID problem. (CVS 266)
FossilOrigin-Name: 0e9cfcd53e16f96fc181def1d0b2d0ea7f7df73f
2001-09-25 02:04:29 +00:00
drh dd137a09d5 Prepare for Alpha-3 (CVS 265)
FossilOrigin-Name: 9c9322eb46894860cd7c294cd19ce72614722a73
2001-09-25 01:50:59 +00:00
drh afa4a020f2 Tests for inserting lots of data (~64K) into a single row of a table. (CVS 264)
FossilOrigin-Name: a462c85083d23aa34bd3d0c61d01062fc5ae8230
2001-09-24 03:12:39 +00:00
drh f3256d2c82 RowIDs are now always expressed in native byte order. (CVS 263)
FossilOrigin-Name: bb4313a94bc079d072078f353e54f3804971060d
2001-09-23 20:17:55 +00:00
drh 90bfcdace3 Additional test cases with locking fixes. Also, make the code thread-safe. (CVS 262)
FossilOrigin-Name: bd7d6a64afa03cc64f6537f828d6c94975bf5f02
2001-09-23 19:46:51 +00:00
drh ecdc7530dd Fixes to the locking and rollback behavior. (CVS 261)
FossilOrigin-Name: 337b3d3b2a903328d9744c111979909a284b8348
2001-09-23 02:35:53 +00:00
drh beae319476 Put in a generic hash table system in place of the various ad-hoc
hash table scattered everywhere.  Except, the page hash table in
the pager is unchanged. (CVS 260)

FossilOrigin-Name: 9114420dd01d92cc8890046500a8806a297a4e65
2001-09-22 18:12:08 +00:00
drh 4aa85c42b3 Web site changes prior to release 2.0-Alpha-2. (CVS 259)
FossilOrigin-Name: 13afb22409b3b58d4c4b97a9fac22c96153d77c0
2001-09-20 12:32:53 +00:00
drh deea051647 2.0-Alpha-2 release (CVS 1724)
FossilOrigin-Name: 548c55e8498826834f946598baf72e2d4b7283b8
2001-09-20 01:44:43 +00:00
drh 254cba2429 2.0-Alpha-2 release (CVS 258)
FossilOrigin-Name: d2a1aac46782c0d3852e34a3b32a6b2ccd93a256
2001-09-20 01:44:42 +00:00
drh 474d3d6156 Add the OpenReadOnly() OS method to fix a bug in the pager. (CVS 257)
FossilOrigin-Name: 82db5456c9817283d725daf4e1081d32a71466ad
2001-09-19 13:58:43 +00:00
drh 8cfbf08ffa Trying to get the OS abstraction layer to work. (CVS 256)
FossilOrigin-Name: abff526d005b3b46904de091753cc79548739ad8
2001-09-19 13:22:39 +00:00
drh db5ed6d55d Fix a problem in GROUP BY with multiple columns. (CVS 255)
FossilOrigin-Name: 22132ce18cad31482cdb9b380cedc3f53bc532b8
2001-09-18 22:17:44 +00:00
drh 1eaa2694bf Bug fixes. Trying to make it go faster. (CVS 254)
FossilOrigin-Name: 8f28a83abac59a2161d486c96386b8df726468d0
2001-09-18 02:02:23 +00:00
drh c73d1f5a55 Enchanced transaction tests (CVS 253)
FossilOrigin-Name: b30f2b5e150a219c374f88d13386dbda190ad9ed
2001-09-17 20:48:30 +00:00
drh e3c413727b Add a new column in the SQLITE_MASTER table to record the root page
number of primary key indices. (CVS 252)

FossilOrigin-Name: 602ea4f9f641070592c788ce22859b849739b42e
2001-09-17 20:25:58 +00:00
drh 415274ccba Version to 2.0.0 (CVS 251)
FossilOrigin-Name: c67f6db681784f8511ccf208cde1c29d9ee73742
2001-09-16 13:36:40 +00:00
drh b19a2bc603 Disclaimed copyright. Preparing for release 2.0. (CVS 250)
FossilOrigin-Name: 4e926efe2b59adfec4086eb1d2ba830238facb4c
2001-09-16 00:13:26 +00:00
drh 872ff86f2c Separate columns in keys using nulls instead of tabs. (CVS 249)
FossilOrigin-Name: 8e2f3f751ea342372c94977ff27baaff5126009a
2001-09-15 14:43:39 +00:00
drh 092d0350d5 Limit the total data in a single row to 2^16-1 bytes. (CVS 248)
FossilOrigin-Name: 8fdec4d8b6043471f21235bc8918c9a8d838f508
2001-09-15 13:15:12 +00:00
drh b3e05a662a Removing some surplus files. (CVS 1723)
FossilOrigin-Name: 8ad996fdac6801768e94ca1710a0a3da03e1e7ea
2001-09-15 00:59:33 +00:00
drh 3543b3e0ba Release 2.0-alpha-1 (CVS 247)
FossilOrigin-Name: 264f23315e682909abb47912f48733f641772a4c
2001-09-15 00:57:59 +00:00
drh 50e5dadf2c Everything is working on Linux. This is release 2.0-Alpha-1. (CVS 246)
FossilOrigin-Name: 14474fa144fe7c5dc63e0990d6cc92d769e6013e
2001-09-15 00:57:28 +00:00
drh f57b14a657 Added a PRAGMA statement. Took out the special comment parsing. (CVS 245)
FossilOrigin-Name: 5e3724603e6f52bb74deb1c62e6e8f323d7b64b7
2001-09-14 18:54:08 +00:00
drh a1b351af54 Bug fixes and speed improvements. Delete is still slow. (CVS 244)
FossilOrigin-Name: 7da856cd94d2572070e40762e5bc477679e60042
2001-09-14 16:42:12 +00:00
drh 3fc190cc3f All tests now pass. But there are still issues. For example, inserts
are way too slow.  And additional tests are needed for new features. (CVS 243)

FossilOrigin-Name: e7b65e37fd88c4d69c89cfe73ab345b8b645ada6
2001-09-14 03:24:23 +00:00
drh 009d3b72ca Many problems fixed. Many problems yet to go. (CVS 1722)
FossilOrigin-Name: 3dfe1711e67e08525427497f0edc3d287dc2733e
2001-09-13 21:53:09 +00:00
drh 5edc31243e Many problems fixed. Many problems yet to go. (CVS 242)
FossilOrigin-Name: 62c7bd11bcf6438cdcbf66fa67a2bf4ab9d1664d
2001-09-13 21:53:09 +00:00
drh d78eeee1f2 It runs. Simple tables can be created. INSERT and SELECT work. Much more
testing is needed, however. (CVS 241)

FossilOrigin-Name: 9ac8399c99cb996a382f3d49f45b6ca857adc827
2001-09-13 16:18:53 +00:00
drh 5b2fd56fcb The new Btree code runs, but it does not yet work. (CVS 240)
FossilOrigin-Name: 991ce8115052da9395d4bf8ff29f417e3c36dc7f
2001-09-13 15:21:31 +00:00
drh be0072d249 The BTree changes are now integrated and the whole thing compiles and
links. I have not yet tried to run it, though. (CVS 239)

FossilOrigin-Name: a0a1e701abc52a164d9b09a5426eb12af1fe6a4c
2001-09-13 14:46:09 +00:00
drh 5e00f6c7d5 The code is in place to replace GDBM with BTree. But I have not yet
attempted to compile it.  I am sure the code contains bugs. (CVS 238)

FossilOrigin-Name: 6ecc8b20d4f402f45f03d46d8d4fa40dea666e97
2001-09-13 13:46:56 +00:00
drh 5c4d9703d9 Restore btree to the main line. (CVS 237)
FossilOrigin-Name: 2e6aff980287825b59d2ebb7005bb08dd601ff1c
2001-08-20 00:33:58 +00:00
drh c87fa69a29 Add index access methods to the DBBE in preparation for adding a new
DBBE for the btree.c module. (CVS 236)

FossilOrigin-Name: c15f6ffc4d41f30a06d750c8015226713ae0126b
2001-08-19 18:19:46 +00:00
drh 888e5e96be Version 1.0.32 (CVS 471)
FossilOrigin-Name: cfc86dc48afb6b7e052e418db1c596b665d5cc66
2001-07-23 14:35:00 +00:00
drh 4f79c4b27f Add ability to quote table and column names in expression. (CVS 1721)
FossilOrigin-Name: 770e983628d873039857c889ba302cf6926d19d9
2001-07-23 14:33:03 +00:00
drh 87c40e88a0 Add ability to quote table and column names in expression. (CVS 235)
FossilOrigin-Name: 029e3a3a5dd8d4923af50bb2c9f31b1b7cd9439e
2001-07-23 14:33:02 +00:00
drh 6019e168a0 BTree and pager are working pretty well now. (CVS 234)
FossilOrigin-Name: a84fb078baf96dbfb5983981127dfc905074b7f9
2001-07-02 17:51:45 +00:00
drh efc251da92 More BTree tests (CVS 233)
FossilOrigin-Name: 55c89bfdd35f1ad494618a451f9a1ed08502ae07
2001-07-01 22:12:01 +00:00
drh 5eddca6cfc Implemented the sqliteBtreeSanityCheck() test function. (CVS 232)
FossilOrigin-Name: 42486880ed31318ef36a8831b959e9115b4fbac6
2001-06-30 21:53:53 +00:00
drh 9ca7d3b15d More BTree tests and a few bug fixes. (CVS 231)
FossilOrigin-Name: 2c9127943cd5a541613924d2df773c4e8df4c1a6
2001-06-28 11:50:21 +00:00
drh dd79342e87 Got a lot of BTree tests working. Still lots more needed. (CVS 230)
FossilOrigin-Name: 9cfeeb5896d2a17c8c7904136d346a6245c9e497
2001-06-28 01:54:48 +00:00
drh 2aa679f604 More tests and bug fixes in btree.c (CVS 229)
FossilOrigin-Name: 6b9b298b2846146b95d7df7f423867976bafa390
2001-06-25 02:11:07 +00:00
drh 7c717f750e The first test file for BTree added. Simple insert and delete tests pass.
There is still a lot of work to be done, though. (CVS 228)

FossilOrigin-Name: 85f015c9750a5eab274e82f0e2c6e8f09dc7ca70
2001-06-24 20:39:41 +00:00
drh df0b3b090e Fix a bug in pager.c introduced in the previous delta. (CVS 227)
FossilOrigin-Name: f4df6664037c68e1ce539c84c852124d95cd5a56
2001-06-23 11:36:20 +00:00
drh 8c42ca9366 The BTree code compiles and links now, but it does not work yet. (CVS 226)
FossilOrigin-Name: b31c49021c260a67b7848bc077b75a7146e31c71
2001-06-22 19:15:00 +00:00
drh 14acc04e91 All BTree code is in place. Now we just have to make it work. (CVS 225)
FossilOrigin-Name: d4be4709ee32bab6e78104861ed4e02d153779aa
2001-06-10 19:56:58 +00:00
drh f2340fc7cc documentation update (CVS 224)
FossilOrigin-Name: d1e211fad9d787a0fdbcd11fb364d6c592c07a05
2001-06-08 00:25:18 +00:00
drh 8b2f49b288 incremental update (CVS 223)
FossilOrigin-Name: 7108b699cc03d5d4dfb222ceab0196a85dbffd50
2001-06-08 00:21:52 +00:00
drh bd03cae998 continued work on btree (CVS 222)
FossilOrigin-Name: d07e0e80a0b33081adda8651e9a6750b2e40141a
2001-06-02 02:40:57 +00:00
drh e339bb5fd6 :-) (CVS 1720)
FossilOrigin-Name: d78febd197b7514b63afe6626e6639a3c3c2f0fc
2001-05-28 00:41:24 +00:00
drh 5e2f8b94e4 :-) (CVS 221)
FossilOrigin-Name: c8d3bdd91e333f3fc519558e40c07e7e7c2ebeec
2001-05-28 00:41:15 +00:00
drh 3b7511c5cb :-) (CVS 220)
FossilOrigin-Name: 45a0e0fc8ccde52ac409d1271beaef779fa7eeee
2001-05-26 13:15:44 +00:00
drh 72f8286960 Continued work on btree (CVS 219)
FossilOrigin-Name: 18500cdcc1a42118cdf650681ebb1cbeac106aa7
2001-05-24 21:06:34 +00:00
drh 306dc21379 :-) (CVS 218)
FossilOrigin-Name: 523d52dfa6ae3028cbcc88d406501f3ebb6cbd2d
2001-05-21 13:45:10 +00:00
drh 2af926b95a :-) (CVS 217)
FossilOrigin-Name: ee6760fb62e81af95796c0fcf1e65e5dc0701194
2001-05-15 00:39:25 +00:00
drh 365d68f7f1 :-) (CVS 216)
FossilOrigin-Name: c3e521190f02120a34f1e9244fe1ea3a975a6caa
2001-05-11 11:02:46 +00:00
drh 08ed44e72c :-) (CVS 215)
FossilOrigin-Name: 624ccbca98be33a26c2af72d2d91c78f8a06ae9c
2001-04-29 23:32:55 +00:00
drh 7e3b0a077d :-) (CVS 214)
FossilOrigin-Name: 73a1ed61265040925f1a41c9c0cfeea50db70b01
2001-04-28 16:52:40 +00:00
drh 04222e104a :-) (CVS 1719)
FossilOrigin-Name: 8e0476f9004a7db8a3426e57f477393645ff5629
2001-04-17 20:09:43 +00:00
drh a059ad070b Begin adding BTree code (CVS 213)
FossilOrigin-Name: bdb1c425f577d455155982ee2cd8cb686bcaf0da
2001-04-17 20:09:11 +00:00
drh 547085fc62 Version 1.0.31 (CVS 472)
FossilOrigin-Name: a7bfcbb4131ab17a58d5e843c418b2e1a3ab2abc
2001-04-15 02:29:59 +00:00
drh d79caeba1c Working on the pager (CVS 212)
FossilOrigin-Name: 1f07abe46e2de8c5d9659bd5a78efe4ce23144ae
2001-04-15 02:27:24 +00:00
drh d9b0257a24 Pager is working, mostly. (CVS 211)
FossilOrigin-Name: f82fa7070ae281804c019e6b05cd767dadaf0827
2001-04-15 00:37:09 +00:00
drh 69688d5f54 Getting ready to redo the journal file format. (CVS 210)
FossilOrigin-Name: 42c2f3fe68c8a6bab96e035371ecd64296c5491f
2001-04-14 16:38:23 +00:00
drh d400728ac1 More testing (CVS 209)
FossilOrigin-Name: 3bde128418fe70a2fd62bf9e013999827a16053c
2001-04-12 23:21:58 +00:00
drh ed7c855cdd :-) (CVS 208)
FossilOrigin-Name: 555351dd1918f96167e2cb46cc1db6496e8d10a3
2001-04-11 14:29:21 +00:00
drh daffd0e597 better handling of out-of-memory errors (CVS 207)
FossilOrigin-Name: 86b30cd0975dfea9424b9f9f0d4194aa71ce508b
2001-04-11 14:28:42 +00:00
drh d1bf3512fa Added new tests (CVS 206)
FossilOrigin-Name: 2507ec40610d8034ccf9dcb58a16934065e6f120
2001-04-07 15:24:33 +00:00
drh d21afef769 Version 1.0.30 (CVS 473)
FossilOrigin-Name: 8f0d98193e4ba913fa31d5f8d5adc46ad9d346a1
2001-04-06 16:19:59 +00:00
drh 818041aff4 Check for miscompiled Tcl (CVS 205)
FossilOrigin-Name: 5b65746383c509048c80b7aff536d1204fd1d127
2001-04-06 16:15:27 +00:00
drh fbc3eab85b Check for miscompiled Tcl (CVS 204)
FossilOrigin-Name: 735d8b5c13b5e2602b37940377fced098be210c1
2001-04-06 16:13:42 +00:00
drh 5ef3872a00 Version 1.0.29 (CVS 474)
FossilOrigin-Name: 4b3ffa161a09653919a689336784a85b9548c249
2001-04-05 16:50:00 +00:00
drh 9daea74924 :-) (CVS 203)
FossilOrigin-Name: b5f994feb44f76782279cdbb1654d340f63e8995
2001-04-05 16:49:44 +00:00
drh 6f63c25856 :-) (CVS 202)
FossilOrigin-Name: 04530e451662e298506d314ce014a2643f4ff813
2001-04-05 16:25:53 +00:00
drh 297ecf146b i18n changes (CVS 201)
FossilOrigin-Name: 8390f6521af0f1c5cd0298cc4a1dfa3f092c1e15
2001-04-05 15:57:13 +00:00
drh 336366ebd8 Version 1.0.28 (CVS 475)
FossilOrigin-Name: 8b4c87e8cf08db8e8ace57dc8dc8d110d18f19ed
2001-04-04 21:30:00 +00:00
drh ff9821a289 Clean up some compiler warnings (CVS 200)
FossilOrigin-Name: 490d08a8c19d52ebb41999371e2664e29bcb1164
2001-04-04 21:22:14 +00:00
drh e17a7e330b Added support for UTF-8 (CVS 199)
FossilOrigin-Name: f0674697c90e4eed630c36e40e724de05d54f74f
2001-04-04 21:10:18 +00:00
drh 0012761159 :-) (CVS 198)
FossilOrigin-Name: 24bede902722e8003451143b38284de48700c459
2001-04-04 12:33:36 +00:00
drh b6a2c215bf :-) (CVS 197)
FossilOrigin-Name: ab645437447059be18018890bd33f3a977c4c8b3
2001-04-04 12:32:08 +00:00
drh c4a3c779b1 Added transaction support (CVS 196)
FossilOrigin-Name: 35a8feed0d10e780c477f7440fbe80637fcf9906
2001-04-04 11:48:57 +00:00
drh 960e8c6317 Bug fixes from Oleg Oleinick (CVS 195)
FossilOrigin-Name: 1f0197d504fa2bde15b287ac6c0102cacdb1e482
2001-04-03 16:53:21 +00:00
drh 15c29be81c Version 1.0.27 (CVS 476)
FossilOrigin-Name: 833291c22734b2ac2342da84710320eb28f5d8cc
2001-03-20 22:15:00 +00:00
drh 0353cedda4 Enhancements to the DELETE command (CVS 194)
FossilOrigin-Name: daea156e2430762e683ff5460f9f8bb3204ae168
2001-03-20 22:05:00 +00:00
drh 8721f00485 Version 1.0.26 (CVS 477)
FossilOrigin-Name: 99f9ea412f87cfb518cfb34f0e187fd1baf56761
2001-03-20 12:59:59 +00:00
drh 758e6c9143 Better temp file naming under windows (CVS 1718)
FossilOrigin-Name: 126fbcb7a8f52a0cc01c8346150a187dbabe96d5
2001-03-20 12:57:57 +00:00
drh b77066afca Open windows files in binary mode. (CVS 1717)
FossilOrigin-Name: 3adf884bcf4ff8c28083d9ed63edea5e91fea1fc
2001-03-20 12:55:14 +00:00
drh 3494ffe930 Open windows files in binary mode. (CVS 193)
FossilOrigin-Name: e48b9f24faeee606aa2bda1666016d8a00b430a7
2001-03-20 12:55:13 +00:00
drh 6731b80200 Version 1.0.25 (CVS 478)
FossilOrigin-Name: 7564b223ab39f26a2fcf2afe150a98d10de132ea
2001-03-15 18:30:00 +00:00
drh db25e38802 Identify tests that depend on system load and
processor speed. (CVS 192)

FossilOrigin-Name: 4b0ba23807a57eaa3649622cff3be66cd75e7561
2001-03-15 18:21:22 +00:00
drh d6b1cf5a7e Version 1.0.24 (CVS 479)
FossilOrigin-Name: 34b17e6ce15dd24dc2ca609ef9c136fe4dc1b4b5
2001-03-14 12:59:59 +00:00
drh b8525d9dcf :-) (CVS 191)
FossilOrigin-Name: 8f79ca2acaf765ecb3274c353284c55b6790f657
2001-03-14 12:54:11 +00:00
drh b072950e24 Fix a bug on systems where malloc(0) return NULL.
Add code to detect this bug even on systems were it used not to
occur. (CVS 190)

FossilOrigin-Name: bda83e2b75843b9a078c2f4e64fcd4d2145a716b
2001-03-14 12:35:57 +00:00
drh 65cd7c02e7 Documentation updates only (CVS 189)
FossilOrigin-Name: d44abe54eb4a0c5eedf8f3ff59704ddb8dd68faf
2001-02-20 13:06:30 +00:00
drh 3c9ebf144e Version 1.0.23 (CVS 480)
FossilOrigin-Name: cbfa44c32365a1c9d10c9fcfeebad2fea139aafb
2001-02-20 00:00:00 +00:00
drh e53dea15d1 Fix a temp file problem on memory: (CVS 188)
FossilOrigin-Name: 88447d45c8ac316868a8a3e3cbb0b0cdf279d89c
2001-02-19 23:48:16 +00:00
drh 7d822f292b Version 1.0.22 (CVS 481)
FossilOrigin-Name: ec861066e3e6d3bfee83997fa7018d0291e22d90
2001-02-19 23:29:59 +00:00
drh a6e982a256 Repairs to the previous fix (CVS 187)
FossilOrigin-Name: b91854a67f5e3835aafbbb1f9c528f4011ffc3f9
2001-02-19 23:28:36 +00:00
drh 573bd2754f Repairs to the previous fix (CVS 186)
FossilOrigin-Name: 4fb52b4824cbc6d5fa23449bfb998ec9985f1336
2001-02-19 23:23:38 +00:00
drh 827e656177 Version 1.0.21 (CVS 482)
FossilOrigin-Name: 7a1147ff52df5f78b1a2e3502c1b78e4d3906968
2001-02-19 18:30:00 +00:00
drh 4f3c63e475 fix the UPDATE bug (CVS 185)
FossilOrigin-Name: 99aae9aaa9f53d1be6600f8598f66594692aae39
2001-02-19 18:24:21 +00:00
drh 4e0dec47d7 Version 1.0.20 (CVS 484)
FossilOrigin-Name: eb0a523c49df65ef3454b8d7e05a6a852b24fc8b
2001-02-11 17:00:00 +00:00
drh 03e7e9516f Perpare to fork SQLite2.0 develop into a separate tree (CVS 184)
FossilOrigin-Name: 4f00e27f17a15504543c5bbb8765c88bacd7257e
2001-02-11 16:58:21 +00:00
drh 338ea13c0d Perpare to fork SQLite2.0 develop into a separate tree (CVS 183)
FossilOrigin-Name: 6adb6078871114ba19ab601bb94d43ff9e03e43f
2001-02-11 16:56:24 +00:00
drh 2e7051b3ec hi (CVS 1716)
FossilOrigin-Name: 5128135c7e12f763722981ad39ecb7835db49142
2001-02-06 14:10:26 +00:00
drh 98a0b0834d :-) (CVS 1715)
FossilOrigin-Name: 29305c3c9eb805a1f5beb82ad50cba1d3bbd3465
2001-02-06 14:01:23 +00:00
drh c58011e862 Version 1.0.19 (CVS 483)
FossilOrigin-Name: 08e179b076b53a2792aba7541f614ad39fa45194
2001-02-06 14:00:00 +00:00
drh b5730347ad Working better with Win95.
Continued work on the new db.c backend. (CVS 181)

FossilOrigin-Name: f9c55a900032ed6babd86170dcb5257e33da950f
2001-01-31 13:28:08 +00:00
drh 17a6893463 Working better with Win95.
Continued work on the new db.c backend. (CVS 1714)

FossilOrigin-Name: df0ff304855bd18c7a3517c500e891b6d006be6a
2001-01-31 13:28:08 +00:00
drh d1881e6165 :-) (CVS 1713)
FossilOrigin-Name: 3259a53111bd19417e78160174bd67c69098494a
2001-01-29 01:27:19 +00:00
drh b5b452cb58 :-) (CVS 1712)
FossilOrigin-Name: edb01b1275c3de7c398522b5826c898917811247
2001-01-25 01:45:40 +00:00
drh acbcdc49c6 :-) (CVS 180)
FossilOrigin-Name: 98da825312fd4bb8a20ff33293131c02beb3ae63
2001-01-22 00:31:53 +00:00
drh d9e5075ff6 :-) (CVS 1711)
FossilOrigin-Name: 0529c979fd17995aff82e21b91b5cc833f23d8ef
2001-01-21 22:03:30 +00:00
drh 2702114089 :-) (CVS 179)
FossilOrigin-Name: d5f2a668978c0d108045237f19b0a7efa07678f2
2001-01-21 00:58:07 +00:00
drh 41a2b48bd0 :-) (CVS 178)
FossilOrigin-Name: 1662063dfb0925bd439e3e2e49bff82705e20fd0
2001-01-20 19:52:49 +00:00
drh e5080e4e9e continued progress toward version 2.0 (CVS 1710)
FossilOrigin-Name: a60af40a3e2e2903d0caa8b81b7e5a4cdc67cd52
2001-01-15 22:51:09 +00:00
drh 345fda3ef5 continued progress toward version 2.0 (CVS 177)
FossilOrigin-Name: c6ffb7ec6acb596907ead8992dfad94e18e83866
2001-01-15 22:51:08 +00:00
drh ae85dc8b0b Changes to the DBBE. Moving toward having many more
backend driver choices. (CVS 176)

FossilOrigin-Name: c0730217a04323a1a73d125e3e7da32bcc8d58fc
2001-01-13 14:34:05 +00:00
drh 993c2a7c8f Version 1.0.18 (CVS 485)
FossilOrigin-Name: 46b86abb1cc8e550acddba24e510d36eaf8ac6b9
2001-01-04 14:29:59 +00:00
drh 2fad28e310 branches: 1.55.2;
:-) (CVS 175)

FossilOrigin-Name: 81815a9c30ffc803cc03aad98936cba641674cd8
2001-01-04 14:27:07 +00:00
drh 660f68d6a2 :-) (CVS 174)
FossilOrigin-Name: 5ddeeb477148295b66fdd78d102827386852fed3
2001-01-04 14:27:07 +00:00
drh 4b2d64a9c9 :-) (CVS 173)
FossilOrigin-Name: e54b0c5ea845111d09529b57b2372ea2e797651a
2001-01-04 14:20:18 +00:00
drh 41adf6c327 branches: 1.17.2;
:-) (CVS 172)

FossilOrigin-Name: 64900e42cdb92b44e0fb3a17f0b94fc62ce733d5
2001-01-04 14:20:18 +00:00
drh a2e1bb5a58 :-) (CVS 171)
FossilOrigin-Name: d49e10fb5e29318f1f777664562b68dd054f7535
2001-01-04 14:20:18 +00:00
drh 68b8f0a1ef Version 1.0.17 (CVS 486)
FossilOrigin-Name: bee0c818590ccdbb96e0a4cb2998bc077564b2ae
2000-12-10 18:40:00 +00:00
drh acf4575752 speed tweaks and documentation updates (CVS 170)
FossilOrigin-Name: b46f9a317b06bd490bda987e11e24f2c27162370
2000-12-10 18:35:20 +00:00
drh 144f1d64b5 speed tweaks and documentation updates (CVS 169)
FossilOrigin-Name: 00c3dfd025f5e66587e23170eddb33112b5e1133
2000-12-10 18:23:51 +00:00
drh 78e6f71fcc branches: 1.16.2;
speed tweaks and documentation updates (CVS 168)

FossilOrigin-Name: af9673d1bff613b93b25fb95dc4cc409314da9f2
2000-12-10 18:23:51 +00:00
drh 8c82b3506e speed tweaks and documentation updates (CVS 167)
FossilOrigin-Name: ced90c3f93e5e0cf73ea77b62a1308cd8dd5f3b3
2000-12-10 18:23:50 +00:00
drh af90b19472 Version 1.0.16 (CVS 487)
FossilOrigin-Name: 8c36b248fd57dfaf3233a365f13f150a07affb3c
2000-11-28 21:00:00 +00:00
drh 66b89c8f68 Comment changes only (CVS 166)
FossilOrigin-Name: 5518e012bf35821f65fe2ca7cbafca6a97e7a4ac
2000-11-28 20:47:17 +00:00
drh d9a4698e5f Comment changes only (CVS 165)
FossilOrigin-Name: 97339efdf3f3b02a6a4fe57d2cb01d19cec3c749
2000-11-28 20:46:38 +00:00
drh 52d17876d1 Version 1.0.15 (CVS 488)
FossilOrigin-Name: d2ad3d2b4ee868621fb1155c64216536d576e456
2000-10-23 13:19:59 +00:00
drh 8c3052c49b documentation and speed updates (CVS 164)
FossilOrigin-Name: 356cdd64860b714f52529159fada799dca7bb1c0
2000-10-23 13:16:31 +00:00
drh 76634487b6 remove unnecessary code when NDEBUG is defined (CVS 163)
FossilOrigin-Name: 738e3e49f6d45e4393e35f7f5f65a41d3c2080c9
2000-10-23 01:07:59 +00:00
drh ccb2a3daf6 fix a debugging issue (CVS 162)
FossilOrigin-Name: f0a5255d2657ddcba24353d6d94b0d9c579d8dec
2000-10-22 20:39:58 +00:00
drh ed5423d5ae fix an HPUX bug (CVS 1709)
FossilOrigin-Name: 9e91b729f0a708b08060979a4998be890b6d268d
2000-10-19 15:28:40 +00:00
drh 549cfc6c80 Version 1.0.14 (CVS 489)
FossilOrigin-Name: 4788dc32a5c9fc3fcd08cbc43b13671c132f0c3e
2000-10-19 15:00:00 +00:00
drh 3cebbde37e remove the Et_AppInit() function from tclsqlite (CVS 161)
FossilOrigin-Name: 8eee153078b27b56c6da7d0b7a3df25985ed051f
2000-10-19 14:59:27 +00:00
drh efa4e17240 make it a little faster (CVS 160)
FossilOrigin-Name: 757668bd641134a6f7479c8df1c8b06a24d51ee4
2000-10-19 14:42:04 +00:00
drh 01d01eeee0 add the sqlite_test_prefixes control file (CVS 159)
FossilOrigin-Name: 4ccd9103c3e7236084283a7311b6e746037d12aa
2000-10-19 14:21:42 +00:00
drh 42f04222c0 fix a memory leadk (CVS 1708)
FossilOrigin-Name: 948f5a749fdc7f40f8a8e5a4e5be8139f9e4c66d
2000-10-19 14:18:34 +00:00
drh 99e86e6b0b Added the "memory:" driver (CVS 1707)
FossilOrigin-Name: e9236833d95060509bdcba008d0e15e61fd7b6d7
2000-10-19 14:10:09 +00:00
drh 767c2001c6 Added the "memory:" driver (CVS 158)
FossilOrigin-Name: 54d60c68dc83410e911b828a680772541c44e9df
2000-10-19 14:10:08 +00:00
drh e907bfc2ac Version 1.0.13 (CVS 490)
FossilOrigin-Name: b9c84fa57912d7d777b4ebefc12627d80a2fc378
2000-10-19 02:00:00 +00:00
drh bb0b679c02 Break out DBBE drivers into separate files. (CVS 157)
FossilOrigin-Name: 979ef5d5d64b8e38cc15fef0d2d507ca2fe6842c
2000-10-19 01:49:02 +00:00
drh 58c2976fa9 Version 1.0.12 (CVS 491)
FossilOrigin-Name: 7330218a912ea788b0c83fa7c7350fd6df88b18a
2000-10-17 01:34:59 +00:00
drh 9b1eb48b7d Fix an off-by-one error in printf.c (CVS 156)
FossilOrigin-Name: 17fcd3b01568e95224425b982fb77abd8b12191a
2000-10-17 01:31:22 +00:00
drh 1afad7c98a :-) (CVS 155)
FossilOrigin-Name: 3dc7913dfc4751a00cc5d14f3aa4a3a25d7531bf
2000-10-16 22:11:57 +00:00
drh 611ad21d8b :-) (CVS 154)
FossilOrigin-Name: bae2050f3f63ff0b56ac38fabe220f150cc2d35a
2000-10-16 22:09:38 +00:00
drh 773ab7ae4c Added an interrupt capability (CVS 1706)
FossilOrigin-Name: fb015479b1d0d7c8074e92907044449d56dd6ad8
2000-10-16 22:06:43 +00:00
drh 4c5043910b Added an interrupt capability (CVS 153)
FossilOrigin-Name: f7ea08b931b9b40831bfe73cd7afea17f92112cf
2000-10-16 22:06:40 +00:00
drh b2b415b97f Removed dlmalloc.c (CVS 1705)
FossilOrigin-Name: d67884f6278a130c81bc75f472170eb6c799ddfa
2000-10-12 13:29:49 +00:00
drh 3e85251e81 Version 1.0.10 (CVS 492)
FossilOrigin-Name: e0c9e80bdbaf672c72ead7827946bb9ac6b7ec32
2000-10-11 19:30:00 +00:00
drh fe79b5325e Misc cleanup. Notes on compiling for Win95. (CVS 1704)
FossilOrigin-Name: 217a8af6d0f4396b755b7d21f94ae6fe002728a1
2000-10-11 19:28:52 +00:00
drh 7c68d60b6f Misc cleanup. Notes on compiling for Win95. (CVS 152)
FossilOrigin-Name: 3f0f1fa1fce794d1661c845f1a63a8d744892c25
2000-10-11 19:28:51 +00:00
drh d42b00f654 Version 1.0.9 (CVS 493)
FossilOrigin-Name: ebbb9e4a660e833efddb7ffea737135fff3bf2f5
2000-10-09 22:30:00 +00:00
drh 98699b54bb Documentation changes only (CVS 151)
FossilOrigin-Name: 15340d2bb34c4d7ab629f9fa2231c7f34a248db9
2000-10-09 12:57:00 +00:00
drh a18c5681e9 Added the _printf() interface. (CVS 150)
FossilOrigin-Name: f9372072a6d6caa15fa14ec722523944470fe155
2000-10-08 22:20:57 +00:00
drh 35d5d9e212 Version 1.0.8 (CVS 494)
FossilOrigin-Name: 384909e50f4ae2e84534f9a6505cfb5cc9f4d6ca
2000-09-30 23:00:00 +00:00
drh 9b0d0a8bc5 Documenting the TCL interface (CVS 149)
FossilOrigin-Name: 7e0bacedf928095b29e7166eacd2356e8169d6dd
2000-09-30 22:46:05 +00:00
drh 05a1c8d08c Fix a problem with the configure script (CVS 1703)
FossilOrigin-Name: ed5f5404ad804aec21ad971d59af834929381b5b
2000-09-29 15:15:52 +00:00
drh fdc99e9235 Fix a problem with the configure script (CVS 148)
FossilOrigin-Name: 2aeb82db3ef6fc13eafa4fcf614e8f1dfd247abf
2000-09-29 15:15:51 +00:00
drh e371033ddf :-) (CVS 147)
FossilOrigin-Name: e11f7527f9187e8902db84069baad0d3b7e17ad0
2000-09-29 13:30:53 +00:00
drh 6d31316cf3 Obj-ify tclsqlite (CVS 146)
FossilOrigin-Name: 85a4254ef0998fac06ddc285decd79345968fee1
2000-09-21 13:01:35 +00:00
drh 6562e5af1f Version 1.0.5 (CVS 495)
FossilOrigin-Name: 84839d8764ecdfac4d8c56618d9c107c8bbf65ab
2000-09-14 01:25:00 +00:00
drh a5c2ad06e6 better handling of exponential notation (CVS 145)
FossilOrigin-Name: ea0e32828f5643eeb00b216a287d14f4826ddf2d
2000-09-14 01:21:10 +00:00
drh e09efa30c4 Version 1.0.4 (CVS 496)
FossilOrigin-Name: 92346e003eba759251d23c296f97a7ad6299f5de
2000-08-28 16:25:00 +00:00
drh ff6e9116e5 adding length() and substr() tests. fix shell.c bug (CVS 144)
FossilOrigin-Name: b8cec9b938b4be1ccf230588d8e1564fb3ac4316
2000-08-28 16:21:58 +00:00
drh 6ec2733b44 Added length() and substr() functions (CVS 143)
FossilOrigin-Name: 0eef538f3de66fede7c88f8be8c3458d84107c3f
2000-08-28 15:51:43 +00:00
drh 3d441f8082 Version 1.0.3 (CVS 497)
FossilOrigin-Name: d35a1f8b37333e2df86c22c2dbd766132b4931b2
2000-08-22 18:30:00 +00:00
drh 63e2741e97 bug fix (CVS 142)
FossilOrigin-Name: f255ea6d4bb085a869485c14b4c96af13ca826fa
2000-08-22 18:29:33 +00:00
drh 64bde80a16 :-) (CVS 141)
FossilOrigin-Name: 7ecc9c447bd9259c52e82c8a75830c7fc3381af7
2000-08-22 13:47:56 +00:00
drh 4b1fb13436 :-) (CVS 140)
FossilOrigin-Name: 9d72ceb44d325963ffdf5d247961519dc2cb72ad
2000-08-22 13:43:28 +00:00
drh 3d0b5598c0 :-) (CVS 139)
FossilOrigin-Name: 67e2da38c30ca73707ad48064a23794cfcff7888
2000-08-22 13:40:51 +00:00
drh b217a57eb9 :-) (CVS 138)
FossilOrigin-Name: c6b71d9b4b09243401072eaa278fd1b9757a9c3d
2000-08-22 13:40:18 +00:00
drh 80afdca0d8 :-) (CVS 137)
FossilOrigin-Name: 5f6559ee7b82eb18078ddbb14d815d0ae0c7ff50
2000-08-22 13:27:22 +00:00
drh 61bc272814 bug fix in lemon (CVS 136)
FossilOrigin-Name: 6f4c080739333dbbc3556b5cf96f341f62167646
2000-08-20 11:42:46 +00:00
drh f4b283d086 Version 1.0.1 (CVS 498)
FossilOrigin-Name: e8521fc10dcfa02fc4ae35fa83f5bae4864a3d28
2000-08-18 09:59:59 +00:00
drh ea1fea5a50 :-) (CVS 135)
FossilOrigin-Name: 0a0576e2f9e5404dff68683ef6fdf04d3a350b1a
2000-08-18 09:58:51 +00:00
drh d317676578 configure script bug (CVS 134)
FossilOrigin-Name: 862b649204f27b4d5e8fa16b1140b945c17d0e14
2000-08-18 09:34:19 +00:00
drh bbd4a757a7 configure script bug (CVS 133)
FossilOrigin-Name: c773a449b1f152a83c93a26e169f60c4f30d50a2
2000-08-18 09:33:39 +00:00
drh 91523bee63 Version 1.0 (CVS 499)
FossilOrigin-Name: f37dd18e3fc6314eda2af786d74e0a445b9b2287
2000-08-17 10:25:00 +00:00
drh 303aaa78f3 add version numbering (CVS 132)
FossilOrigin-Name: 5ec2b094781bb3c32b0ef0284aa4dc2b26d9e873
2000-08-17 10:22:34 +00:00
drh 167a4b1c90 allow readonly access when write permission denied (CVS 131)
FossilOrigin-Name: 897b4bc0e92a2c7534d4fa9453a7f8f863fce67a
2000-08-17 09:49:59 +00:00
drh 30cab80923 bug fix (CVS 130)
FossilOrigin-Name: e8882dac2306afbc7bffdaa93c9a7fc45fdbd8e1
2000-08-09 17:17:25 +00:00
drh a50da106f0 Add pattern matching to the .table command (CVS 129)
FossilOrigin-Name: 2b3511eca7e562ef2428cec2f7eeca1d26b6c1c8
2000-08-08 20:19:09 +00:00
drh 4cdc9e8488 :-) (CVS 128)
FossilOrigin-Name: d53cccda4fa5d2f8287421e71488817eb4ca13eb
2000-08-04 14:56:24 +00:00
drh 2758db280d :-) (CVS 127)
FossilOrigin-Name: 695fd68eb6291bdcc04af0eec7c7cdd7ff10872b
2000-08-04 13:52:30 +00:00
drh 0e7c672adf :-) (CVS 126)
FossilOrigin-Name: e31be5824813d1690a4ee7bac9e49658a08c52c1
2000-08-04 13:51:10 +00:00
drh e3022ff873 :-) (CVS 1702)
FossilOrigin-Name: 14785d94fb3775da603001f4a9c2e4ecd732c898
2000-08-04 13:49:02 +00:00
drh bec3f4022f :-) (CVS 125)
FossilOrigin-Name: ab9c533a3a256ca9d59a6a580c6064c903d962a5
2000-08-04 13:49:02 +00:00
drh 60bfa67829 spelling error (CVS 124)
FossilOrigin-Name: 577421e5d370e220b5f228f4c711d49ce95612dc
2000-08-03 15:13:29 +00:00
drh b97bedb3db bug fix (CVS 123)
FossilOrigin-Name: 4dabf5e4e647f6dcdcfd45d1e885e379357a2d57
2000-08-03 15:09:19 +00:00
drh 2803757a35 file format change (CVS 122)
FossilOrigin-Name: b7b90237945d3577caba3a2f5595e52b25027297
2000-08-02 13:47:41 +00:00
drh c986c0af03 file format change (CVS 121)
FossilOrigin-Name: 4110936f112092b3bbc134f0717b899aad6502ad
2000-08-02 12:37:18 +00:00
drh 353f57e09b file format change (CVS 120)
FossilOrigin-Name: 67f8af377c8a92ac155f55afc75e9957bec4e787
2000-08-02 12:26:28 +00:00
drh ed380d8cf0 fix parser stack overflow (CVS 119)
FossilOrigin-Name: bffca90f37a69c5bd26b719a964408e0e518a7dc
2000-08-01 09:56:27 +00:00
drh dba9c7577f :-) (CVS 118)
FossilOrigin-Name: 4132d4760f6a2cbcf853f82546987d932e76e3c1
2000-07-31 19:16:31 +00:00
drh 867f9ee646 added winNT cross-compile documentation (CVS 117)
FossilOrigin-Name: 8fc48dd4831dbd58a0c10b043686ea52ca1db6dd
2000-07-31 18:56:15 +00:00
drh d0752609e9 :-) (CVS 116)
FossilOrigin-Name: a0246ddfb451801a78c34fde3ad72412323039dc
2000-07-31 14:10:47 +00:00
drh c81a45768a patches to compile for WinNT (CVS 1701)
FossilOrigin-Name: 52c2c50d09f568284d60f5b0715af0759e5f9b22
2000-07-31 13:38:25 +00:00
drh 82ad383270 patches to compile for WinNT (CVS 115)
FossilOrigin-Name: 47dfec3aaa896073ee0e26db428f0dc9b27f94f3
2000-07-31 13:38:24 +00:00
drh 1050f9875f :-) (CVS 114)
FossilOrigin-Name: dfbb8225c1da34673a37f571f1ca1e12928728fe
2000-07-31 11:59:02 +00:00
drh 16e5955f25 fix a configuration problem on TAC-4 (CVS 113)
FossilOrigin-Name: 69b73ea3a0822ce16e69813b387d596b183e7892
2000-07-31 11:57:37 +00:00
drh 95e961beaa documentation updates (CVS 112)
FossilOrigin-Name: c686c6076abadcb715fe74436fa8bab48d013b26
2000-07-30 20:04:43 +00:00
drh a0c66f5cd3 better column names in the shell (CVS 111)
FossilOrigin-Name: 57022a9d504e553d862f363b164c42ba53d8b489
2000-07-29 13:20:21 +00:00
drh e1b6a5b803 better column labels in select results (CVS 110)
FossilOrigin-Name: 3bf434d93a54a24f4882d0d9375f82ceee0b7602
2000-07-29 13:06:59 +00:00
drh 0e981533d8 added the sqlite_busy_handler() interface (CVS 1700)
FossilOrigin-Name: 2d57b02fec35fa922aab3f707e3b7dfa1ef561a0
2000-07-28 14:32:48 +00:00
drh 2dfbbcafb8 added the sqlite_busy_handler() interface (CVS 109)
FossilOrigin-Name: 4fe8e51c248369572637a5351bd193f07e059fa2
2000-07-28 14:32:48 +00:00
drh 78a3b40529 :-) (CVS 108)
FossilOrigin-Name: 937c27b7e18505d0f8b85d2040db8d6a8b7cd441
2000-06-26 12:02:50 +00:00
drh 74c360ee86 Begin writing the VDBE tutorial (CVS 107)
FossilOrigin-Name: 79ce59cf79df3da2c9dcb944dba15c64c99fbad1
2000-06-23 19:16:23 +00:00
drh cab27327af :-) (CVS 1699)
FossilOrigin-Name: e970079cc1fc5f8df8d892a3c3b2240e88f7fa8d
2000-06-23 17:02:08 +00:00
drh 167b16e473 :-) (CVS 106)
FossilOrigin-Name: d825931dea3ef91600ec0b1f95c6c6b094b5bd96
2000-06-23 17:02:08 +00:00
drh 1fd14a78e5 :-) (CVS 105)
FossilOrigin-Name: 516f022206a6000fb2a535c1dbf3e5cd9e077465
2000-06-21 14:00:39 +00:00
drh 967e8b7351 :-) (CVS 104)
FossilOrigin-Name: e1bf96a467b739373191bf75e6a097fc0f24bffc
2000-06-21 13:59:10 +00:00
drh 7ed19903c9 :-) (CVS 103)
FossilOrigin-Name: af14a5b3ba4a13665142b700e8864bf63d591d95
2000-06-19 19:10:28 +00:00
drh 6206d50a4a :-) (CVS 102)
FossilOrigin-Name: 8cce4d279de00da45c5970c8f0946f49e03e6846
2000-06-19 19:09:08 +00:00
drh 1ccde15d69 :-) (CVS 101)
FossilOrigin-Name: 6ed35a1d477906dc7e35bea0579951484fcdc858
2000-06-17 13:12:39 +00:00
drh 0040077d77 :-) (CVS 100)
FossilOrigin-Name: 1d4fe5599ed0bae18dba5842ab7ea1d34b8ec3ad
2000-06-16 20:51:26 +00:00
drh c08a4f1a9d :-) (CVS 99)
FossilOrigin-Name: ac38f460c8f5b9e5bb9d3cf2549f1787055f05cf
2000-06-15 16:49:48 +00:00
drh 28bd4bcc17 :-) (CVS 98)
FossilOrigin-Name: f26d0cdf45221a8fc97253c2a1939e79ae866fc9
2000-06-15 15:57:22 +00:00
drh 271cbff6c6 :-) (CVS 97)
FossilOrigin-Name: 3b9689cc35acd3008ca32b6b9882f4e625381c6e
2000-06-15 11:32:11 +00:00
drh 5fc27f937f :-) (CVS 96)
FossilOrigin-Name: 36c2b059ac1092c7a260f527bba261daa4ff9f9f
2000-06-12 17:49:22 +00:00
drh 1a67739414 :-) (CVS 1698)
FossilOrigin-Name: 662fa612dcc6f645edf95058fcfc702458edaaa2
2000-06-12 17:49:11 +00:00
drh e91cd0c85b :-) (CVS 95)
FossilOrigin-Name: 547e8b927bec0201bc1d3db899b966d5710b6c65
2000-06-12 12:36:36 +00:00
drh 61fc2c6bf6 :-) (CVS 94)
FossilOrigin-Name: 84b506b06c58b709a03921e2a09ef34acafb9a4e
2000-06-12 12:29:25 +00:00
drh 6de4f4ca1c :-) (CVS 93)
FossilOrigin-Name: 3c0540e6fb103402c3f37fd2df17f9786b363db0
2000-06-12 12:20:48 +00:00
drh 0bdaf62e9b added the fcnt() function for testing (CVS 92)
FossilOrigin-Name: 0f93c27cddb4254f72305ca3a64b77c2e7772c56
2000-06-11 23:50:13 +00:00
drh 31884b0bbc :-) (CVS 91)
FossilOrigin-Name: d573b431ed766db2d38672334a0c81faa1dde353
2000-06-09 14:14:32 +00:00
drh 37f0b25bce :-) (CVS 90)
FossilOrigin-Name: aba926bb336d7ac28d7ca73db47185801e5d2c79
2000-06-09 03:52:04 +00:00
drh dcc7c74cf9 :-) (CVS 89)
FossilOrigin-Name: 8de283ded11351962523264584c60192d1d2a4ac
2000-06-09 03:51:26 +00:00
drh d7805f08dd :-) (CVS 88)
FossilOrigin-Name: 3252269e9005fe3f31f285506430e33d1031da88
2000-06-09 03:47:19 +00:00
drh 18df8cbede :-) (CVS 87)
FossilOrigin-Name: 3661b5ff93b01da7fea9f85370ecdda1402b7164
2000-06-09 01:58:35 +00:00
drh 88923560db :-) (CVS 86)
FossilOrigin-Name: 049abcb37def4200fb8f4ad7cea60a1d53ee3219
2000-06-08 21:53:06 +00:00
drh 398f8fef28 :-) (CVS 85)
FossilOrigin-Name: 8b1c151b7b2243672a0bf0ac8377e82c568bacfb
2000-06-08 19:43:40 +00:00
drh 738bbfa0f4 :-) (CVS 84)
FossilOrigin-Name: 57dce04addf6389a0e2b723aea47da6a54bff14e
2000-06-08 19:38:36 +00:00
drh e840972fcf :-) (CVS 83)
FossilOrigin-Name: 2e5786d10148872db47d99e39c3f54597ad777c8
2000-06-08 16:54:40 +00:00
drh c837e70996 :-) (CVS 82)
FossilOrigin-Name: 33355b2d8d23b51e917961b7fb336bc1d454497f
2000-06-08 16:26:24 +00:00
drh 4cfa793437 :-) (CVS 81)
FossilOrigin-Name: 61c381e7e6c85619b7b494417956fc209c5b7b84
2000-06-08 15:10:46 +00:00
drh 6e142f5479 remove all memory leaks (CVS 80)
FossilOrigin-Name: bf98cf82a73c54c4eced04994bb1a019844dfc03
2000-06-08 13:36:40 +00:00
drh aaf88729b7 :-) (CVS 79)
FossilOrigin-Name: 305b043f4f71278d6d2c32e6e457f63efefae20d
2000-06-08 11:25:00 +00:00
drh 191b690eb3 :-) (CVS 78)
FossilOrigin-Name: 923c14fe120c7d5470a18257659154c4f98226b7
2000-06-08 11:13:01 +00:00
drh 92cd52f5b6 :-) (CVS 77)
FossilOrigin-Name: b3fb15ccde399318bde8c87362ecaa3a744f0680
2000-06-08 01:55:29 +00:00
drh 92dba24b69 :-) (CVS 76)
FossilOrigin-Name: 19029233082e319d4bfd94b22a694c917d8f0296
2000-06-08 00:28:51 +00:00
drh 10e5e3cfde :-) (CVS 75)
FossilOrigin-Name: c47d552e7e275dcc03a687e2a874e8e6e1eeb109
2000-06-08 00:19:02 +00:00
drh d8bc708652 :-) (CVS 74)
FossilOrigin-Name: 2ffeb8509c469f5a499d56bb109da079fcdff570
2000-06-07 23:51:50 +00:00
drh 792365e239 :-) (CVS 73)
FossilOrigin-Name: a00b81b0e1878487a6edaaca1b0dff002ad506d8
2000-06-07 15:39:03 +00:00
drh 56c58161ca :-) (CVS 72)
FossilOrigin-Name: 6f8de336d0c0c5b74fa2ff541ab974ba13638a58
2000-06-07 15:24:40 +00:00
drh 0917d8b467 :-) (CVS 71)
FossilOrigin-Name: a92eb77170411f3781bdfe52dddcefaf70f73ac3
2000-06-07 15:23:56 +00:00
drh cc85b411c7 :-) (CVS 70)
FossilOrigin-Name: d3baa046c946a2c4d5567ee57d96a6c8aa5740b9
2000-06-07 15:11:27 +00:00
drh dc0b159ed1 :-) (CVS 69)
FossilOrigin-Name: e4f6b17f66ddbb0bcf13bb9fffc98e5c102151ef
2000-06-07 14:42:26 +00:00
drh 5974a30f1a :-) (CVS 1697)
FossilOrigin-Name: 5d773b5d4e9c23b81f53afd0cef7bd2300fff329
2000-06-07 14:42:26 +00:00
drh 670f74f502 :-) (CVS 68)
FossilOrigin-Name: fc8d25ea1fffa115fad15b9eb8bb0b0aaaff0431
2000-06-07 02:04:22 +00:00
drh 73755922df :-) (CVS 67)
FossilOrigin-Name: 8bff1bee63b77353b4cfe5aa0c662187a7bf93da
2000-06-07 01:33:42 +00:00
drh 4c653a0f78 :-) (CVS 66)
FossilOrigin-Name: 5d2e72e4bd5e218133190b8b1ebe52f48e2d7140
2000-06-07 01:27:47 +00:00
drh 596925440c :-) (CVS 65)
FossilOrigin-Name: 80ee166ed1bb3694530a73c57544cb4d16964884
2000-06-07 00:12:24 +00:00
drh f500577561 :-) (CVS 64)
FossilOrigin-Name: 3a2f4dcab299aceeba3afc223f424cd1d4d13c9d
2000-06-06 22:19:00 +00:00
drh 1ecec3c03e :-) (CVS 63)
FossilOrigin-Name: 65d2100d33350e6bce30d4d75f3cead9fcab3efb
2000-06-06 22:13:55 +00:00
drh 82c3d6368d :-) (CVS 62)
FossilOrigin-Name: f4d9089c5d69b16fee5feb49b02e524499e6328d
2000-06-06 21:56:07 +00:00
drh 6b922e545f :-) (CVS 61)
FossilOrigin-Name: 25984b4d3ce0f94fa98a159d840cc7bd4e8bc1ab
2000-06-06 19:18:23 +00:00
drh 49c8780abc :-) (CVS 60)
FossilOrigin-Name: 4eca3bf64fd96303bee653b7e44fa7bbdfccbdfb
2000-06-06 18:24:42 +00:00
drh da93281e8d :-) (CVS 59)
FossilOrigin-Name: a8fa6719d55b43f8d194aecfcae5af42d17742af
2000-06-06 18:00:15 +00:00
drh 2282792a4a GROUP BY and HAVING installed (CVS 58)
FossilOrigin-Name: db88a0c2d4b5c5cd05e0172f061fc33763fe3829
2000-06-06 17:27:05 +00:00
drh 4794b98035 added IN and BETWEEN operators (CVS 57)
FossilOrigin-Name: 54d198189b58366e4e40139102bc6de94ac55e18
2000-06-06 13:54:14 +00:00
drh cfab11bcba :-) (CVS 56)
FossilOrigin-Name: b52dd82fe32c38c999aef4f07d046d0428336965
2000-06-06 03:31:22 +00:00
drh fef5208c15 :-) (CVS 55)
FossilOrigin-Name: bd8b2645cc16759571c8c622dce4752bd35c04cf
2000-06-06 01:50:43 +00:00
drh 600b1b2f01 added Agg opcodes to the vdbe (CVS 54)
FossilOrigin-Name: e9ed5d2a3639161fb58856275ba9495f21d366bf
2000-06-05 21:39:48 +00:00
drh e0a4e3c6f1 :-) (CVS 53)
FossilOrigin-Name: 3dbfa558ef01ac9249a3f40da49bc71cc7b040bc
2000-06-05 18:56:43 +00:00
drh 19a775c249 :-) (CVS 52)
FossilOrigin-Name: c02268bdf4c28edc2542ce0ca1ba24fd6b5058fa
2000-06-05 18:54:46 +00:00
drh 9bb61fe751 separate Select structure (CVS 51)
FossilOrigin-Name: ce45dea902f9010a1c2c9ba3550dd789e7c15fcd
2000-06-05 16:01:39 +00:00
drh d1dedb86bf :-) (CVS 50)
FossilOrigin-Name: 1cf2873d55b471bb3e397f90dc0868dd88c440a0
2000-06-05 02:07:04 +00:00
drh c61053b771 rework the VDBE engine. NULL is now distinct from "" (CVS 49)
FossilOrigin-Name: 6ea5cebf05562de00d2cf0b9e2aac5f3857638ee
2000-06-04 12:58:36 +00:00
drh 32aa77ed6e :-) (CVS 48)
FossilOrigin-Name: f76656416500851069633cc603905befa27cca66
2000-06-03 19:28:48 +00:00
drh 8be51133aa :-) (CVS 47)
FossilOrigin-Name: 729d6586b8377d0e6cefa64c8cf3d883e9f0ddc3
2000-06-03 19:19:41 +00:00
drh 7020f6516c added default values (CVS 46)
FossilOrigin-Name: 27c0678623de37f3166cb9952989fd03484cdb8d
2000-06-03 18:06:52 +00:00
drh 064e64575d :-) (CVS 45)
FossilOrigin-Name: 3e88142e908de02b5c8243c47dc9ca237cb7f011
2000-06-02 23:22:39 +00:00
drh b0c86771d5 :-) (CVS 44)
FossilOrigin-Name: cd83d3cfeb26ebf0d33e7113d0ee549c9cfd55c5
2000-06-02 23:21:26 +00:00
drh e45132655e :-) (CVS 43)
FossilOrigin-Name: 60f45a3ba56059f956cca0c3a6a1ffa82a055a36
2000-06-02 23:04:51 +00:00
drh b1edd01ec9 :-) (CVS 42)
FossilOrigin-Name: 11e3296319843356cf09832577f7dea4b33c78be
2000-06-02 18:52:12 +00:00
drh 432acbc9bd :-) (CVS 41)
FossilOrigin-Name: 90cfd6174ba508090c87c52973342101559c82b1
2000-06-02 15:51:18 +00:00
drh d75f54ed81 :-) (CVS 40)
FossilOrigin-Name: 939adb4d373842db0dde6ea00ee2c40316db5ac3
2000-06-02 15:05:33 +00:00
drh 1b07be5ab8 :-) (CVS 39)
FossilOrigin-Name: 721d58f4e1677a5814c00a59cce8c065fea8e7fe
2000-06-02 14:38:46 +00:00
drh df16aed362 :-) (CVS 38)
FossilOrigin-Name: 46c4b792e0a0e61c417f5c1771e013d90d652507
2000-06-02 14:27:22 +00:00
drh bed8690fde :-) (CVS 37)
FossilOrigin-Name: 2b55f9b790e2914bbd2fd27ef23bbab79fa76937
2000-06-02 13:27:59 +00:00
drh bdc2df79b6 :-) (CVS 1696)
FossilOrigin-Name: 80d925b82b176df7f73a1747a6ed711ac3d9a0d3
2000-06-02 02:09:23 +00:00
drh eec553b695 :-) (CVS 36)
FossilOrigin-Name: d3c31defbaf25f470d0977c39325890ab8bad054
2000-06-02 01:51:20 +00:00
drh 3143701663 :-) (CVS 35)
FossilOrigin-Name: a57ecd606c8caa67db240d1a4bc46c0a590fde0c
2000-06-02 01:36:16 +00:00
drh 58b9576b7a :-) (CVS 34)
FossilOrigin-Name: 52338f4ab5990fefc61f615cd65c3a724b365199
2000-06-02 01:17:37 +00:00
drh 5494880a71 :-) (CVS 33)
FossilOrigin-Name: 6b9056364e62cff017447ea979bb29dc78fb9f73
2000-06-01 11:16:51 +00:00
drh b5436eecac :-) (CVS 32)
FossilOrigin-Name: 81bee278dc8304b12891b5319bcbf1de361b3659
2000-06-01 00:04:41 +00:00
drh 5f68fc952c :-) (CVS 31)
FossilOrigin-Name: f035dec94aa1b9f76b18350a558debbb63f7834a
2000-06-01 00:03:43 +00:00
drh 1e5d0e9941 :-) (CVS 30)
FossilOrigin-Name: 9b8458bbcef19882f14f0e96575fc3f0a86df97a
2000-05-31 23:33:17 +00:00
drh c3c2fc9a49 :-) (CVS 29)
FossilOrigin-Name: 09054df318240f2f2b365f7b24655473c1ab6655
2000-05-31 22:58:39 +00:00
drh 56d48ad19c :-) (CVS 28)
FossilOrigin-Name: 57c5add197c12c919e2556b5ac421803398f2c1b
2000-05-31 21:06:30 +00:00
drh efb7251d6e added DISTINCT on select (CVS 27)
FossilOrigin-Name: 1f0c4ffd98591e506201b6b0e6e60b9216ceb596
2000-05-31 20:00:52 +00:00
drh ec86adb88b :-) (CVS 26)
FossilOrigin-Name: 0b7d9eb8ad771917c53587ea4d674f7e8d76121f
2000-05-31 18:33:09 +00:00
drh da9d6c4572 :-) (CVS 25)
FossilOrigin-Name: 35a8f523e8389a1a6e41f6561500644b165d556e
2000-05-31 18:20:14 +00:00
drh 3aadb2e64c :-) (CVS 24)
FossilOrigin-Name: 4cd98ebaeaedf66b258bbfa3a04d90c054294322
2000-05-31 17:59:25 +00:00
drh bf66fff0c5 :-) (CVS 23)
FossilOrigin-Name: 0b040cea57ee76103030c0d5ef571dc481a2b2d3
2000-05-31 15:43:25 +00:00
drh 7203e28178 :-) (CVS 22)
FossilOrigin-Name: d33ad08e0d909cfe731a5616fde6be0c681dc191
2000-05-31 15:35:42 +00:00
drh cce7d17614 added aggregate functions like count(*) (CVS 21)
FossilOrigin-Name: dee7a8be88a95014534b90b96716d9e2e6b16579
2000-05-31 15:34:51 +00:00
drh dce2cbe65f :-) (CVS 20)
FossilOrigin-Name: 01d85b35e9c4ca5619ad21a4232a8f8bf9ec3538
2000-05-31 02:27:49 +00:00
drh 7e391e1728 :-) (CVS 19)
FossilOrigin-Name: 03725ce5ae871247789ece0f2c3426f74ba575e7
2000-05-30 20:17:49 +00:00
drh 29e30bfa6f :-) (CVS 18)
FossilOrigin-Name: 2d41caec807a6ab83b67e59c849ebbda004f2869
2000-05-30 19:22:26 +00:00
drh 8e7e7a2a56 loads the complete ACD database! (CVS 17)
FossilOrigin-Name: 97a0fb780ea1992c4d681cc0301bbfa1a06c2fb0
2000-05-30 18:45:23 +00:00
drh b766599b70 :-) (CVS 16)
FossilOrigin-Name: b56d1b9c0f957f3dfb380c01d31ff7c08bcd523b
2000-05-30 17:30:35 +00:00
drh 982cef7e98 :-) (CVS 15)
FossilOrigin-Name: 8d66c7355de1d87b25c4fb92d0ef3603da72899a
2000-05-30 16:27:03 +00:00
drh dcc581ccae :-) (CVS 14)
FossilOrigin-Name: 1bb8ee8d9f1d3c409a11910e7552e4bb5e7f5f87
2000-05-30 13:44:19 +00:00
drh 8d2cb149ea :-) (CVS 13)
FossilOrigin-Name: 191a7f484e0a10839e7e1c8eb6658536643e4756
2000-05-30 03:28:35 +00:00
drh 1d37e284f7 :-) (CVS 12)
FossilOrigin-Name: 20f2811fc19f937ed03bdb0e9d87a40c75452b17
2000-05-30 03:12:21 +00:00
drh 62c6819115 :-) (CVS 11)
FossilOrigin-Name: 9818723ee127bc535e79f6876546cc027b4999e6
2000-05-30 00:51:26 +00:00
drh a5c2f08f20 :-) (CVS 10)
FossilOrigin-Name: 1c1d9c0d4ad91cf0b077f4fff82499dcafae36d7
2000-05-30 00:05:12 +00:00
drh 1b6a71fe6c :-) (CVS 9)
FossilOrigin-Name: 84333008b70a11006053938f95bb048f7ee4f655
2000-05-29 23:58:11 +00:00
drh bec2bf407f :-) (CVS 8)
FossilOrigin-Name: e34143c24f1b3eff0c9f1e22702f099674e0ef4e
2000-05-29 23:48:22 +00:00
drh b24fcbe6b4 :-) (CVS 7)
FossilOrigin-Name: fdf4b31a18fcbbcd358bf92c91fccbf94a79bc26
2000-05-29 23:30:50 +00:00
drh 348784efc0 :-) (CVS 6)
FossilOrigin-Name: 1517f85243b63511c2ceb73a10453c5ae56d3428
2000-05-29 20:41:49 +00:00
drh 806818db31 :-) (CVS 5)
FossilOrigin-Name: 9fd0628af897c54c122fdef02f79788385ece39c
2000-05-29 18:50:16 +00:00
drh cefc92b8a3 :-) (CVS 4)
FossilOrigin-Name: 1d3286702cf267857190e6082db15ba4132453d7
2000-05-29 18:32:16 +00:00
drh dd1dcd511b :-) (CVS 3)
FossilOrigin-Name: 9e36a6014b9e8298d8fff71f0f1e3fd5610c30bd
2000-05-29 18:20:15 +00:00
drh 305cea69d5 :-) (CVS 2)
FossilOrigin-Name: 53841c66c699665e83c933627bbe7a193cfccb6b
2000-05-29 17:44:25 +00:00
drh 75897234be initial check-in of the new version (CVS 1)
FossilOrigin-Name: 6f3655f79f9b6fc9fb7baaa10a7e0f2b6a512dfa
2000-05-29 14:26:00 +00:00
drh ce0da46e61 initial empty check-in
FossilOrigin-Name: 704b122e5308587b60b47a5c2fff40c593d4bf8f
2000-05-29 14:15:59 +00:00
815 changed files with 77141 additions and 337937 deletions
-138
View File
@@ -1,138 +0,0 @@
#!/usr/make
#
# Makefile for SQLITE
#
# This is a template makefile for SQLite. Most people prefer to
# use the autoconf generated "configure" script to generate the
# makefile automatically. But that does not work for everybody
# and in every situation. If you are having problems with the
# "configure" script, you might want to try this makefile as an
# alternative. Create a copy of this file, edit the parameters
# below and type "make".
#
#### The directory where to find the mingw32ce tools
MINGW32CE = /opt/mingw32ce/bin
#### The target prefix of the mingw32ce tools
TARGET = arm-wince-mingw32ce
#### The toplevel directory of the source tree. This is the directory
# that contains this "Makefile.in" and the "configure.in" script.
#
TOP = ../sqlite
#### C Compiler and options for use in building executables that
# will run on the platform that is doing the build.
#
BCC = gcc -g -O2
#BCC = /opt/ancic/bin/c89 -0
#### If the target operating system supports the "usleep()" system
# call, then define the HAVE_USLEEP macro for all C modules.
#
USLEEP =
#USLEEP = -DHAVE_USLEEP=1
#### If you want the SQLite library to be safe for use within a
# multi-threaded program, then define the following macro
# appropriately:
#
THREADSAFE = -DTHREADSAFE=1
#THREADSAFE = -DTHREADSAFE=0
#### Specify any extra linker options needed to make the library
# thread safe
#
#THREADLIB = -lpthread
THREADLIB =
#### Specify any extra libraries needed to access required functions.
#
#TLIBS = -lrt # fdatasync on Solaris 8
TLIBS =
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
# malloc()s and free()s in order to track down memory leaks.
#
# SQLite uses some expensive assert() statements in the inner loop.
# You can make the library go almost twice as fast if you compile
# with -DNDEBUG=1
#
#OPTS = -DSQLITE_DEBUG=2
#OPTS = -DSQLITE_DEBUG=1
#OPTS =
OPTS = -DNDEBUG=1 -DSQLITE_OS_WIN=1 -D_WIN32_WCE=1
#OPTS += -DHAVE_FDATASYNC=1
#### The suffix to add to executable files. ".exe" for windows.
# Nothing for unix.
#
EXE = .exe
#EXE =
#### C Compile and options for use in building executables that
# will run on the target platform. This is usually the same
# as BCC, unless you are cross-compiling.
#
#TCC = gcc -O6
#TCC = gcc -g -O0 -Wall
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
TCC = $(MINGW32CE)/$(TARGET)-gcc -O2
#TCC = /opt/ansic/bin/c89 -O +z -Wl,-a,archive
#### Tools used to build a static library.
#
#AR = ar cr
#AR = /opt/mingw/bin/i386-mingw32-ar cr
AR = $(MINGW32CE)/$(TARGET)-ar cr
#RANLIB = ranlib
#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
RANLIB = $(MINGW32CE)/$(TARGET)-ranlib
#MKSHLIB = gcc -shared
#SO = so
#SHPREFIX = lib
MKSHLIB = $(MINGW32CE)/$(TARGET)-gcc -shared
SO = dll
SHPREFIX =
#### Extra compiler options needed for programs that use the TCL library.
#
#TCL_FLAGS =
#TCL_FLAGS = -DSTATIC_BUILD=1
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
#### Linker options needed to link against the TCL library.
#
#LIBTCL = -ltcl -lm -ldl
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
#### Additional objects for SQLite library when TCL support is enabled.
TCLOBJ =
#TCLOBJ = tclsqlite.o
#### Compiler options needed for programs that use the readline() library.
#
READLINE_FLAGS =
#READLINE_FLAGS = -DHAVE_READLINE=1 -I/usr/include/readline
#### Linker options needed by programs using readline() must link against.
#
LIBREADLINE =
#LIBREADLINE = -static -lreadline -ltermcap
#### Which "awk" program provides nawk compatibilty
#
# NAWK = nawk
NAWK = awk
# You should not have to change anything below this line
###############################################################################
include $(TOP)/main.mk
+310 -484
View File
File diff suppressed because it is too large Load Diff
+3 -19
View File
@@ -41,11 +41,6 @@ THREADSAFE = -DTHREADSAFE=0
#THREADLIB = -lpthread
THREADLIB =
#### Specify any extra libraries needed to access required functions.
#
#TLIBS = -lrt # fdatasync on Solaris 8
TLIBS =
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
# malloc()s and free()s in order to track down memory leaks.
@@ -58,7 +53,6 @@ TLIBS =
#OPTS = -DSQLITE_DEBUG=1
#OPTS =
OPTS = -DNDEBUG=1
OPTS += -DHAVE_FDATASYNC=1
#### The suffix to add to executable files. ".exe" for windows.
# Nothing for unix.
@@ -83,12 +77,6 @@ AR = ar cr
RANLIB = ranlib
#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
MKSHLIB = gcc -shared
SO = so
SHPREFIX = lib
# SO = dll
# SHPREFIX =
#### Extra compiler options needed for programs that use the TCL library.
#
#TCL_FLAGS =
@@ -104,10 +92,6 @@ LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
#### Additional objects for SQLite library when TCL support is enabled.
#TCLOBJ =
TCLOBJ = tclsqlite.o
#### Compiler options needed for programs that use the readline() library.
#
READLINE_FLAGS =
@@ -118,10 +102,10 @@ READLINE_FLAGS =
LIBREADLINE =
#LIBREADLINE = -static -lreadline -ltermcap
#### Which "awk" program provides nawk compatibilty
#### Should the database engine assume text is coded as UTF-8 or iso8859?
#
# NAWK = nawk
NAWK = awk
# ENCODING = UTF8
ENCODING = ISO8859
# You should not have to change anything below this line
###############################################################################
-661
View File
@@ -1,661 +0,0 @@
#!/usr/make
#
# Makefile for SQLITE on VxWorks
ifeq ($(FORCPU),)
FORCPU = SH32gnule
endif
TOOL_FAMILY = gnu
include $(WIND_USR)/tool/gnu/make.$(FORCPU)
#### The toplevel directory of the source tree. This is the directory
# that contains this "Makefile.in" and the "configure.in" script.
#
TOP = .
#### C Compiler and options for use in building executables that
# will run on the platform that is doing the build.
#
BCC = gcc -g -O2
#BCC = /opt/ancic/bin/c89 -0
#### If the target operating system supports the "usleep()" system
# call, then define the HAVE_USLEEP macro for all C modules.
#
USLEEP =
#USLEEP = -DHAVE_USLEEP=1
#### If you want the SQLite library to be safe for use within a
# multi-threaded program, then define the following macro
# appropriately:
#
THREADSAFE = -DSQLITE_THREADSAFE=1
#THREADSAFE = -DSQLITE_THREADSAFE=0
#### Specify any extra linker options needed to make the library
# thread safe
#
#THREADLIB = -lpthread
THREADLIB =
#### Specify any extra libraries needed to access required functions.
#
ifeq ($(CPU),SH32)
# for SH4 shared library
TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
else
# for all other CPUs shared library
TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
endif
# for static library
TLIBS += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
# malloc()s and free()s in order to track down memory leaks.
#
# SQLite uses some expensive assert() statements in the inner loop.
# You can make the library go almost twice as fast if you compile
# with -DNDEBUG=1
#
#OPTS = -DSQLITE_DEBUG=2
#OPTS = -DSQLITE_DEBUG=1
#OPTS =
OPTS = -DNDEBUG=1 -DSQLITE_OS_UNIX=1 $(THREADSAFE)
OPTS += -DSQLITE_OMIT_LOAD_EXTENSION=1
OPTS += -DSQLITE_ENABLE_LOCKING_STYLE=1
OPTS += -DSQLITE_THREAD_OVERRIDE_LOCK=0
OPTS += -DSQLITE_ENABLE_COLUMN_METADATA=1
OPTS += -DHAVE_FDATASYNC=1
#### The suffix to add to executable files. ".exe" for windows.
# Nothing for unix.
#
EXE = .vxe
#EXE =
#### C Compile and options for use in building executables that
# will run on the target platform. This is usually the same
# as BCC, unless you are cross-compiling.
#
#TCC = gcc -O6
#TCC = gcc -g -O0 -Wall
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
TCC = $(CC) $(DEFINE_CC) -O2 -g -mrtp $(CC_ARCH_SPEC) -D_REENTRANT=1 -D_VX_CPU=_VX_$(CPU) -D_VX_TOOL_FAMILY=$(TOOL_FAMILY) -D_VX_TOOL=$(TOOL)
TCC += -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip
#TCC = /opt/ansic/bin/c89 -O +z -Wl,-a,archive
#TCC_SHARED = $(TCC) -fPIC
TCC_SHARED = $(TCC)
#### Tools used to build a static library.
#
#ARX = ar cr
#ARX = /opt/mingw/bin/i386-mingw32-ar cr
AR += cr
#RANLIB = ranlib
#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
#MKSHLIB = gcc -shared
#SO = so
#SHPREFIX = lib
MKSHLIB = $(CC) $(DEFINE_CC) -mrtp -shared $(CC_ARCH_SPEC) -D_VX_CPU=_VX_$(CPU) -D_VX_TOOL_FAMILY=$(TOOL_FAMILY) -D_VX_TOOL=$(TOOL)
SO = so
SHPREFIX = lib
#### Extra compiler options needed for programs that use the TCL library.
#
#TCL_FLAGS =
#TCL_FLAGS = -DSTATIC_BUILD=1
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
#### Linker options needed to link against the TCL library.
#
#LIBTCL = -ltcl -lm -ldl
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
#### Additional objects for SQLite library when TCL support is enabled.
TCLOBJ =
#TCLOBJ = tclsqlite.o
#### Compiler options needed for programs that use the readline() library.
#
READLINE_FLAGS =
#READLINE_FLAGS = -DHAVE_READLINE=1 -I/usr/include/readline
#### Linker options needed by programs using readline() must link against.
#
LIBREADLINE =
#LIBREADLINE = -static -lreadline -ltermcap
#### Which "awk" program provides nawk compatibilty
#
# NAWK = nawk
NAWK = awk
#### Pasted and adapted main.mk file
###############################################################################
# The following macros should be defined before this script is
# invoked:
#
# TOP The toplevel directory of the source tree. This is the
# directory that contains this "Makefile.in" and the
# "configure.in" script.
#
# BCC C Compiler and options for use in building executables that
# will run on the platform that is doing the build.
#
# THREADLIB Specify any extra linker options needed to make the library
# thread safe
#
# OPTS Extra compiler command-line options.
#
# EXE The suffix to add to executable files. ".exe" for windows
# and "" for Unix.
#
# TCC C Compiler and options for use in building executables that
# will run on the target platform. This is usually the same
# as BCC, unless you are cross-compiling.
#
# AR Tools used to build a static library.
# RANLIB
#
# TCL_FLAGS Extra compiler options needed for programs that use the
# TCL library.
#
# LIBTCL Linker options needed to link against the TCL library.
#
# READLINE_FLAGS Compiler options needed for programs that use the
# readline() library.
#
# LIBREADLINE Linker options needed by programs using readline() must
# link against.
#
# NAWK Nawk compatible awk program. Older (obsolete?) solaris
# systems need this to avoid using the original AT&T AWK.
#
# Once the macros above are defined, the rest of this make script will
# build the SQLite library and testing tools.
################################################################################
# This is how we compile
#
TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) \
-I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3 \
-I$(TOP)/ext/async
# Object files for the SQLite library.
#
LIBOBJ+= alter.o analyze.o attach.o auth.o \
backup.o bitvec.o btmutex.o btree.o build.o \
callback.o complete.o date.o delete.o expr.o fault.o \
fts3.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
fts3_tokenizer.o fts3_tokenizer1.o \
func.o global.o hash.o \
icu.o insert.o journal.o legacy.o loadext.o \
main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
memjournal.o \
mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \
pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
random.o resolve.o rowset.o rtree.o select.o status.o \
table.o tokenize.o trigger.o \
update.o util.o vacuum.o \
vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o \
walker.o where.o utf.o vtab.o
# All of the source code files.
#
SRC = \
$(TOP)/src/alter.c \
$(TOP)/src/analyze.c \
$(TOP)/src/attach.c \
$(TOP)/src/auth.c \
$(TOP)/src/backup.c \
$(TOP)/src/bitvec.c \
$(TOP)/src/btmutex.c \
$(TOP)/src/btree.c \
$(TOP)/src/btree.h \
$(TOP)/src/btreeInt.h \
$(TOP)/src/build.c \
$(TOP)/src/callback.c \
$(TOP)/src/complete.c \
$(TOP)/src/date.c \
$(TOP)/src/delete.c \
$(TOP)/src/expr.c \
$(TOP)/src/fault.c \
$(TOP)/src/func.c \
$(TOP)/src/global.c \
$(TOP)/src/hash.c \
$(TOP)/src/hash.h \
$(TOP)/src/hwtime.h \
$(TOP)/src/insert.c \
$(TOP)/src/journal.c \
$(TOP)/src/legacy.c \
$(TOP)/src/loadext.c \
$(TOP)/src/main.c \
$(TOP)/src/malloc.c \
$(TOP)/src/mem0.c \
$(TOP)/src/mem1.c \
$(TOP)/src/mem2.c \
$(TOP)/src/mem3.c \
$(TOP)/src/mem5.c \
$(TOP)/src/memjournal.c \
$(TOP)/src/mutex.c \
$(TOP)/src/mutex.h \
$(TOP)/src/mutex_noop.c \
$(TOP)/src/mutex_os2.c \
$(TOP)/src/mutex_unix.c \
$(TOP)/src/mutex_w32.c \
$(TOP)/src/notify.c \
$(TOP)/src/os.c \
$(TOP)/src/os.h \
$(TOP)/src/os_common.h \
$(TOP)/src/os_os2.c \
$(TOP)/src/os_unix.c \
$(TOP)/src/os_win.c \
$(TOP)/src/pager.c \
$(TOP)/src/pager.h \
$(TOP)/src/parse.y \
$(TOP)/src/pcache.c \
$(TOP)/src/pcache.h \
$(TOP)/src/pcache1.c \
$(TOP)/src/pragma.c \
$(TOP)/src/prepare.c \
$(TOP)/src/printf.c \
$(TOP)/src/random.c \
$(TOP)/src/resolve.c \
$(TOP)/src/rowset.c \
$(TOP)/src/select.c \
$(TOP)/src/status.c \
$(TOP)/src/shell.c \
$(TOP)/src/sqlite.h.in \
$(TOP)/src/sqlite3ext.h \
$(TOP)/src/sqliteInt.h \
$(TOP)/src/sqliteLimit.h \
$(TOP)/src/table.c \
$(TOP)/src/tclsqlite.c \
$(TOP)/src/tokenize.c \
$(TOP)/src/trigger.c \
$(TOP)/src/utf.c \
$(TOP)/src/update.c \
$(TOP)/src/util.c \
$(TOP)/src/vacuum.c \
$(TOP)/src/vdbe.c \
$(TOP)/src/vdbe.h \
$(TOP)/src/vdbeapi.c \
$(TOP)/src/vdbeaux.c \
$(TOP)/src/vdbeblob.c \
$(TOP)/src/vdbemem.c \
$(TOP)/src/vdbeInt.h \
$(TOP)/src/vtab.c \
$(TOP)/src/walker.c \
$(TOP)/src/where.c
# Source code for extensions
#
SRC += \
$(TOP)/ext/fts1/fts1.c \
$(TOP)/ext/fts1/fts1.h \
$(TOP)/ext/fts1/fts1_hash.c \
$(TOP)/ext/fts1/fts1_hash.h \
$(TOP)/ext/fts1/fts1_porter.c \
$(TOP)/ext/fts1/fts1_tokenizer.h \
$(TOP)/ext/fts1/fts1_tokenizer1.c
SRC += \
$(TOP)/ext/fts2/fts2.c \
$(TOP)/ext/fts2/fts2.h \
$(TOP)/ext/fts2/fts2_hash.c \
$(TOP)/ext/fts2/fts2_hash.h \
$(TOP)/ext/fts2/fts2_icu.c \
$(TOP)/ext/fts2/fts2_porter.c \
$(TOP)/ext/fts2/fts2_tokenizer.h \
$(TOP)/ext/fts2/fts2_tokenizer.c \
$(TOP)/ext/fts2/fts2_tokenizer1.c
SRC += \
$(TOP)/ext/fts3/fts3.c \
$(TOP)/ext/fts3/fts3.h \
$(TOP)/ext/fts3/fts3_expr.c \
$(TOP)/ext/fts3/fts3_expr.h \
$(TOP)/ext/fts3/fts3_hash.c \
$(TOP)/ext/fts3/fts3_hash.h \
$(TOP)/ext/fts3/fts3_icu.c \
$(TOP)/ext/fts3/fts3_porter.c \
$(TOP)/ext/fts3/fts3_tokenizer.h \
$(TOP)/ext/fts3/fts3_tokenizer.c \
$(TOP)/ext/fts3/fts3_tokenizer1.c
SRC += \
$(TOP)/ext/icu/sqliteicu.h \
$(TOP)/ext/icu/icu.c
SRC += \
$(TOP)/ext/rtree/rtree.h \
$(TOP)/ext/rtree/rtree.c
# Generated source code files
#
SRC += \
keywordhash.h \
opcodes.c \
opcodes.h \
parse.c \
parse.h \
sqlite3.h
# Source code to the test files.
#
TESTSRC = \
$(TOP)/src/test1.c \
$(TOP)/src/test2.c \
$(TOP)/src/test3.c \
$(TOP)/src/test4.c \
$(TOP)/src/test5.c \
$(TOP)/src/test6.c \
$(TOP)/src/test7.c \
$(TOP)/src/test8.c \
$(TOP)/src/test9.c \
$(TOP)/src/test_autoext.c \
$(TOP)/src/test_async.c \
$(TOP)/src/test_backup.c \
$(TOP)/src/test_btree.c \
$(TOP)/src/test_config.c \
$(TOP)/src/test_devsym.c \
$(TOP)/src/test_func.c \
$(TOP)/src/test_hexio.c \
$(TOP)/src/test_journal.c \
$(TOP)/src/test_malloc.c \
$(TOP)/src/test_md5.c \
$(TOP)/src/test_mutex.c \
$(TOP)/src/test_onefile.c \
$(TOP)/src/test_osinst.c \
$(TOP)/src/test_pcache.c \
$(TOP)/src/test_schema.c \
$(TOP)/src/test_server.c \
$(TOP)/src/test_tclvar.c \
$(TOP)/src/test_thread.c \
$(TOP)/src/test_wsd.c \
#TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
#TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c
TESTSRC2 = \
$(TOP)/src/attach.c $(TOP)/src/backup.c $(TOP)/src/btree.c \
$(TOP)/src/build.c $(TOP)/src/date.c \
$(TOP)/src/expr.c $(TOP)/src/func.c $(TOP)/src/insert.c $(TOP)/src/os.c \
$(TOP)/src/os_os2.c $(TOP)/src/os_unix.c $(TOP)/src/os_win.c \
$(TOP)/src/pager.c $(TOP)/src/pragma.c $(TOP)/src/prepare.c \
$(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c \
$(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c \
$(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
$(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c \
$(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c \
$(TOP)/ext/fts3/fts3_tokenizer.c \
$(TOP)/ext/async/sqlite3async.c
# Header files used by all library source files.
#
HDR = \
$(TOP)/src/btree.h \
$(TOP)/src/btreeInt.h \
$(TOP)/src/hash.h \
$(TOP)/src/hwtime.h \
keywordhash.h \
$(TOP)/src/mutex.h \
opcodes.h \
$(TOP)/src/os.h \
$(TOP)/src/os_common.h \
$(TOP)/src/pager.h \
$(TOP)/src/pcache.h \
parse.h \
sqlite3.h \
$(TOP)/src/sqlite3ext.h \
$(TOP)/src/sqliteInt.h \
$(TOP)/src/sqliteLimit.h \
$(TOP)/src/vdbe.h \
$(TOP)/src/vdbeInt.h
# Header files used by extensions
#
EXTHDR += \
$(TOP)/ext/fts1/fts1.h \
$(TOP)/ext/fts1/fts1_hash.h \
$(TOP)/ext/fts1/fts1_tokenizer.h
EXTHDR += \
$(TOP)/ext/fts2/fts2.h \
$(TOP)/ext/fts2/fts2_hash.h \
$(TOP)/ext/fts2/fts2_tokenizer.h
EXTHDR += \
$(TOP)/ext/fts3/fts3.h \
$(TOP)/ext/fts3/fts3_expr.h \
$(TOP)/ext/fts3/fts3_hash.h \
$(TOP)/ext/fts3/fts3_tokenizer.h
EXTHDR += \
$(TOP)/ext/rtree/rtree.h
EXTHDR += \
$(TOP)/ext/icu/sqliteicu.h
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
all: sqlite3.h libsqlite3.a sqlite3$(EXE)
libsqlite3.a: $(LIBOBJ)
$(AR) libsqlite3.a $(LIBOBJ)
$(RANLIB) libsqlite3.a
$(SHPREFIX)sqlite3.$(SO): $(LIBOBJ)
$(MKSHLIB) -o $(SHPREFIX)sqlite3.$(SO) $(LIBOBJ) $(TLIBS_SHARED)
sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) \
$(TOP)/src/shell.c \
$(LIBREADLINE) $(TLIBS) $(THREADLIB) -L. -lsqlite3
# This target creates a directory named "tsrc" and fills it with
# copies of all of the C source code and header files needed to
# build on the target system. Some of the C source code and header
# files are automatically generated. This target takes care of
# all that automatic generation.
#
target_source: $(SRC)
rm -rf tsrc
mkdir tsrc
cp -f $(SRC) tsrc
rm tsrc/sqlite.h.in tsrc/parse.y
touch target_source
sqlite3.c: target_source $(TOP)/tool/mksqlite3c.tcl
tclsh $(TOP)/tool/mksqlite3c.tcl
cp sqlite3.c tclsqlite3.c
cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
fts2amal.c: target_source $(TOP)/ext/fts2/mkfts2amal.tcl
tclsh $(TOP)/ext/fts2/mkfts2amal.tcl
fts3amal.c: target_source $(TOP)/ext/fts3/mkfts3amal.tcl
tclsh $(TOP)/ext/fts3/mkfts3amal.tcl
# Rules to build the LEMON compiler generator
#
lemon: $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
$(BCC) -o lemon $(TOP)/tool/lemon.c
cp $(TOP)/src/lempar.c .
# Rules to build individual *.o files from generated *.c files. This
# applies to:
#
# parse.o
# opcodes.o
#
%.o: %.c $(HDR)
$(TCCX_SHARED) -c $<
# Rules to build individual *.o files from files in the src directory.
#
%.o: $(TOP)/src/%.c $(HDR)
$(TCCX_SHARED) -c $<
tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR)
$(TCCX_SHARED) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
sort -n -b -k 3 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
cat parse.h $(TOP)/src/vdbe.c | \
$(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
# Rules to build parse.c and parse.h - the outputs of lemon.
#
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon $(TOP)/addopcodes.awk
cp $(TOP)/src/parse.y .
rm -f parse.h
./lemon $(OPTS) parse.y
mv parse.h parse.h.temp
awk -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in
sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
-e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | $(NAWK) '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
$(TOP)/src/sqlite.h.in >sqlite3.h
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
./mkkeywordhash >keywordhash.h
# Rules to build the extension objects.
#
icu.o: $(TOP)/ext/icu/icu.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/icu/icu.c
fts2.o: $(TOP)/ext/fts2/fts2.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2.c
fts2_hash.o: $(TOP)/ext/fts2/fts2_hash.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_hash.c
fts2_icu.o: $(TOP)/ext/fts2/fts2_icu.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_icu.c
fts2_porter.o: $(TOP)/ext/fts2/fts2_porter.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_porter.c
fts2_tokenizer.o: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer.c
fts2_tokenizer1.o: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer1.c
fts3.o: $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
fts3_expr.o: $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_expr.c
fts3_hash.o: $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_hash.c
fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c
fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c
fts3_tokenizer.o: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c
fts3_tokenizer1.o: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer1.c
rtree.o: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
$(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
# Rules for building test programs and for running tests
#
tclsqlite3: $(TOP)/src/tclsqlite.c libsqlite3.a
$(TCCX_SHARED) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
$(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL) $(THREADLIB)
# Rules to build the 'testfixture' application.
#
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB) libsqlite3.a
amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
-DSQLITE_ENABLE_FTS3=1 \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
fulltest: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/all.test
soaktest: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/all.test -soak 1
test: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/veryquick.test
sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
$(TOP)/tool/spaceanal.tcl
sed \
-e '/^#/d' \
-e 's,\\,\\\\,g' \
-e 's,",\\",g' \
-e 's,^,",' \
-e 's,$$,\\n",' \
$(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
-DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_DEBUG=1 -DSQLITE_PRIVATE="" \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
-o sqlite3_analyzer$(EXE) \
$(LIBTCL) $(THREADLIB)
TEST_EXTENSION = $(SHPREFIX)testloadext.$(SO)
$(TEST_EXTENSION): $(TOP)/src/test_loadext.c
$(MKSHLIB) $(TOP)/src/test_loadext.c -o $(TEST_EXTENSION)
extensiontest: testfixture$(EXE) $(TEST_EXTENSION)
./testfixture$(EXE) $(TOP)/test/loadext.test
clean:
rm -f *.o sqlite3$(EXE) libsqlite3.a sqlite3.h opcodes.*
rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
rm -f $(PUBLISH)
rm -f *.da *.bb *.bbg gmon.out
rm -rf tsrc target_source
rm -f testloadext.dll libtestloadext.so
rm -f sqlite3.c fts?amal.c tclsqlite3.c
rm -f $(SHPREFIX)sqlite3.$(SO)
+7 -11
View File
@@ -17,22 +17,18 @@ For example:
make ;# Run the makefile.
make install ;# (Optional) Install the build products
The configure script uses autoconf 2.61 and libtool. If the configure
The configure script uses autoconf 2.50 and libtool. If the configure
script does not work out for you, there is a generic makefile named
"Makefile.linux-gcc" in the top directory of the source tree that you
can copy and edit to suit your needs. Comments on the generic makefile
can copy and edit to suite your needs. Comments on the generic makefile
show what changes are needed.
The linux binaries on the website are created using the generic makefile,
not the configure script. The windows binaries on the website are created
using MinGW32 configured as a cross-compiler running under Linux. For
details, see the ./publish.sh script at the top-level of the source tree.
The developers do not use teh configure script.
SQLite does not require TCL to run, but a TCL installation is required
by the makefiles. SQLite contains a lot of generated code and TCL is
used to do much of that code generation. The makefile also requires
AWK.
not the configure script. The configure script is unmaintained. (You
can volunteer to take over maintenance of the configure script, if you want!)
The windows binaries on the website are created using MinGW32 configured
as a cross-compiler running under Linux. For details, see the ./publish.sh
script at the top-level of the source tree.
Contacts:
+1 -1
View File
@@ -1 +1 @@
3.6.20
3.2.8
Vendored
+3703 -5762
View File
File diff suppressed because it is too large Load Diff
-34
View File
@@ -1,34 +0,0 @@
#!/usr/bin/awk
#
# This script appends additional token codes to the end of the
# parse.h file that lemon generates. These extra token codes are
# not used by the parser. But they are used by the tokenizer and/or
# the code generator.
#
#
BEGIN {
max = 0
}
/^#define TK_/ {
print $0
if( max<$3 ) max = $3
}
END {
printf "#define TK_%-29s %4d\n", "TO_TEXT", ++max
printf "#define TK_%-29s %4d\n", "TO_BLOB", ++max
printf "#define TK_%-29s %4d\n", "TO_NUMERIC", ++max
printf "#define TK_%-29s %4d\n", "TO_INT", ++max
printf "#define TK_%-29s %4d\n", "TO_REAL", ++max
printf "#define TK_%-29s %4d\n", "ISNOT", ++max
printf "#define TK_%-29s %4d\n", "END_OF_FILE", ++max
printf "#define TK_%-29s %4d\n", "ILLEGAL", ++max
printf "#define TK_%-29s %4d\n", "SPACE", ++max
printf "#define TK_%-29s %4d\n", "UNCLOSED_STRING", ++max
printf "#define TK_%-29s %4d\n", "FUNCTION", ++max
printf "#define TK_%-29s %4d\n", "COLUMN", ++max
printf "#define TK_%-29s %4d\n", "AGG_FUNCTION", ++max
printf "#define TK_%-29s %4d\n", "AGG_COLUMN", ++max
printf "#define TK_%-29s %4d\n", "CONST_FUNC", ++max
printf "#define TK_%-29s %4d\n", "UMINUS", ++max
printf "#define TK_%-29s %4d\n", "UPLUS", ++max
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

+311 -414
View File
File diff suppressed because it is too large Load Diff
-104
View File
@@ -1,104 +0,0 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the `fdatasync' function. */
#undef HAVE_FDATASYNC
/* Define to 1 if you have the `gmtime_r' function. */
#undef HAVE_GMTIME_R
/* Define to 1 if the system has the type `int16_t'. */
#undef HAVE_INT16_T
/* Define to 1 if the system has the type `int32_t'. */
#undef HAVE_INT32_T
/* Define to 1 if the system has the type `int64_t'. */
#undef HAVE_INT64_T
/* Define to 1 if the system has the type `int8_t'. */
#undef HAVE_INT8_T
/* Define to 1 if the system has the type `intptr_t'. */
#undef HAVE_INTPTR_T
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
/* Define to 1 if you have the `localtime_s' function. */
#undef HAVE_LOCALTIME_S
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if the system has the type `uint16_t'. */
#undef HAVE_UINT16_T
/* Define to 1 if the system has the type `uint32_t'. */
#undef HAVE_UINT32_T
/* Define to 1 if the system has the type `uint64_t'. */
#undef HAVE_UINT64_T
/* Define to 1 if the system has the type `uint8_t'. */
#undef HAVE_UINT8_T
/* Define to 1 if the system has the type `uintptr_t'. */
#undef HAVE_UINTPTR_T
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
Vendored
+58 -165
View File
@@ -1,10 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2007-06-28'
timestamp='2004-01-05'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -22,15 +21,14 @@ timestamp='2007-06-28'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
#
# Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -72,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -85,11 +83,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
echo "$timestamp" ; exit ;;
echo "$timestamp" ; exit 0 ;;
--version | -v )
echo "$version" ; exit ;;
echo "$version" ; exit 0 ;;
--help | --h* | -h )
echo "$usage"; exit ;;
echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -101,7 +99,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
exit ;;
exit 0;;
* )
break ;;
@@ -120,9 +118,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -148,7 +145,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis | -knuth | -cray)
-apple | -axis)
os=
basic_machine=$1
;;
@@ -173,10 +170,6 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
-sco6)
os=-sco5v6
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -193,10 +186,6 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,16 +230,14 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx | dvp \
| fido | fr30 | frv \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep \
| m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -259,7 +246,6 @@ case $basic_machine in
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -268,24 +254,20 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| mt \
| msp430 \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
| openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -296,9 +278,6 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
ms1)
basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -318,20 +297,20 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
| avr-* \
| bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| m32c-* | m32r-* | m32rle-* \
| m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -340,7 +319,6 @@ case $basic_machine in
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -348,28 +326,24 @@ case $basic_machine in
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
| xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -389,9 +363,6 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
abacus)
basic_machine=abacus-unknown
;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -471,27 +442,12 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
craynv)
basic_machine=craynv-cray
os=-unicosmp
;;
cr16)
basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
basic_machine=m68k-crds
;;
crisv32 | crisv32-* | etraxfs*)
basic_machine=crisv32-axis
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
crx)
basic_machine=crx-unknown
os=-elf
;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -514,10 +470,6 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -683,10 +635,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -694,30 +642,16 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
mipsEE* | ee | ps2)
basic_machine=mips64r5900el-scei
case $os in
-linux*)
;;
*)
os=-elf
;;
esac
;;
iop)
basic_machine=mipsel-scei
os=-irx
;;
dvp)
basic_machine=dvp-scei
os=-elf
;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
mmix*)
basic_machine=mmix-knuth
os=-mmixware
;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -730,9 +664,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -801,6 +732,10 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -808,8 +743,9 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
openrisc | openrisc-*)
or32 | or32-*)
basic_machine=or32-unknown
os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -840,12 +776,6 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pc98)
basic_machine=i386-pc
;;
pc98-*)
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -902,10 +832,6 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
rdos)
basic_machine=i386-pc
os=-rdos
;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -932,10 +858,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sde)
basic_machine=mipsisa32-sde
os=-elf
;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -947,9 +869,6 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1099,10 +1018,6 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
xbox)
basic_machine=i686-pc
os=-mingw32
;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1133,9 +1048,6 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
mmix)
basic_machine=mmix-knuth
;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1152,10 +1064,13 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -1228,23 +1143,19 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1262,7 +1173,7 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1371,9 +1282,6 @@ case $os in
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
-none)
;;
*)
@@ -1396,12 +1304,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
score-*)
os=-elf
;;
spu-*)
os=-elf
;;
*-acorn)
os=-riscix1.2
;;
@@ -1411,9 +1313,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
;;
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1439,9 +1341,6 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
mep-*)
os=-elf
;;
mips*-cisco)
os=-elf
;;
@@ -1460,15 +1359,9 @@ case $basic_machine in
*-be)
os=-beos
;;
*-haiku)
os=-haiku
;;
*-ibm)
os=-aix
;;
*-knuth)
os=-mmixware
;;
*-wec)
os=-proelf
;;
@@ -1634,7 +1527,7 @@ case $basic_machine in
esac
echo $basic_machine$os
exit
exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Vendored Regular → Executable
+16096 -10466
View File
File diff suppressed because it is too large Load Diff
+210 -313
View File
@@ -45,6 +45,18 @@
# The filename extension for executables on the build
# platform. "" for Unix and ".exe" for Windows.
#
# TARGET_CC
#
# The name of a command that runs on the build platform
# and converts C source files into *.o files for the
# target platform. In other words, the cross-compiler.
#
# TARGET_CFLAGS
#
# Switches that the target compiler needs to turn C source files
# into *.o files. Do not include TARGET_TCL_INC in this list.
# Makefiles might add additional switches such as "-I.".
#
# TCL_*
#
# Lots of values are read in from the tclConfig.sh script,
@@ -64,6 +76,18 @@
# files for the readline library. If the compiler is able
# to find <readline.h> on its own, then this can be blank.
#
# TARGET_LINK
#
# The name of the linker that combines *.o files generated
# by TARGET_CC into executables for the target platform.
#
# TARGET_LIBS
#
# Additional libraries or other switch that the target linker needs
# to build an executable on the target. Do not include
# on this list any libraries in TARGET_TCL_LIBS and
# TARGET_READLINE_LIBS, etc.
#
# TARGET_EXEEXT
#
# The filename extension for executables on the
@@ -87,78 +111,18 @@
# you don't need (for example BLT) by erasing or commenting out
# the corresponding code.
#
AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
dnl Make sure the local VERSION file matches this configure script
sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`
if test "$PACKAGE_VERSION" != "$sqlite_version_sanity_check" ; then
AC_MSG_ERROR([configure script is out of date:
configure \$PACKAGE_VERSION = $PACKAGE_VERSION
top level VERSION file = $sqlite_version_sanity_check
please regen with autoconf])
fi
AC_INIT(src/sqlite.h.in)
dnl Put the RCS revision string after AC_INIT so that it will also
dnl show in in configure.
# The following RCS revision string applies to configure.in
# $Revision: 1.56 $
# $Revision: 1.17 $
#########
# Programs needed
#
AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_AWK
#########
# Enable large file support (if special flags are necessary)
#
AC_SYS_LARGEFILE
#########
# Check for needed/wanted data types
AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, intptr_t, uint8_t,
uint16_t, uint32_t, uint64_t, uintptr_t])
#########
# Check for needed/wanted headers
AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h])
#########
# Figure out whether or not we have these functions
#
AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s])
#########
# By default, we use the amalgamation (this may be changed below...)
#
USE_AMALGAMATION=1
#########
# See whether we can run specific tclsh versions known to work well;
# if not, then we fall back to plain tclsh.
# TODO: try other versions before falling back?
#
AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none)
if test "$TCLSH_CMD" = "none"; then
# If we can't find a local tclsh, then building the amalgamation will fail.
# We act as though --disable-amalgamation has been used.
echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
USE_AMALGAMATION=0
TCLSH_CMD="tclsh"
fi
AC_SUBST(TCLSH_CMD)
AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin])
if test "x${TCLLIBDIR+set}" != "xset" ; then
TCLLIBDIR='$(libdir)'
for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
TCLLIBDIR=$i
break
done
TCLLIBDIR="${TCLLIBDIR}/sqlite3"
fi
#########
# Set up an appropriate program prefix
@@ -169,15 +133,15 @@ fi
AC_SUBST(program_prefix)
VERSION=[`cat $srcdir/VERSION | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'`]
AC_MSG_NOTICE(Version set to $VERSION)
echo "Version set to $VERSION"
AC_SUBST(VERSION)
RELEASE=`cat $srcdir/VERSION`
AC_MSG_NOTICE(Release set to $RELEASE)
echo "Release set to $RELEASE"
AC_SUBST(RELEASE)
VERSION_NUMBER=[`cat $srcdir/VERSION \
VERSION_NUMBER=[`cat $srcdir/VERSION \
| sed 's/[^0-9]/ /g' \
| awk '{printf "%d%03d%03d",$1,$2,$3}'`]
AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
echo "Version number set to $VERSION_NUMBER"
AC_SUBST(VERSION_NUMBER)
#########
@@ -188,7 +152,7 @@ AC_SUBST(VERSION_NUMBER)
# $system is the result of uname -s.
#
AC_ARG_WITH(hints,
AC_HELP_STRING([--with-hints=FILE],[Read configuration options from FILE]),
[ --with-hints=FILE Read configuration options from FILE],
hints=$withval)
if test "$hints" = ""; then
host=`hostname | sed 's/\..*//'`
@@ -219,84 +183,133 @@ fi
# Locate a compiler for the build machine. This compiler should
# generate command-line programs that run on the build machine.
#
if test x"$cross_compiling" = xno; then
BUILD_CC=$CC
BUILD_CFLAGS=$CFLAGS
default_build_cflags="-g"
if test "$config_BUILD_CC" = ""; then
AC_PROG_CC
if test "$cross_compiling" = "yes"; then
AC_MSG_ERROR([unable to find a compiler for building build tools])
fi
BUILD_CC=$CC
default_build_cflags=$CFLAGS
else
if test "${BUILD_CC+set}" != set; then
AC_CHECK_PROGS(BUILD_CC, gcc cc cl)
fi
if test "${BUILD_CFLAGS+set}" != set; then
BUILD_CFLAGS="-g"
fi
BUILD_CC=$config_BUILD_CC
AC_MSG_CHECKING([host compiler])
CC=$BUILD_CC
AC_MSG_RESULT($BUILD_CC)
fi
AC_MSG_CHECKING([switches for the host compiler])
if test "$config_BUILD_CFLAGS" != ""; then
CFLAGS=$config_BUILD_CFLAGS
BUILD_CFLAGS=$config_BUILD_CFLAGS
else
BUILD_CFLAGS=$default_build_cflags
fi
AC_MSG_RESULT($BUILD_CFLAGS)
if test "$config_BUILD_LIBS" != ""; then
BUILD_LIBS=$config_BUILD_LIBS
fi
AC_SUBST(BUILD_CC)
AC_SUBST(BUILD_CFLAGS)
AC_SUBST(BUILD_LIBS)
##########
# Locate a compiler that converts C code into *.o files that run on
# the target machine.
#
AC_MSG_CHECKING([target compiler])
if test "$config_TARGET_CC" != ""; then
TARGET_CC=$config_TARGET_CC
else
TARGET_CC=$BUILD_CC
fi
AC_MSG_RESULT($TARGET_CC)
AC_MSG_CHECKING([switches on the target compiler])
if test "$config_TARGET_CFLAGS" != ""; then
TARGET_CFLAGS=$config_TARGET_CFLAGS
else
TARGET_CFLAGS=$BUILD_CFLAGS
fi
AC_MSG_RESULT($TARGET_CFLAGS)
AC_MSG_CHECKING([target linker])
if test "$config_TARGET_LINK" = ""; then
TARGET_LINK=$TARGET_CC
else
TARGET_LINK=$config_TARGET_LINK
fi
AC_MSG_RESULT($TARGET_LINK)
AC_MSG_CHECKING([switches on the target compiler])
if test "$config_TARGET_TFLAGS" != ""; then
TARGET_TFLAGS=$config_TARGET_TFLAGS
else
TARGET_TFLAGS=$BUILD_CFLAGS
fi
if test "$config_TARGET_RANLIB" != ""; then
TARGET_RANLIB=$config_TARGET_RANLIB
else
AC_PROG_RANLIB
TARGET_RANLIB=$RANLIB
fi
if test "$config_TARGET_AR" != ""; then
TARGET_AR=$config_TARGET_AR
else
TARGET_AR='ar cr'
fi
AC_MSG_RESULT($TARGET_TFLAGS)
AC_SUBST(TARGET_CC)
AC_SUBST(TARGET_CFLAGS)
AC_SUBST(TARGET_LINK)
AC_SUBST(TARGET_LFLAGS)
AC_SUBST(TARGET_RANLIB)
AC_SUBST(TARGET_AR)
# Set the $cross variable if we are cross-compiling. Make
# it 0 if we are not.
#
AC_MSG_CHECKING([if host and target compilers are the same])
if test "$BUILD_CC" = "$TARGET_CC"; then
cross=0
AC_MSG_RESULT(yes)
else
cross=1
AC_MSG_RESULT(no)
fi
##########
# Do we want to support multithreaded use of sqlite
#
AC_ARG_ENABLE(threadsafe,
AC_HELP_STRING([--enable-threadsafe],[Support threadsafe operation]),,enable_threadsafe=yes)
[ --enable-threadsafe Support threadsafe operation],,enable_threadsafe=no)
AC_MSG_CHECKING([whether to support threadsafe operation])
if test "$enable_threadsafe" = "no"; then
SQLITE_THREADSAFE=0
THREADSAFE=0
AC_MSG_RESULT([no])
else
SQLITE_THREADSAFE=1
THREADSAFE=1
AC_MSG_RESULT([yes])
fi
AC_SUBST(SQLITE_THREADSAFE)
AC_SUBST(THREADSAFE)
if test "$SQLITE_THREADSAFE" = "1"; then
AC_SEARCH_LIBS(pthread_create, pthread)
fi
##########
# Do we want to allow a connection created in one thread to be used
# in another thread. This does not work on many Linux systems (ex: RedHat 9)
# due to bugs in the threading implementations. This is thus off by default.
#
AC_ARG_ENABLE(cross-thread-connections,
AC_HELP_STRING([--enable-cross-thread-connections],[Allow connection sharing across threads]),,enable_xthreadconnect=no)
AC_MSG_CHECKING([whether to allow connections to be shared across threads])
if test "$enable_xthreadconnect" = "no"; then
XTHREADCONNECT=''
AC_MSG_RESULT([no])
if test "$THREADSAFE" = "1"; then
LIBS=""
AC_CHECK_LIB(pthread, pthread_create)
TARGET_THREAD_LIB="$LIBS"
LIBS=""
else
XTHREADCONNECT='-DSQLITE_ALLOW_XTHREAD_CONNECT=1'
AC_MSG_RESULT([yes])
TARGET_THREAD_LIB=""
fi
AC_SUBST(XTHREADCONNECT)
##########
# Do we want to set threadsOverrideEachOthersLocks variable to be 1 (true) by
# default. Normally, a test at runtime is performed to determine the
# appropriate value of this variable. Use this option only if you're sure that
# threads can safely override each others locks in all runtime situations.
#
AC_ARG_ENABLE(threads-override-locks,
AC_HELP_STRING([--enable-threads-override-locks],[Threads can override each others locks]),,enable_threads_override_locks=no)
AC_MSG_CHECKING([whether threads can override each others locks])
if test "$enable_threads_override_locks" = "no"; then
THREADSOVERRIDELOCKS='-1'
AC_MSG_RESULT([no])
else
THREADSOVERRIDELOCKS='1'
AC_MSG_RESULT([yes])
fi
AC_SUBST(THREADSOVERRIDELOCKS)
AC_SUBST(TARGET_THREAD_LIB)
##########
# Do we want to support release
#
AC_ARG_ENABLE(releasemode,
AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,enable_releasemode=no)
[ --enable-releasemode Support libtool link to release mode],,enable_releasemode=no)
AC_MSG_CHECKING([whether to support shared library linked as release mode or not])
if test "$enable_releasemode" = "no"; then
ALLOWRELEASE=""
AC_MSG_RESULT([no])
else
ALLOWRELEASE="-release `cat $srcdir/VERSION`"
ALLOWRELEASE="-release `cat VERSION`"
AC_MSG_RESULT([yes])
fi
AC_SUBST(ALLOWRELEASE)
@@ -305,7 +318,7 @@ AC_SUBST(ALLOWRELEASE)
# Do we want temporary databases in memory
#
AC_ARG_ENABLE(tempstore,
AC_HELP_STRING([--enable-tempstore],[Use an in-ram database for temporary tables (never,no,yes,always)]),,enable_tempstore=no)
[ --enable-tempstore Use an in-ram database for temporary tables (never,no,yes,always)],,enable_tempstore=yes)
AC_MSG_CHECKING([whether to use an in-ram database for temporary tables])
case "$enable_tempstore" in
never )
@@ -316,17 +329,13 @@ case "$enable_tempstore" in
TEMP_STORE=1
AC_MSG_RESULT([no])
;;
yes )
TEMP_STORE=2
AC_MSG_RESULT([yes])
;;
always )
TEMP_STORE=3
AC_MSG_RESULT([always])
;;
* )
TEMP_STORE=1
AC_MSG_RESULT([no])
TEMP_STORE=2
AC_MSG_RESULT([yes])
;;
esac
@@ -352,36 +361,38 @@ if test "$CYGWIN" = "yes"; then
else
BUILD_EXEEXT=$EXEEXT
fi
if test x"$cross_compiling" = xno; then
if test "$cross" = "0"; then
TARGET_EXEEXT=$BUILD_EXEEXT
else
TARGET_EXEEXT=$config_TARGET_EXEEXT
fi
if test "$TARGET_EXEEXT" = ".exe"; then
if test $OS2_SHELL ; then
SQLITE_OS_UNIX=0
SQLITE_OS_WIN=0
SQLITE_OS_OS2=1
CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
else
SQLITE_OS_UNIX=0
SQLITE_OS_WIN=1
SQLITE_OS_OS2=0
CFLAGS="$CFLAGS -DSQLITE_OS_WIN=1"
fi
OS_UNIX=0
OS_WIN=1
tclsubdir=win
TARGET_CFLAGS="$TARGET_CFLAGS -DOS_WIN=1"
else
SQLITE_OS_UNIX=1
SQLITE_OS_WIN=0
SQLITE_OS_OS2=0
CFLAGS="$CFLAGS -DSQLITE_OS_UNIX=1"
OS_UNIX=1
OS_WIN=0
tclsubdir=unix
TARGET_CFLAGS="$TARGET_CFLAGS -DOS_UNIX=1"
fi
AC_SUBST(BUILD_EXEEXT)
AC_SUBST(SQLITE_OS_UNIX)
AC_SUBST(SQLITE_OS_WIN)
AC_SUBST(SQLITE_OS_OS2)
AC_SUBST(OS_UNIX)
AC_SUBST(OS_WIN)
AC_SUBST(TARGET_EXEEXT)
##########
# Extract generic linker options from the environment.
#
if test "$config_TARGET_LIBS" != ""; then
TARGET_LIBS=$config_TARGET_LIBS
else
TARGET_LIBS=""
fi
AC_SUBST(TARGET_LIBS)
##########
# Figure out all the parameters needed to compile against Tcl.
#
@@ -390,10 +401,10 @@ AC_SUBST(TARGET_EXEEXT)
# Those macros could not be used directly since we have to make some
# minor changes to accomodate systems that do not have TCL installed.
#
AC_ARG_ENABLE(tcl, AC_HELP_STRING([--disable-tcl],[do not build TCL extension]),
AC_ARG_ENABLE(tcl, [ --disable-tcl do not build TCL extension],
[use_tcl=$enableval],[use_tcl=yes])
if test "${use_tcl}" = "yes" ; then
AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl=DIR],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval})
AC_ARG_WITH(tcl, [ --with-tcl=DIR directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
AC_MSG_CHECKING([for Tcl configuration])
AC_CACHE_VAL(ac_cv_c_tclconfig,[
# First check to see if --with-tcl was specified.
@@ -404,18 +415,6 @@ if test "${use_tcl}" = "yes" ; then
AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
fi
fi
# Start autosearch by asking tclsh
if test x"$cross_compiling" = xno; then
for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig="$i"
break
fi
done
fi
# then check for a private Tcl installation
if test x"${ac_cv_c_tclconfig}" = x ; then
for i in \
@@ -496,7 +495,7 @@ if test "${use_tcl}" = "yes" ; then
# installed and uninstalled version of Tcl.
#
if test -f $TCL_BIN_DIR/Makefile ; then
if test -f $TCL_BIN_DIR/Makefile ; then
TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
@@ -540,179 +539,77 @@ AC_SUBST(HAVE_TCL)
# Figure out what C libraries are required to compile programs
# that use "readline()" library.
#
TARGET_READLINE_LIBS=""
TARGET_READLINE_INC=""
TARGET_HAVE_READLINE=0
AC_ARG_ENABLE([readline],
[AC_HELP_STRING([--disable-readline],[disable readline support [default=detect]])],
[with_readline=$enableval],
[with_readline=auto])
if test x"$with_readline" != xno; then
found="yes"
AC_ARG_WITH([readline-lib],
[AC_HELP_STRING([--with-readline-lib],[specify readline library])],
[with_readline_lib=$withval],
[with_readline_lib="auto"])
if test "x$with_readline_lib" = xauto; then
save_LIBS="$LIBS"
LIBS=""
AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap], [term_LIBS="$LIBS"], [term_LIBS=""])
AC_CHECK_LIB([readline], [readline], [TARGET_READLINE_LIBS="-lreadline"], [found="no"])
TARGET_READLINE_LIBS="$TARGET_READLINE_LIBS $term_LIBS"
LIBS="$save_LIBS"
else
TARGET_READLINE_LIBS="$with_readline_lib"
fi
AC_ARG_WITH([readline-inc],
[AC_HELP_STRING([--with-readline-inc],[specify readline include paths])],
[with_readline_inc=$withval],
[with_readline_inc="auto"])
if test "x$with_readline_inc" = xauto; then
AC_CHECK_HEADER(readline.h, [found="yes"], [
found="no"
if test "$cross_compiling" != yes; then
for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
for subdir in include include/readline; do
AC_CHECK_FILE($dir/$subdir/readline.h, found=yes)
if test "$found" = "yes"; then
TARGET_READLINE_INC="-I$dir/$subdir"
break
fi
done
test "$found" = "yes" && break
done
fi
])
else
TARGET_READLINE_INC="$with_readline_inc"
fi
if test x"$found" = xno; then
TARGET_READLINE_LIBS=""
TARGET_READLINE_INC=""
TARGET_HAVE_READLINE=0
else
TARGET_HAVE_READLINE=1
fi
if test "$config_TARGET_READLINE_LIBS" != ""; then
TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
else
CC=$TARGET_CC
LIBS=""
AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
AC_CHECK_LIB([readline], [readline])
TARGET_READLINE_LIBS="$LIBS"
fi
AC_SUBST(TARGET_READLINE_LIBS)
##########
# Figure out where to get the READLINE header files.
#
AC_MSG_CHECKING([readline header files])
found=no
if test "$config_TARGET_READLINE_INC" != ""; then
TARGET_READLINE_INC=$config_TARGET_READLINE_INC
found=yes
fi
if test "$found" = "yes"; then
AC_MSG_RESULT($TARGET_READLINE_INC)
else
AC_MSG_RESULT(not specified: still searching...)
AC_CHECK_HEADER(readline.h, [found=yes])
fi
if test "$found" = "no"; then
for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
AC_CHECK_FILE($dir/include/readline.h, found=yes)
if test "$found" = "yes"; then
TARGET_READLINE_INC="-I$dir/include"
break
fi
AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
if test "$found" = "yes"; then
TARGET_READLINE_INC="-I$dir/include/readline"
break
fi
done
fi
if test "$found" = "yes"; then
if test "$TARGET_READLINE_LIBS" = ""; then
TARGET_HAVE_READLINE=0
else
TARGET_HAVE_READLINE=1
fi
else
TARGET_HAVE_READLINE=0
fi
AC_SUBST(TARGET_READLINE_INC)
AC_SUBST(TARGET_HAVE_READLINE)
##########
# Figure out what C libraries are required to compile programs
# that use "fdatasync()" function.
#
AC_SEARCH_LIBS(fdatasync, [rt])
#########
# check for debug enabled
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]),
AC_ARG_ENABLE(debug, [ --enable-debug enable debugging & verbose explain],
[use_debug=$enableval],[use_debug=no])
if test "${use_debug}" = "yes" ; then
TARGET_DEBUG="-DSQLITE_DEBUG=1"
TARGET_DEBUG=""
else
TARGET_DEBUG="-DNDEBUG"
fi
AC_SUBST(TARGET_DEBUG)
#########
# See whether we should use the amalgamation to build
AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation],
[Disable the amalgamation and instead build all files separately]),
[use_amalgamation=$enableval],[use_amalgamation=yes])
if test "${use_amalgamation}" != "yes" ; then
USE_AMALGAMATION=0
fi
AC_SUBST(USE_AMALGAMATION)
#########
# See whether we should allow loadable extensions
AC_ARG_ENABLE(load-extension, AC_HELP_STRING([--enable-load-extension],
[Enable loading of external extensions]),
[use_loadextension=$enableval],[use_loadextension=no])
if test "${use_loadextension}" = "yes" ; then
OPT_FEATURE_FLAGS=""
else
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
fi
#########
# attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
for option in $CFLAGS $CPPFLAGS
do
case $option in
-DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
-DSQLITE_ENABLE*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
esac
done
AC_SUBST(OPT_FEATURE_FLAGS)
# attempt to remove any OMITS and ENABLES from the $(CFLAGS) parameter
ac_temp_CFLAGS=""
for option in $CFLAGS
do
case $option in
-DSQLITE_OMIT*) ;;
-DSQLITE_ENABLE*) ;;
*) ac_temp_CFLAGS="$ac_temp_CFLAGS $option";;
esac
done
CFLAGS=$ac_temp_CFLAGS
# attempt to remove any OMITS and ENABLES from the $(CPPFLAGS) parameter
ac_temp_CPPFLAGS=""
for option in $CPPFLAGS
do
case $option in
-DSQLITE_OMIT*) ;;
-DSQLITE_ENABLE*) ;;
*) ac_temp_CPPFLAGS="$ac_temp_CPPFLAGS $option";;
esac
done
CPPFLAGS=$ac_temp_CPPFLAGS
# attempt to remove any OMITS and ENABLES from the $(BUILD_CFLAGS) parameter
ac_temp_BUILD_CFLAGS=""
for option in $BUILD_CFLAGS
do
case $option in
-DSQLITE_OMIT*) ;;
-DSQLITE_ENABLE*) ;;
*) ac_temp_BUILD_CFLAGS="$ac_temp_BUILD_CFLAGS $option";;
esac
done
BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS
#########
# See whether we should use GCOV
AC_ARG_ENABLE(gcov, AC_HELP_STRING([--enable-gcov],
[Enable coverage testing using gcov]),
[use_gcov=$enableval],[use_gcov=no])
if test "${use_gcov}" = "yes" ; then
USE_GCOV=1
else
USE_GCOV=0
fi
AC_SUBST(USE_GCOV)
#########
# Output the config header
AC_CONFIG_HEADERS(config.h)
# Figure out whether or not we have a "usleep()" function.
#
AC_CHECK_FUNC(usleep, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_USLEEP=1"])
#########
# Generate the output files.
#
AC_SUBST(BUILD_CFLAGS)
AC_OUTPUT([
Makefile
sqlite3.pc
+121
View File
@@ -0,0 +1,121 @@
An SQLite (version 1.0) database was used in a large military application
where the database contained 105 tables and indices. The following is
a breakdown on the sizes of keys and data within these tables and indices:
Entries: 967089
Size: 45896104
Avg Size: 48
Key Size: 11112265
Avg Key Size: 12
Max Key Size: 99
0..8 263 0%
9..12 5560 0%
13..16 71394 7%
17..24 180717 26%
25..32 215442 48%
33..40 151118 64%
41..48 77479 72%
49..56 13983 74%
57..64 14481 75%
65..80 41342 79%
81..96 127098 92%
97..112 38054 96%
113..128 14197 98%
129..144 8208 99%
145..160 3326 99%
161..176 1242 99%
177..192 604 99%
193..208 222 99%
209..224 213 99%
225..240 132 99%
241..256 58 99%
257..288 515 99%
289..320 64 99%
321..352 39 99%
353..384 44 99%
385..416 25 99%
417..448 24 99%
449..480 26 99%
481..512 27 99%
513..1024 470 99%
1025..2048 396 99%
2049..4096 187 99%
4097..8192 78 99%
8193..16384 35 99%
16385..32768 17 99%
32769..65536 6 99%
65537..65541 3 100%
If the indices are omitted, the statistics for the 49 tables
become the following:
Entries: 451103
Size: 30930282
Avg Size: 69
Key Size: 1804412
Avg Key Size: 4
Max Key Size: 4
0..24 89 0%
25..32 9417 2%
33..40 119162 28%
41..48 68710 43%
49..56 9539 45%
57..64 12435 48%
65..80 38650 57%
81..96 126877 85%
97..112 38030 93%
113..128 14183 96%
129..144 7668 98%
145..160 3302 99%
161..176 1238 99%
177..192 597 99%
193..208 217 99%
209..224 211 99%
225..240 130 99%
241..256 57 99%
257..288 100 99%
289..320 62 99%
321..352 34 99%
353..384 43 99%
385..416 24 99%
417..448 24 99%
449..480 25 99%
481..512 27 99%
513..1024 153 99%
1025..2048 92 99%
2049..4096 7 100%
The 56 indices have these statistics:
Entries: 512422
Size: 14879828
Avg Size: 30
Key Size: 9253204
Avg Key Size: 19
Max Key Size: 99
0..8 246 0%
9..12 5486 1%
13..16 70717 14%
17..24 178246 49%
25..32 205722 89%
33..40 31951 96%
41..48 8768 97%
49..56 4444 98%
57..64 2046 99%
65..80 2691 99%
81..96 202 99%
97..112 11 99%
113..144 527 99%
145..160 20 99%
161..288 406 99%
289..1024 316 99%
1025..2048 304 99%
2049..4096 180 99%
4097..8192 78 99%
8193..16384 35 99%
16385..32768 17 99%
32769..65536 6 99%
65537..65541 3 100%
-2
View File
@@ -1,2 +0,0 @@
Version loadable extensions to SQLite are found in subfolders
of this folder.
-164
View File
@@ -1,164 +0,0 @@
Normally, when SQLite writes to a database file, it waits until the write
operation is finished before returning control to the calling application.
Since writing to the file-system is usually very slow compared with CPU
bound operations, this can be a performance bottleneck. This directory
contains an extension that causes SQLite to perform all write requests
using a separate thread running in the background. Although this does not
reduce the overall system resources (CPU, disk bandwidth etc.) at all, it
allows SQLite to return control to the caller quickly even when writing to
the database, eliminating the bottleneck.
1. Functionality
1.1 How it Works
1.2 Limitations
1.3 Locking and Concurrency
2. Compilation and Usage
3. Porting
1. FUNCTIONALITY
With asynchronous I/O, write requests are handled by a separate thread
running in the background. This means that the thread that initiates
a database write does not have to wait for (sometimes slow) disk I/O
to occur. The write seems to happen very quickly, though in reality
it is happening at its usual slow pace in the background.
Asynchronous I/O appears to give better responsiveness, but at a price.
You lose the Durable property. With the default I/O backend of SQLite,
once a write completes, you know that the information you wrote is
safely on disk. With the asynchronous I/O, this is not the case. If
your program crashes or if a power loss occurs after the database
write but before the asynchronous write thread has completed, then the
database change might never make it to disk and the next user of the
database might not see your change.
You lose Durability with asynchronous I/O, but you still retain the
other parts of ACID: Atomic, Consistent, and Isolated. Many
appliations get along fine without the Durablity.
1.1 How it Works
Asynchronous I/O works by creating a special SQLite "vfs" structure
and registering it with sqlite3_vfs_register(). When files opened via
this vfs are written to (using the vfs xWrite() method), the data is not
written directly to disk, but is placed in the "write-queue" to be
handled by the background thread.
When files opened with the asynchronous vfs are read from
(using the vfs xRead() method), the data is read from the file on
disk and the write-queue, so that from the point of view of
the vfs reader the xWrite() appears to have already completed.
The special vfs is registered (and unregistered) by calls to the
API functions sqlite3async_initialize() and sqlite3async_shutdown().
See section "Compilation and Usage" below for details.
1.2 Limitations
In order to gain experience with the main ideas surrounding asynchronous
IO, this implementation is deliberately kept simple. Additional
capabilities may be added in the future.
For example, as currently implemented, if writes are happening at a
steady stream that exceeds the I/O capability of the background writer
thread, the queue of pending write operations will grow without bound.
If this goes on for long enough, the host system could run out of memory.
A more sophisticated module could to keep track of the quantity of
pending writes and stop accepting new write requests when the queue of
pending writes grows too large.
1.3 Locking and Concurrency
Multiple connections from within a single process that use this
implementation of asynchronous IO may access a single database
file concurrently. From the point of view of the user, if all
connections are from within a single process, there is no difference
between the concurrency offered by "normal" SQLite and SQLite
using the asynchronous backend.
If file-locking is enabled (it is enabled by default), then connections
from multiple processes may also read and write the database file.
However concurrency is reduced as follows:
* When a connection using asynchronous IO begins a database
transaction, the database is locked immediately. However the
lock is not released until after all relevant operations
in the write-queue have been flushed to disk. This means
(for example) that the database may remain locked for some
time after a "COMMIT" or "ROLLBACK" is issued.
* If an application using asynchronous IO executes transactions
in quick succession, other database users may be effectively
locked out of the database. This is because when a BEGIN
is executed, a database lock is established immediately. But
when the corresponding COMMIT or ROLLBACK occurs, the lock
is not released until the relevant part of the write-queue
has been flushed through. As a result, if a COMMIT is followed
by a BEGIN before the write-queue is flushed through, the database
is never unlocked,preventing other processes from accessing
the database.
File-locking may be disabled at runtime using the sqlite3async_control()
API (see below). This may improve performance when an NFS or other
network file-system, as the synchronous round-trips to the server be
required to establish file locks are avoided. However, if multiple
connections attempt to access the same database file when file-locking
is disabled, application crashes and database corruption is a likely
outcome.
2. COMPILATION AND USAGE
The asynchronous IO extension consists of a single file of C code
(sqlite3async.c), and a header file (sqlite3async.h) that defines the
C API used by applications to activate and control the modules
functionality.
To use the asynchronous IO extension, compile sqlite3async.c as
part of the application that uses SQLite. Then use the API defined
in sqlite3async.h to initialize and configure the module.
The asynchronous IO VFS API is described in detail in comments in
sqlite3async.h. Using the API usually consists of the following steps:
1. Register the asynchronous IO VFS with SQLite by calling the
sqlite3async_initialize() function.
2. Create a background thread to perform write operations and call
sqlite3async_run().
3. Use the normal SQLite API to read and write to databases via
the asynchronous IO VFS.
Refer to sqlite3async.h for details.
3. PORTING
Currently the asynchronous IO extension is compatible with win32 systems
and systems that support the pthreads interface, including Mac OSX, Linux,
and other varieties of Unix.
To port the asynchronous IO extension to another platform, the user must
implement mutex and condition variable primitives for the new platform.
Currently there is no externally available interface to allow this, but
modifying the code within sqlite3async.c to include the new platforms
concurrency primitives is relatively easy. Search within sqlite3async.c
for the comment string "PORTING FUNCTIONS" for details. Then implement
new versions of each of the following:
static void async_mutex_enter(int eMutex);
static void async_mutex_leave(int eMutex);
static void async_cond_wait(int eCond, int eMutex);
static void async_cond_signal(int eCond);
static void async_sched_yield(void);
The functionality required of each of the above functions is described
in comments in sqlite3async.c.
File diff suppressed because it is too large Load Diff
-223
View File
@@ -1,223 +0,0 @@
#ifndef __SQLITEASYNC_H_
#define __SQLITEASYNC_H_ 1
/*
** Make sure we can call this stuff from C++.
*/
#ifdef __cplusplus
extern "C" {
#endif
#define SQLITEASYNC_VFSNAME "sqlite3async"
/*
** THREAD SAFETY NOTES:
**
** Of the four API functions in this file, the following are not threadsafe:
**
** sqlite3async_initialize()
** sqlite3async_shutdown()
**
** Care must be taken that neither of these functions is called while
** another thread may be calling either any sqlite3async_XXX() function
** or an sqlite3_XXX() API function related to a database handle that
** is using the asynchronous IO VFS.
**
** These functions:
**
** sqlite3async_run()
** sqlite3async_control()
**
** are threadsafe. It is quite safe to call either of these functions even
** if another thread may also be calling one of them or an sqlite3_XXX()
** function related to a database handle that uses the asynchronous IO VFS.
*/
/*
** Initialize the asynchronous IO VFS and register it with SQLite using
** sqlite3_vfs_register(). If the asynchronous VFS is already initialized
** and registered, this function is a no-op. The asynchronous IO VFS
** is registered as "sqlite3async".
**
** The asynchronous IO VFS does not make operating system IO requests
** directly. Instead, it uses an existing VFS implementation for all
** required file-system operations. If the first parameter to this function
** is NULL, then the current default VFS is used for IO. If it is not
** NULL, then it must be the name of an existing VFS. In other words, the
** first argument to this function is passed to sqlite3_vfs_find() to
** locate the VFS to use for all real IO operations. This VFS is known
** as the "parent VFS".
**
** If the second parameter to this function is non-zero, then the
** asynchronous IO VFS is registered as the default VFS for all SQLite
** database connections within the process. Otherwise, the asynchronous IO
** VFS is only used by connections opened using sqlite3_open_v2() that
** specifically request VFS "sqlite3async".
**
** If a parent VFS cannot be located, then SQLITE_ERROR is returned.
** In the unlikely event that operating system specific initialization
** fails (win32 systems create the required critical section and event
** objects within this function), then SQLITE_ERROR is also returned.
** Finally, if the call to sqlite3_vfs_register() returns an error, then
** the error code is returned to the user by this function. In all three
** of these cases, intialization has failed and the asynchronous IO VFS
** is not registered with SQLite.
**
** Otherwise, if no error occurs, SQLITE_OK is returned.
*/
int sqlite3async_initialize(const char *zParent, int isDefault);
/*
** This function unregisters the asynchronous IO VFS using
** sqlite3_vfs_unregister().
**
** On win32 platforms, this function also releases the small number of
** critical section and event objects created by sqlite3async_initialize().
*/
void sqlite3async_shutdown();
/*
** This function may only be called when the asynchronous IO VFS is
** installed (after a call to sqlite3async_initialize()). It processes
** zero or more queued write operations before returning. It is expected
** (but not required) that this function will be called by a different
** thread than those threads that use SQLite. The "background thread"
** that performs IO.
**
** How many queued write operations are performed before returning
** depends on the global setting configured by passing the SQLITEASYNC_HALT
** verb to sqlite3async_control() (see below for details). By default
** this function never returns - it processes all pending operations and
** then blocks waiting for new ones.
**
** If multiple simultaneous calls are made to sqlite3async_run() from two
** or more threads, then the calls are serialized internally.
*/
void sqlite3async_run();
/*
** This function may only be called when the asynchronous IO VFS is
** installed (after a call to sqlite3async_initialize()). It is used
** to query or configure various parameters that affect the operation
** of the asynchronous IO VFS. At present there are three parameters
** supported:
**
** * The "halt" parameter, which configures the circumstances under
** which the sqlite3async_run() parameter is configured.
**
** * The "delay" parameter. Setting the delay parameter to a non-zero
** value causes the sqlite3async_run() function to sleep for the
** configured number of milliseconds between each queued write
** operation.
**
** * The "lockfiles" parameter. This parameter determines whether or
** not the asynchronous IO VFS locks the database files it operates
** on. Disabling file locking can improve throughput.
**
** This function is always passed two arguments. When setting the value
** of a parameter, the first argument must be one of SQLITEASYNC_HALT,
** SQLITEASYNC_DELAY or SQLITEASYNC_LOCKFILES. The second argument must
** be passed the new value for the parameter as type "int".
**
** When querying the current value of a paramter, the first argument must
** be one of SQLITEASYNC_GET_HALT, GET_DELAY or GET_LOCKFILES. The second
** argument to this function must be of type (int *). The current value
** of the queried parameter is copied to the memory pointed to by the
** second argument. For example:
**
** int eCurrentHalt;
** int eNewHalt = SQLITEASYNC_HALT_IDLE;
**
** sqlite3async_control(SQLITEASYNC_HALT, eNewHalt);
** sqlite3async_control(SQLITEASYNC_GET_HALT, &eCurrentHalt);
** assert( eNewHalt==eCurrentHalt );
**
** See below for more detail on each configuration parameter.
**
** SQLITEASYNC_HALT:
**
** This is used to set the value of the "halt" parameter. The second
** argument must be one of the SQLITEASYNC_HALT_XXX symbols defined
** below (either NEVER, IDLE and NOW).
**
** If the parameter is set to NEVER, then calls to sqlite3async_run()
** never return. This is the default setting. If the parameter is set
** to IDLE, then calls to sqlite3async_run() return as soon as the
** queue of pending write operations is empty. If the parameter is set
** to NOW, then calls to sqlite3async_run() return as quickly as
** possible, without processing any pending write requests.
**
** If an attempt is made to set this parameter to an integer value other
** than SQLITEASYNC_HALT_NEVER, IDLE or NOW, then sqlite3async_control()
** returns SQLITE_MISUSE and the current value of the parameter is not
** modified.
**
** Modifying the "halt" parameter affects calls to sqlite3async_run()
** made by other threads that are currently in progress.
**
** SQLITEASYNC_DELAY:
**
** This is used to set the value of the "delay" parameter. If set to
** a non-zero value, then after completing a pending write request, the
** sqlite3async_run() function sleeps for the configured number of
** milliseconds.
**
** If an attempt is made to set this parameter to a negative value,
** sqlite3async_control() returns SQLITE_MISUSE and the current value
** of the parameter is not modified.
**
** Modifying the "delay" parameter affects calls to sqlite3async_run()
** made by other threads that are currently in progress.
**
** SQLITEASYNC_LOCKFILES:
**
** This is used to set the value of the "lockfiles" parameter. This
** parameter must be set to either 0 or 1. If set to 1, then the
** asynchronous IO VFS uses the xLock() and xUnlock() methods of the
** parent VFS to lock database files being read and/or written. If
** the parameter is set to 0, then these locks are omitted.
**
** This parameter may only be set when there are no open database
** connections using the VFS and the queue of pending write requests
** is empty. Attempting to set it when this is not true, or to set it
** to a value other than 0 or 1 causes sqlite3async_control() to return
** SQLITE_MISUSE and the value of the parameter to remain unchanged.
**
** If this parameter is set to zero, then it is only safe to access the
** database via the asynchronous IO VFS from within a single process. If
** while writing to the database via the asynchronous IO VFS the database
** is also read or written from within another process, or via another
** connection that does not use the asynchronous IO VFS within the same
** process, the results are undefined (and may include crashes or database
** corruption).
**
** Alternatively, if this parameter is set to 1, then it is safe to access
** the database from multiple connections within multiple processes using
** either the asynchronous IO VFS or the parent VFS directly.
*/
int sqlite3async_control(int op, ...);
/*
** Values that can be used as the first argument to sqlite3async_control().
*/
#define SQLITEASYNC_HALT 1
#define SQLITEASYNC_GET_HALT 2
#define SQLITEASYNC_DELAY 3
#define SQLITEASYNC_GET_DELAY 4
#define SQLITEASYNC_LOCKFILES 5
#define SQLITEASYNC_GET_LOCKFILES 6
/*
** If the first argument to sqlite3async_control() is SQLITEASYNC_HALT,
** the second argument should be one of the following.
*/
#define SQLITEASYNC_HALT_NEVER 0 /* Never halt (default value) */
#define SQLITEASYNC_HALT_NOW 1 /* Halt as soon as possible */
#define SQLITEASYNC_HALT_IDLE 2 /* Halt when write-queue is empty */
#ifdef __cplusplus
} /* End of the 'extern "C"' block */
#endif
#endif /* ifndef __SQLITEASYNC_H_ */
-2
View File
@@ -1,2 +0,0 @@
This folder contains source code to the first full-text search
extension for SQLite.
-404
View File
@@ -1,404 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the implementation of generic hash-tables used in SQLite.
** We've modified it slightly to serve as a standalone hash table
** implementation for the full-text indexing module.
*/
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "ft_hash.h"
void *malloc_and_zero(int n){
void *p = malloc(n);
if( p ){
memset(p, 0, n);
}
return p;
}
/* Turn bulk memory into a hash table object by initializing the
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
** keyClass is one of the constants HASH_INT, HASH_POINTER,
** HASH_BINARY, or HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer. CopyKey only makes
** sense for HASH_STRING and HASH_BINARY and is ignored
** for other key classes.
*/
void HashInit(Hash *pNew, int keyClass, int copyKey){
assert( pNew!=0 );
assert( keyClass>=HASH_STRING && keyClass<=HASH_BINARY );
pNew->keyClass = keyClass;
#if 0
if( keyClass==HASH_POINTER || keyClass==HASH_INT ) copyKey = 0;
#endif
pNew->copyKey = copyKey;
pNew->first = 0;
pNew->count = 0;
pNew->htsize = 0;
pNew->ht = 0;
pNew->xMalloc = malloc_and_zero;
pNew->xFree = free;
}
/* Remove all entries from a hash table. Reclaim all memory.
** Call this routine to delete a hash table or to reset a hash table
** to the empty state.
*/
void HashClear(Hash *pH){
HashElem *elem; /* For looping over all elements of the table */
assert( pH!=0 );
elem = pH->first;
pH->first = 0;
if( pH->ht ) pH->xFree(pH->ht);
pH->ht = 0;
pH->htsize = 0;
while( elem ){
HashElem *next_elem = elem->next;
if( pH->copyKey && elem->pKey ){
pH->xFree(elem->pKey);
}
pH->xFree(elem);
elem = next_elem;
}
pH->count = 0;
}
#if 0 /* NOT USED */
/*
** Hash and comparison functions when the mode is HASH_INT
*/
static int intHash(const void *pKey, int nKey){
return nKey ^ (nKey<<8) ^ (nKey>>8);
}
static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){
return n2 - n1;
}
#endif
#if 0 /* NOT USED */
/*
** Hash and comparison functions when the mode is HASH_POINTER
*/
static int ptrHash(const void *pKey, int nKey){
uptr x = Addr(pKey);
return x ^ (x<<8) ^ (x>>8);
}
static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( pKey1==pKey2 ) return 0;
if( pKey1<pKey2 ) return -1;
return 1;
}
#endif
/*
** Hash and comparison functions when the mode is HASH_STRING
*/
static int strHash(const void *pKey, int nKey){
const char *z = (const char *)pKey;
int h = 0;
if( nKey<=0 ) nKey = (int) strlen(z);
while( nKey > 0 ){
h = (h<<3) ^ h ^ *z++;
nKey--;
}
return h & 0x7fffffff;
}
static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return strncmp((const char*)pKey1,(const char*)pKey2,n1);
}
/*
** Hash and comparison functions when the mode is HASH_BINARY
*/
static int binHash(const void *pKey, int nKey){
int h = 0;
const char *z = (const char *)pKey;
while( nKey-- > 0 ){
h = (h<<3) ^ h ^ *(z++);
}
return h & 0x7fffffff;
}
static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return memcmp(pKey1,pKey2,n1);
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "hashFunction". The function takes a
** single parameter "keyClass". The return value of hashFunction()
** is a pointer to another function. Specifically, the return value
** of hashFunction() is a pointer to a function that takes two parameters
** with types "const void*" and "int" and returns an "int".
*/
static int (*hashFunction(int keyClass))(const void*,int){
#if 0 /* HASH_INT and HASH_POINTER are never used */
switch( keyClass ){
case HASH_INT: return &intHash;
case HASH_POINTER: return &ptrHash;
case HASH_STRING: return &strHash;
case HASH_BINARY: return &binHash;;
default: break;
}
return 0;
#else
if( keyClass==HASH_STRING ){
return &strHash;
}else{
assert( keyClass==HASH_BINARY );
return &binHash;
}
#endif
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** For help in interpreted the obscure C code in the function definition,
** see the header comment on the previous function.
*/
static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
#if 0 /* HASH_INT and HASH_POINTER are never used */
switch( keyClass ){
case HASH_INT: return &intCompare;
case HASH_POINTER: return &ptrCompare;
case HASH_STRING: return &strCompare;
case HASH_BINARY: return &binCompare;
default: break;
}
return 0;
#else
if( keyClass==HASH_STRING ){
return &strCompare;
}else{
assert( keyClass==HASH_BINARY );
return &binCompare;
}
#endif
}
/* Link an element into the hash table
*/
static void insertElement(
Hash *pH, /* The complete hash table */
struct _ht *pEntry, /* The entry into which pNew is inserted */
HashElem *pNew /* The element to be inserted */
){
HashElem *pHead; /* First element already in pEntry */
pHead = pEntry->chain;
if( pHead ){
pNew->next = pHead;
pNew->prev = pHead->prev;
if( pHead->prev ){ pHead->prev->next = pNew; }
else { pH->first = pNew; }
pHead->prev = pNew;
}else{
pNew->next = pH->first;
if( pH->first ){ pH->first->prev = pNew; }
pNew->prev = 0;
pH->first = pNew;
}
pEntry->count++;
pEntry->chain = pNew;
}
/* Resize the hash table so that it cantains "new_size" buckets.
** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void rehash(Hash *pH, int new_size){
struct _ht *new_ht; /* The new hash table */
HashElem *elem, *next_elem; /* For looping over existing elements */
int (*xHash)(const void*,int); /* The hash function */
assert( (new_size & (new_size-1))==0 );
new_ht = (struct _ht *)pH->xMalloc( new_size*sizeof(struct _ht) );
if( new_ht==0 ) return;
if( pH->ht ) pH->xFree(pH->ht);
pH->ht = new_ht;
pH->htsize = new_size;
xHash = hashFunction(pH->keyClass);
for(elem=pH->first, pH->first=0; elem; elem = next_elem){
int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
next_elem = elem->next;
insertElement(pH, &new_ht[h], elem);
}
}
/* This function (for internal use only) locates an element in an
** hash table that matches the given key. The hash for this key has
** already been computed and is passed as the 4th parameter.
*/
static HashElem *findElementGivenHash(
const Hash *pH, /* The pH to be searched */
const void *pKey, /* The key we are searching for */
int nKey,
int h /* The hash for this key. */
){
HashElem *elem; /* Used to loop thru the element list */
int count; /* Number of elements left to test */
int (*xCompare)(const void*,int,const void*,int); /* comparison function */
if( pH->ht ){
struct _ht *pEntry = &pH->ht[h];
elem = pEntry->chain;
count = pEntry->count;
xCompare = compareFunction(pH->keyClass);
while( count-- && elem ){
if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
}
}
return 0;
}
/* Remove a single entry from the hash table given a pointer to that
** element and a hash on the element's key.
*/
static void removeElementGivenHash(
Hash *pH, /* The pH containing "elem" */
HashElem* elem, /* The element to be removed from the pH */
int h /* Hash value for the element */
){
struct _ht *pEntry;
if( elem->prev ){
elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
if( elem->next ){
elem->next->prev = elem->prev;
}
pEntry = &pH->ht[h];
if( pEntry->chain==elem ){
pEntry->chain = elem->next;
}
pEntry->count--;
if( pEntry->count<=0 ){
pEntry->chain = 0;
}
if( pH->copyKey && elem->pKey ){
pH->xFree(elem->pKey);
}
pH->xFree( elem );
pH->count--;
if( pH->count<=0 ){
assert( pH->first==0 );
assert( pH->count==0 );
HashClear(pH);
}
}
/* Attempt to locate an element of the hash table pH with a key
** that matches pKey,nKey. Return the data for this element if it is
** found, or NULL if there is no match.
*/
void *HashFind(const Hash *pH, const void *pKey, int nKey){
int h; /* A hash on key */
HashElem *elem; /* The element that matches key */
int (*xHash)(const void*,int); /* The hash function */
if( pH==0 || pH->ht==0 ) return 0;
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
h = (*xHash)(pKey,nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1));
return elem ? elem->data : 0;
}
/* Insert an element into the hash table pH. The key is pKey,nKey
** and the data is "data".
**
** If no element exists with a matching key, then a new
** element is created. A copy of the key is made if the copyKey
** flag is set. NULL is returned.
**
** If another element already exists with the same key, then the
** new data replaces the old data and the old data is returned.
** The key is not copied in this instance. If a malloc fails, then
** the new data is returned and the hash table is unchanged.
**
** If the "data" parameter to this function is NULL, then the
** element corresponding to "key" is removed from the hash table.
*/
void *HashInsert(Hash *pH, const void *pKey, int nKey, void *data){
int hraw; /* Raw hash value of the key */
int h; /* the hash of the key modulo hash table size */
HashElem *elem; /* Used to loop thru the element list */
HashElem *new_elem; /* New element added to the pH */
int (*xHash)(const void*,int); /* The hash function */
assert( pH!=0 );
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
hraw = (*xHash)(pKey, nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
elem = findElementGivenHash(pH,pKey,nKey,h);
if( elem ){
void *old_data = elem->data;
if( data==0 ){
removeElementGivenHash(pH,elem,h);
}else{
elem->data = data;
}
return old_data;
}
if( data==0 ) return 0;
new_elem = (HashElem*)pH->xMalloc( sizeof(HashElem) );
if( new_elem==0 ) return data;
if( pH->copyKey && pKey!=0 ){
new_elem->pKey = pH->xMalloc( nKey );
if( new_elem->pKey==0 ){
pH->xFree(new_elem);
return data;
}
memcpy((void*)new_elem->pKey, pKey, nKey);
}else{
new_elem->pKey = (void*)pKey;
}
new_elem->nKey = nKey;
pH->count++;
if( pH->htsize==0 ){
rehash(pH,8);
if( pH->htsize==0 ){
pH->count = 0;
pH->xFree(new_elem);
return data;
}
}
if( pH->count > pH->htsize ){
rehash(pH,pH->htsize*2);
}
assert( pH->htsize>0 );
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
insertElement(pH, &pH->ht[h], new_elem);
new_elem->data = data;
return 0;
}
-111
View File
@@ -1,111 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the header file for the generic hash-table implemenation
** used in SQLite. We've modified it slightly to serve as a standalone
** hash table implementation for the full-text indexing module.
**
*/
#ifndef _HASH_H_
#define _HASH_H_
/* Forward declarations of structures. */
typedef struct Hash Hash;
typedef struct HashElem HashElem;
/* A complete hash table is an instance of the following structure.
** The internals of this structure are intended to be opaque -- client
** code should not attempt to access or modify the fields of this structure
** directly. Change this structure only by using the routines below.
** However, many of the "procedures" and "functions" for modifying and
** accessing this structure are really macros, so we can't really make
** this structure opaque.
*/
struct Hash {
char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
char copyKey; /* True if copy of key made on insert */
int count; /* Number of entries in this table */
HashElem *first; /* The first element of the array */
void *(*xMalloc)(int); /* malloc() function to use */
void (*xFree)(void *); /* free() function to use */
int htsize; /* Number of buckets in the hash table */
struct _ht { /* the hash table */
int count; /* Number of entries with this hash */
HashElem *chain; /* Pointer to first entry with this hash */
} *ht;
};
/* Each element in the hash table is an instance of the following
** structure. All elements are stored on a single doubly-linked list.
**
** Again, this structure is intended to be opaque, but it can't really
** be opaque because it is used by macros.
*/
struct HashElem {
HashElem *next, *prev; /* Next and previous elements in the table */
void *data; /* Data associated with this element */
void *pKey; int nKey; /* Key associated with this element */
};
/*
** There are 4 different modes of operation for a hash table:
**
** HASH_INT nKey is used as the key and pKey is ignored.
**
** HASH_POINTER pKey is used as the key and nKey is ignored.
**
** HASH_STRING pKey points to a string that is nKey bytes long
** (including the null-terminator, if any). Case
** is respected in comparisons.
**
** HASH_BINARY pKey points to binary data nKey bytes long.
** memcmp() is used to compare keys.
**
** A copy of the key is made for HASH_STRING and HASH_BINARY
** if the copyKey parameter to HashInit is 1.
*/
/* #define HASH_INT 1 // NOT USED */
/* #define HASH_POINTER 2 // NOT USED */
#define HASH_STRING 3
#define HASH_BINARY 4
/*
** Access routines. To delete, insert a NULL pointer.
*/
void HashInit(Hash*, int keytype, int copyKey);
void *HashInsert(Hash*, const void *pKey, int nKey, void *pData);
void *HashFind(const Hash*, const void *pKey, int nKey);
void HashClear(Hash*);
/*
** Macros for looping over all elements of a hash table. The idiom is
** like this:
**
** Hash h;
** HashElem *p;
** ...
** for(p=HashFirst(&h); p; p=HashNext(p)){
** SomeStructure *pData = HashData(p);
** // do something with pData
** }
*/
#define HashFirst(H) ((H)->first)
#define HashNext(E) ((E)->next)
#define HashData(E) ((E)->data)
#define HashKey(E) ((E)->pKey)
#define HashKeysize(E) ((E)->nKey)
/*
** Number of entries in a hash table
*/
#define HashCount(H) ((H)->count)
#endif /* _HASH_H_ */
-3345
View File
File diff suppressed because it is too large Load Diff
-11
View File
@@ -1,11 +0,0 @@
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3Fts1Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-369
View File
@@ -1,369 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the implementation of generic hash-tables used in SQLite.
** We've modified it slightly to serve as a standalone hash table
** implementation for the full-text indexing module.
*/
#include <assert.h>
#include <stdlib.h>
#include <string.h>
/*
** The code in this file is only compiled if:
**
** * The FTS1 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS1 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS1 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1)
#include "fts1_hash.h"
static void *malloc_and_zero(int n){
void *p = malloc(n);
if( p ){
memset(p, 0, n);
}
return p;
}
/* Turn bulk memory into a hash table object by initializing the
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
** keyClass is one of the constants
** FTS1_HASH_BINARY or FTS1_HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer.
*/
void sqlite3Fts1HashInit(fts1Hash *pNew, int keyClass, int copyKey){
assert( pNew!=0 );
assert( keyClass>=FTS1_HASH_STRING && keyClass<=FTS1_HASH_BINARY );
pNew->keyClass = keyClass;
pNew->copyKey = copyKey;
pNew->first = 0;
pNew->count = 0;
pNew->htsize = 0;
pNew->ht = 0;
pNew->xMalloc = malloc_and_zero;
pNew->xFree = free;
}
/* Remove all entries from a hash table. Reclaim all memory.
** Call this routine to delete a hash table or to reset a hash table
** to the empty state.
*/
void sqlite3Fts1HashClear(fts1Hash *pH){
fts1HashElem *elem; /* For looping over all elements of the table */
assert( pH!=0 );
elem = pH->first;
pH->first = 0;
if( pH->ht ) pH->xFree(pH->ht);
pH->ht = 0;
pH->htsize = 0;
while( elem ){
fts1HashElem *next_elem = elem->next;
if( pH->copyKey && elem->pKey ){
pH->xFree(elem->pKey);
}
pH->xFree(elem);
elem = next_elem;
}
pH->count = 0;
}
/*
** Hash and comparison functions when the mode is FTS1_HASH_STRING
*/
static int strHash(const void *pKey, int nKey){
const char *z = (const char *)pKey;
int h = 0;
if( nKey<=0 ) nKey = (int) strlen(z);
while( nKey > 0 ){
h = (h<<3) ^ h ^ *z++;
nKey--;
}
return h & 0x7fffffff;
}
static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return strncmp((const char*)pKey1,(const char*)pKey2,n1);
}
/*
** Hash and comparison functions when the mode is FTS1_HASH_BINARY
*/
static int binHash(const void *pKey, int nKey){
int h = 0;
const char *z = (const char *)pKey;
while( nKey-- > 0 ){
h = (h<<3) ^ h ^ *(z++);
}
return h & 0x7fffffff;
}
static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return memcmp(pKey1,pKey2,n1);
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "hashFunction". The function takes a
** single parameter "keyClass". The return value of hashFunction()
** is a pointer to another function. Specifically, the return value
** of hashFunction() is a pointer to a function that takes two parameters
** with types "const void*" and "int" and returns an "int".
*/
static int (*hashFunction(int keyClass))(const void*,int){
if( keyClass==FTS1_HASH_STRING ){
return &strHash;
}else{
assert( keyClass==FTS1_HASH_BINARY );
return &binHash;
}
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** For help in interpreted the obscure C code in the function definition,
** see the header comment on the previous function.
*/
static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
if( keyClass==FTS1_HASH_STRING ){
return &strCompare;
}else{
assert( keyClass==FTS1_HASH_BINARY );
return &binCompare;
}
}
/* Link an element into the hash table
*/
static void insertElement(
fts1Hash *pH, /* The complete hash table */
struct _fts1ht *pEntry, /* The entry into which pNew is inserted */
fts1HashElem *pNew /* The element to be inserted */
){
fts1HashElem *pHead; /* First element already in pEntry */
pHead = pEntry->chain;
if( pHead ){
pNew->next = pHead;
pNew->prev = pHead->prev;
if( pHead->prev ){ pHead->prev->next = pNew; }
else { pH->first = pNew; }
pHead->prev = pNew;
}else{
pNew->next = pH->first;
if( pH->first ){ pH->first->prev = pNew; }
pNew->prev = 0;
pH->first = pNew;
}
pEntry->count++;
pEntry->chain = pNew;
}
/* Resize the hash table so that it cantains "new_size" buckets.
** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void rehash(fts1Hash *pH, int new_size){
struct _fts1ht *new_ht; /* The new hash table */
fts1HashElem *elem, *next_elem; /* For looping over existing elements */
int (*xHash)(const void*,int); /* The hash function */
assert( (new_size & (new_size-1))==0 );
new_ht = (struct _fts1ht *)pH->xMalloc( new_size*sizeof(struct _fts1ht) );
if( new_ht==0 ) return;
if( pH->ht ) pH->xFree(pH->ht);
pH->ht = new_ht;
pH->htsize = new_size;
xHash = hashFunction(pH->keyClass);
for(elem=pH->first, pH->first=0; elem; elem = next_elem){
int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
next_elem = elem->next;
insertElement(pH, &new_ht[h], elem);
}
}
/* This function (for internal use only) locates an element in an
** hash table that matches the given key. The hash for this key has
** already been computed and is passed as the 4th parameter.
*/
static fts1HashElem *findElementGivenHash(
const fts1Hash *pH, /* The pH to be searched */
const void *pKey, /* The key we are searching for */
int nKey,
int h /* The hash for this key. */
){
fts1HashElem *elem; /* Used to loop thru the element list */
int count; /* Number of elements left to test */
int (*xCompare)(const void*,int,const void*,int); /* comparison function */
if( pH->ht ){
struct _fts1ht *pEntry = &pH->ht[h];
elem = pEntry->chain;
count = pEntry->count;
xCompare = compareFunction(pH->keyClass);
while( count-- && elem ){
if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
}
}
return 0;
}
/* Remove a single entry from the hash table given a pointer to that
** element and a hash on the element's key.
*/
static void removeElementGivenHash(
fts1Hash *pH, /* The pH containing "elem" */
fts1HashElem* elem, /* The element to be removed from the pH */
int h /* Hash value for the element */
){
struct _fts1ht *pEntry;
if( elem->prev ){
elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
if( elem->next ){
elem->next->prev = elem->prev;
}
pEntry = &pH->ht[h];
if( pEntry->chain==elem ){
pEntry->chain = elem->next;
}
pEntry->count--;
if( pEntry->count<=0 ){
pEntry->chain = 0;
}
if( pH->copyKey && elem->pKey ){
pH->xFree(elem->pKey);
}
pH->xFree( elem );
pH->count--;
if( pH->count<=0 ){
assert( pH->first==0 );
assert( pH->count==0 );
fts1HashClear(pH);
}
}
/* Attempt to locate an element of the hash table pH with a key
** that matches pKey,nKey. Return the data for this element if it is
** found, or NULL if there is no match.
*/
void *sqlite3Fts1HashFind(const fts1Hash *pH, const void *pKey, int nKey){
int h; /* A hash on key */
fts1HashElem *elem; /* The element that matches key */
int (*xHash)(const void*,int); /* The hash function */
if( pH==0 || pH->ht==0 ) return 0;
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
h = (*xHash)(pKey,nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1));
return elem ? elem->data : 0;
}
/* Insert an element into the hash table pH. The key is pKey,nKey
** and the data is "data".
**
** If no element exists with a matching key, then a new
** element is created. A copy of the key is made if the copyKey
** flag is set. NULL is returned.
**
** If another element already exists with the same key, then the
** new data replaces the old data and the old data is returned.
** The key is not copied in this instance. If a malloc fails, then
** the new data is returned and the hash table is unchanged.
**
** If the "data" parameter to this function is NULL, then the
** element corresponding to "key" is removed from the hash table.
*/
void *sqlite3Fts1HashInsert(
fts1Hash *pH, /* The hash table to insert into */
const void *pKey, /* The key */
int nKey, /* Number of bytes in the key */
void *data /* The data */
){
int hraw; /* Raw hash value of the key */
int h; /* the hash of the key modulo hash table size */
fts1HashElem *elem; /* Used to loop thru the element list */
fts1HashElem *new_elem; /* New element added to the pH */
int (*xHash)(const void*,int); /* The hash function */
assert( pH!=0 );
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
hraw = (*xHash)(pKey, nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
elem = findElementGivenHash(pH,pKey,nKey,h);
if( elem ){
void *old_data = elem->data;
if( data==0 ){
removeElementGivenHash(pH,elem,h);
}else{
elem->data = data;
}
return old_data;
}
if( data==0 ) return 0;
new_elem = (fts1HashElem*)pH->xMalloc( sizeof(fts1HashElem) );
if( new_elem==0 ) return data;
if( pH->copyKey && pKey!=0 ){
new_elem->pKey = pH->xMalloc( nKey );
if( new_elem->pKey==0 ){
pH->xFree(new_elem);
return data;
}
memcpy((void*)new_elem->pKey, pKey, nKey);
}else{
new_elem->pKey = (void*)pKey;
}
new_elem->nKey = nKey;
pH->count++;
if( pH->htsize==0 ){
rehash(pH,8);
if( pH->htsize==0 ){
pH->count = 0;
pH->xFree(new_elem);
return data;
}
}
if( pH->count > pH->htsize ){
rehash(pH,pH->htsize*2);
}
assert( pH->htsize>0 );
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
insertElement(pH, &pH->ht[h], new_elem);
new_elem->data = data;
return 0;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) */
-112
View File
@@ -1,112 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the header file for the generic hash-table implemenation
** used in SQLite. We've modified it slightly to serve as a standalone
** hash table implementation for the full-text indexing module.
**
*/
#ifndef _FTS1_HASH_H_
#define _FTS1_HASH_H_
/* Forward declarations of structures. */
typedef struct fts1Hash fts1Hash;
typedef struct fts1HashElem fts1HashElem;
/* A complete hash table is an instance of the following structure.
** The internals of this structure are intended to be opaque -- client
** code should not attempt to access or modify the fields of this structure
** directly. Change this structure only by using the routines below.
** However, many of the "procedures" and "functions" for modifying and
** accessing this structure are really macros, so we can't really make
** this structure opaque.
*/
struct fts1Hash {
char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
char copyKey; /* True if copy of key made on insert */
int count; /* Number of entries in this table */
fts1HashElem *first; /* The first element of the array */
void *(*xMalloc)(int); /* malloc() function to use */
void (*xFree)(void *); /* free() function to use */
int htsize; /* Number of buckets in the hash table */
struct _fts1ht { /* the hash table */
int count; /* Number of entries with this hash */
fts1HashElem *chain; /* Pointer to first entry with this hash */
} *ht;
};
/* Each element in the hash table is an instance of the following
** structure. All elements are stored on a single doubly-linked list.
**
** Again, this structure is intended to be opaque, but it can't really
** be opaque because it is used by macros.
*/
struct fts1HashElem {
fts1HashElem *next, *prev; /* Next and previous elements in the table */
void *data; /* Data associated with this element */
void *pKey; int nKey; /* Key associated with this element */
};
/*
** There are 2 different modes of operation for a hash table:
**
** FTS1_HASH_STRING pKey points to a string that is nKey bytes long
** (including the null-terminator, if any). Case
** is respected in comparisons.
**
** FTS1_HASH_BINARY pKey points to binary data nKey bytes long.
** memcmp() is used to compare keys.
**
** A copy of the key is made if the copyKey parameter to fts1HashInit is 1.
*/
#define FTS1_HASH_STRING 1
#define FTS1_HASH_BINARY 2
/*
** Access routines. To delete, insert a NULL pointer.
*/
void sqlite3Fts1HashInit(fts1Hash*, int keytype, int copyKey);
void *sqlite3Fts1HashInsert(fts1Hash*, const void *pKey, int nKey, void *pData);
void *sqlite3Fts1HashFind(const fts1Hash*, const void *pKey, int nKey);
void sqlite3Fts1HashClear(fts1Hash*);
/*
** Shorthand for the functions above
*/
#define fts1HashInit sqlite3Fts1HashInit
#define fts1HashInsert sqlite3Fts1HashInsert
#define fts1HashFind sqlite3Fts1HashFind
#define fts1HashClear sqlite3Fts1HashClear
/*
** Macros for looping over all elements of a hash table. The idiom is
** like this:
**
** fts1Hash h;
** fts1HashElem *p;
** ...
** for(p=fts1HashFirst(&h); p; p=fts1HashNext(p)){
** SomeStructure *pData = fts1HashData(p);
** // do something with pData
** }
*/
#define fts1HashFirst(H) ((H)->first)
#define fts1HashNext(E) ((E)->next)
#define fts1HashData(E) ((E)->data)
#define fts1HashKey(E) ((E)->pKey)
#define fts1HashKeysize(E) ((E)->nKey)
/*
** Number of entries in a hash table
*/
#define fts1HashCount(H) ((H)->count)
#endif /* _FTS1_HASH_H_ */
-643
View File
@@ -1,643 +0,0 @@
/*
** 2006 September 30
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** Implementation of the full-text-search tokenizer that implements
** a Porter stemmer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS1 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS1 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS1 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts1_tokenizer.h"
/*
** Class derived from sqlite3_tokenizer
*/
typedef struct porter_tokenizer {
sqlite3_tokenizer base; /* Base class */
} porter_tokenizer;
/*
** Class derived from sqlit3_tokenizer_cursor
*/
typedef struct porter_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *zInput; /* input we are tokenizing */
int nInput; /* size of the input */
int iOffset; /* current position in zInput */
int iToken; /* index of next token to be returned */
char *zToken; /* storage for current token */
int nAllocated; /* space allocated to zToken buffer */
} porter_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module porterTokenizerModule;
/*
** Create a new tokenizer instance.
*/
static int porterCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
porter_tokenizer *t;
t = (porter_tokenizer *) calloc(sizeof(*t), 1);
if( t==NULL ) return SQLITE_NOMEM;
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int porterDestroy(sqlite3_tokenizer *pTokenizer){
free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is zInput[0..nInput-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int porterOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *zInput, int nInput, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
porter_tokenizer_cursor *c;
c = (porter_tokenizer_cursor *) malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->zInput = zInput;
if( zInput==0 ){
c->nInput = 0;
}else if( nInput<0 ){
c->nInput = (int)strlen(zInput);
}else{
c->nInput = nInput;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->zToken = NULL; /* no space allocated, yet. */
c->nAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** porterOpen() above.
*/
static int porterClose(sqlite3_tokenizer_cursor *pCursor){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
free(c->zToken);
free(c);
return SQLITE_OK;
}
/*
** Vowel or consonant
*/
static const char cType[] = {
0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0,
1, 1, 1, 2, 1
};
/*
** isConsonant() and isVowel() determine if their first character in
** the string they point to is a consonant or a vowel, according
** to Porter ruls.
**
** A consonate is any letter other than 'a', 'e', 'i', 'o', or 'u'.
** 'Y' is a consonant unless it follows another consonant,
** in which case it is a vowel.
**
** In these routine, the letters are in reverse order. So the 'y' rule
** is that 'y' is a consonant unless it is followed by another
** consonent.
*/
static int isVowel(const char*);
static int isConsonant(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return j;
return z[1]==0 || isVowel(z + 1);
}
static int isVowel(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return 1-j;
return isConsonant(z + 1);
}
/*
** Let any sequence of one or more vowels be represented by V and let
** C be sequence of one or more consonants. Then every word can be
** represented as:
**
** [C] (VC){m} [V]
**
** In prose: A word is an optional consonant followed by zero or
** vowel-consonant pairs followed by an optional vowel. "m" is the
** number of vowel consonant pairs. This routine computes the value
** of m for the first i bytes of a word.
**
** Return true if the m-value for z is 1 or more. In other words,
** return true if z contains at least one vowel that is followed
** by a consonant.
**
** In this routine z[] is in reverse order. So we are really looking
** for an instance of of a consonant followed by a vowel.
*/
static int m_gt_0(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/* Like mgt0 above except we are looking for a value of m which is
** exactly 1
*/
static int m_eq_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 1;
while( isConsonant(z) ){ z++; }
return *z==0;
}
/* Like mgt0 above except we are looking for a value of m>1 instead
** or m>0
*/
static int m_gt_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if there is a vowel anywhere within z[0..n-1]
*/
static int hasVowel(const char *z){
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if the word ends in a double consonant.
**
** The text is reversed here. So we are really looking at
** the first two characters of z[].
*/
static int doubleConsonant(const char *z){
return isConsonant(z) && z[0]==z[1] && isConsonant(z+1);
}
/*
** Return TRUE if the word ends with three letters which
** are consonant-vowel-consonent and where the final consonant
** is not 'w', 'x', or 'y'.
**
** The word is reversed here. So we are really checking the
** first three letters and the first one cannot be in [wxy].
*/
static int star_oh(const char *z){
return
z[0]!=0 && isConsonant(z) &&
z[0]!='w' && z[0]!='x' && z[0]!='y' &&
z[1]!=0 && isVowel(z+1) &&
z[2]!=0 && isConsonant(z+2);
}
/*
** If the word ends with zFrom and xCond() is true for the stem
** of the word that preceeds the zFrom ending, then change the
** ending to zTo.
**
** The input word *pz and zFrom are both in reverse order. zTo
** is in normal order.
**
** Return TRUE if zFrom matches. Return FALSE if zFrom does not
** match. Not that TRUE is returned even if xCond() fails and
** no substitution occurs.
*/
static int stem(
char **pz, /* The word being stemmed (Reversed) */
const char *zFrom, /* If the ending matches this... (Reversed) */
const char *zTo, /* ... change the ending to this (not reversed) */
int (*xCond)(const char*) /* Condition that must be true */
){
char *z = *pz;
while( *zFrom && *zFrom==*z ){ z++; zFrom++; }
if( *zFrom!=0 ) return 0;
if( xCond && !xCond(z) ) return 1;
while( *zTo ){
*(--z) = *(zTo++);
}
*pz = z;
return 1;
}
/*
** This is the fallback stemmer used when the porter stemmer is
** inappropriate. The input word is copied into the output with
** US-ASCII case folding. If the input word is too long (more
** than 20 bytes if it contains no digits or more than 6 bytes if
** it contains digits) then word is truncated to 20 or 6 bytes
** by taking 10 or 3 bytes from the beginning and end.
*/
static void copy_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, mx, j;
int hasDigit = 0;
for(i=0; i<nIn; i++){
int c = zIn[i];
if( c>='A' && c<='Z' ){
zOut[i] = c - 'A' + 'a';
}else{
if( c>='0' && c<='9' ) hasDigit = 1;
zOut[i] = c;
}
}
mx = hasDigit ? 3 : 10;
if( nIn>mx*2 ){
for(j=mx, i=nIn-mx; i<nIn; i++, j++){
zOut[j] = zOut[i];
}
i = j;
}
zOut[i] = 0;
*pnOut = i;
}
/*
** Stem the input word zIn[0..nIn-1]. Store the output in zOut.
** zOut is at least big enough to hold nIn bytes. Write the actual
** size of the output word (exclusive of the '\0' terminator) into *pnOut.
**
** Any upper-case characters in the US-ASCII character set ([A-Z])
** are converted to lower case. Upper-case UTF characters are
** unchanged.
**
** Words that are longer than about 20 bytes are stemmed by retaining
** a few bytes from the beginning and the end of the word. If the
** word contains digits, 3 bytes are taken from the beginning and
** 3 bytes from the end. For long words without digits, 10 bytes
** are taken from each end. US-ASCII case folding still applies.
**
** If the input word contains not digits but does characters not
** in [a-zA-Z] then no stemming is attempted and this routine just
** copies the input into the input into the output with US-ASCII
** case folding.
**
** Stemming never increases the length of the word. So there is
** no chance of overflowing the zOut buffer.
*/
static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, j, c;
char zReverse[28];
char *z, *z2;
if( nIn<3 || nIn>=sizeof(zReverse)-7 ){
/* The word is too big or too small for the porter stemmer.
** Fallback to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
for(i=0, j=sizeof(zReverse)-6; i<nIn; i++, j--){
c = zIn[i];
if( c>='A' && c<='Z' ){
zReverse[j] = c + 'a' - 'A';
}else if( c>='a' && c<='z' ){
zReverse[j] = c;
}else{
/* The use of a character not in [a-zA-Z] means that we fallback
** to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
}
memset(&zReverse[sizeof(zReverse)-5], 0, 5);
z = &zReverse[j+1];
/* Step 1a */
if( z[0]=='s' ){
if(
!stem(&z, "sess", "ss", 0) &&
!stem(&z, "sei", "i", 0) &&
!stem(&z, "ss", "ss", 0)
){
z++;
}
}
/* Step 1b */
z2 = z;
if( stem(&z, "dee", "ee", m_gt_0) ){
/* Do nothing. The work was all in the test */
}else if(
(stem(&z, "gni", "", hasVowel) || stem(&z, "de", "", hasVowel))
&& z!=z2
){
if( stem(&z, "ta", "ate", 0) ||
stem(&z, "lb", "ble", 0) ||
stem(&z, "zi", "ize", 0) ){
/* Do nothing. The work was all in the test */
}else if( doubleConsonant(z) && (*z!='l' && *z!='s' && *z!='z') ){
z++;
}else if( m_eq_1(z) && star_oh(z) ){
*(--z) = 'e';
}
}
/* Step 1c */
if( z[0]=='y' && hasVowel(z+1) ){
z[0] = 'i';
}
/* Step 2 */
switch( z[1] ){
case 'a':
stem(&z, "lanoita", "ate", m_gt_0) ||
stem(&z, "lanoit", "tion", m_gt_0);
break;
case 'c':
stem(&z, "icne", "ence", m_gt_0) ||
stem(&z, "icna", "ance", m_gt_0);
break;
case 'e':
stem(&z, "rezi", "ize", m_gt_0);
break;
case 'g':
stem(&z, "igol", "log", m_gt_0);
break;
case 'l':
stem(&z, "ilb", "ble", m_gt_0) ||
stem(&z, "illa", "al", m_gt_0) ||
stem(&z, "iltne", "ent", m_gt_0) ||
stem(&z, "ile", "e", m_gt_0) ||
stem(&z, "ilsuo", "ous", m_gt_0);
break;
case 'o':
stem(&z, "noitazi", "ize", m_gt_0) ||
stem(&z, "noita", "ate", m_gt_0) ||
stem(&z, "rota", "ate", m_gt_0);
break;
case 's':
stem(&z, "msila", "al", m_gt_0) ||
stem(&z, "ssenevi", "ive", m_gt_0) ||
stem(&z, "ssenluf", "ful", m_gt_0) ||
stem(&z, "ssensuo", "ous", m_gt_0);
break;
case 't':
stem(&z, "itila", "al", m_gt_0) ||
stem(&z, "itivi", "ive", m_gt_0) ||
stem(&z, "itilib", "ble", m_gt_0);
break;
}
/* Step 3 */
switch( z[0] ){
case 'e':
stem(&z, "etaci", "ic", m_gt_0) ||
stem(&z, "evita", "", m_gt_0) ||
stem(&z, "ezila", "al", m_gt_0);
break;
case 'i':
stem(&z, "itici", "ic", m_gt_0);
break;
case 'l':
stem(&z, "laci", "ic", m_gt_0) ||
stem(&z, "luf", "", m_gt_0);
break;
case 's':
stem(&z, "ssen", "", m_gt_0);
break;
}
/* Step 4 */
switch( z[1] ){
case 'a':
if( z[0]=='l' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'c':
if( z[0]=='e' && z[2]=='n' && (z[3]=='a' || z[3]=='e') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'e':
if( z[0]=='r' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'i':
if( z[0]=='c' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'l':
if( z[0]=='e' && z[2]=='b' && (z[3]=='a' || z[3]=='i') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'n':
if( z[0]=='t' ){
if( z[2]=='a' ){
if( m_gt_1(z+3) ){
z += 3;
}
}else if( z[2]=='e' ){
stem(&z, "tneme", "", m_gt_1) ||
stem(&z, "tnem", "", m_gt_1) ||
stem(&z, "tne", "", m_gt_1);
}
}
break;
case 'o':
if( z[0]=='u' ){
if( m_gt_1(z+2) ){
z += 2;
}
}else if( z[3]=='s' || z[3]=='t' ){
stem(&z, "noi", "", m_gt_1);
}
break;
case 's':
if( z[0]=='m' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
case 't':
stem(&z, "eta", "", m_gt_1) ||
stem(&z, "iti", "", m_gt_1);
break;
case 'u':
if( z[0]=='s' && z[2]=='o' && m_gt_1(z+3) ){
z += 3;
}
break;
case 'v':
case 'z':
if( z[0]=='e' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
}
/* Step 5a */
if( z[0]=='e' ){
if( m_gt_1(z+1) ){
z++;
}else if( m_eq_1(z+1) && !star_oh(z+1) ){
z++;
}
}
/* Step 5b */
if( m_gt_1(z) && z[0]=='l' && z[1]=='l' ){
z++;
}
/* z[] is now the stemmed word in reverse order. Flip it back
** around into forward order and return.
*/
*pnOut = i = strlen(z);
zOut[i] = 0;
while( *z ){
zOut[--i] = *(z++);
}
}
/*
** Characters that can be part of a token. We assume any character
** whose value is greater than 0x80 (any UTF character) can be
** part of a token. In other words, delimiters all must have
** values of 0x7f or lower.
*/
static const char isIdChar[] = {
/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */
};
#define idChar(C) (((ch=C)&0x80)!=0 || (ch>0x2f && isIdChar[ch-0x30]))
#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !isIdChar[ch-0x30]))
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to porterOpen().
*/
static int porterNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by porterOpen */
const char **pzToken, /* OUT: *pzToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
const char *z = c->zInput;
while( c->iOffset<c->nInput ){
int iStartOffset, ch;
/* Scan past delimiter characters */
while( c->iOffset<c->nInput && isDelim(z[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nInput && !isDelim(z[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int n = c->iOffset-iStartOffset;
if( n>c->nAllocated ){
c->nAllocated = n+20;
c->zToken = realloc(c->zToken, c->nAllocated);
if( c->zToken==NULL ) return SQLITE_NOMEM;
}
porter_stemmer(&z[iStartOffset], n, c->zToken, pnBytes);
*pzToken = c->zToken;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the porter-stemmer tokenizer
*/
static const sqlite3_tokenizer_module porterTokenizerModule = {
0,
porterCreate,
porterDestroy,
porterOpen,
porterClose,
porterNext,
};
/*
** Allocate a new porter tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts1PorterTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &porterTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) */
-90
View File
@@ -1,90 +0,0 @@
/*
** 2006 July 10
**
** The author disclaims copyright to this source code.
**
*************************************************************************
** Defines the interface to tokenizers used by fulltext-search. There
** are three basic components:
**
** sqlite3_tokenizer_module is a singleton defining the tokenizer
** interface functions. This is essentially the class structure for
** tokenizers.
**
** sqlite3_tokenizer is used to define a particular tokenizer, perhaps
** including customization information defined at creation time.
**
** sqlite3_tokenizer_cursor is generated by a tokenizer to generate
** tokens from a particular input.
*/
#ifndef _FTS1_TOKENIZER_H_
#define _FTS1_TOKENIZER_H_
/* TODO(shess) Only used for SQLITE_OK and SQLITE_DONE at this time.
** If tokenizers are to be allowed to call sqlite3_*() functions, then
** we will need a way to register the API consistently.
*/
#include "sqlite3.h"
/*
** Structures used by the tokenizer interface.
*/
typedef struct sqlite3_tokenizer sqlite3_tokenizer;
typedef struct sqlite3_tokenizer_cursor sqlite3_tokenizer_cursor;
typedef struct sqlite3_tokenizer_module sqlite3_tokenizer_module;
struct sqlite3_tokenizer_module {
int iVersion; /* currently 0 */
/*
** Create and destroy a tokenizer. argc/argv are passed down from
** the fulltext virtual table creation to allow customization.
*/
int (*xCreate)(int argc, const char *const*argv,
sqlite3_tokenizer **ppTokenizer);
int (*xDestroy)(sqlite3_tokenizer *pTokenizer);
/*
** Tokenize a particular input. Call xOpen() to prepare to
** tokenize, xNext() repeatedly until it returns SQLITE_DONE, then
** xClose() to free any internal state. The pInput passed to
** xOpen() must exist until the cursor is closed. The ppToken
** result from xNext() is only valid until the next call to xNext()
** or until xClose() is called.
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
** should be converted to zInput.
*/
int (*xOpen)(sqlite3_tokenizer *pTokenizer,
const char *pInput, int nBytes,
sqlite3_tokenizer_cursor **ppCursor);
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
int (*xNext)(sqlite3_tokenizer_cursor *pCursor,
const char **ppToken, int *pnBytes,
int *piStartOffset, int *piEndOffset, int *piPosition);
};
struct sqlite3_tokenizer {
const sqlite3_tokenizer_module *pModule; /* The module for this tokenizer */
/* Tokenizer implementations will typically add additional fields */
};
struct sqlite3_tokenizer_cursor {
sqlite3_tokenizer *pTokenizer; /* Tokenizer for this cursor. */
/* Tokenizer implementations will typically add additional fields */
};
/*
** Get the module for a tokenizer which generates tokens based on a
** set of non-token characters. The default is to break tokens at any
** non-alnum character, though the set of delimiters can also be
** specified by the first argv argument to xCreate().
*/
/* TODO(shess) This doesn't belong here. Need some sort of
** registration process.
*/
void sqlite3Fts1SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
void sqlite3Fts1PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
#endif /* _FTS1_TOKENIZER_H_ */
-221
View File
@@ -1,221 +0,0 @@
/*
** The author disclaims copyright to this source code.
**
*************************************************************************
** Implementation of the "simple" full-text-search tokenizer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS1 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS1 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS1 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts1_tokenizer.h"
typedef struct simple_tokenizer {
sqlite3_tokenizer base;
char delim[128]; /* flag ASCII delimiters */
} simple_tokenizer;
typedef struct simple_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *pInput; /* input we are tokenizing */
int nBytes; /* size of the input */
int iOffset; /* current position in pInput */
int iToken; /* index of next token to be returned */
char *pToken; /* storage for current token */
int nTokenAllocated; /* space allocated to zToken buffer */
} simple_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module simpleTokenizerModule;
static int isDelim(simple_tokenizer *t, unsigned char c){
return c<0x80 && t->delim[c];
}
/*
** Create a new tokenizer instance.
*/
static int simpleCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
simple_tokenizer *t;
t = (simple_tokenizer *) calloc(sizeof(*t), 1);
if( t==NULL ) return SQLITE_NOMEM;
/* TODO(shess) Delimiters need to remain the same from run to run,
** else we need to reindex. One solution would be a meta-table to
** track such information in the database, then we'd only want this
** information on the initial create.
*/
if( argc>1 ){
int i, n = strlen(argv[1]);
for(i=0; i<n; i++){
unsigned char ch = argv[1][i];
/* We explicitly don't support UTF-8 delimiters for now. */
if( ch>=0x80 ){
free(t);
return SQLITE_ERROR;
}
t->delim[ch] = 1;
}
} else {
/* Mark non-alphanumeric ASCII characters as delimiters */
int i;
for(i=1; i<0x80; i++){
t->delim[i] = !isalnum(i);
}
}
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int simpleDestroy(sqlite3_tokenizer *pTokenizer){
free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is pInput[0..nBytes-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int simpleOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *pInput, int nBytes, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
simple_tokenizer_cursor *c;
c = (simple_tokenizer_cursor *) malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->pInput = pInput;
if( pInput==0 ){
c->nBytes = 0;
}else if( nBytes<0 ){
c->nBytes = (int)strlen(pInput);
}else{
c->nBytes = nBytes;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->pToken = NULL; /* no space allocated, yet. */
c->nTokenAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** simpleOpen() above.
*/
static int simpleClose(sqlite3_tokenizer_cursor *pCursor){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
free(c->pToken);
free(c);
return SQLITE_OK;
}
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to simpleOpen().
*/
static int simpleNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by simpleOpen */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
simple_tokenizer *t = (simple_tokenizer *) pCursor->pTokenizer;
unsigned char *p = (unsigned char *)c->pInput;
while( c->iOffset<c->nBytes ){
int iStartOffset;
/* Scan past delimiter characters */
while( c->iOffset<c->nBytes && isDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nBytes && !isDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int i, n = c->iOffset-iStartOffset;
if( n>c->nTokenAllocated ){
c->nTokenAllocated = n+20;
c->pToken = realloc(c->pToken, c->nTokenAllocated);
if( c->pToken==NULL ) return SQLITE_NOMEM;
}
for(i=0; i<n; i++){
/* TODO(shess) This needs expansion to handle UTF-8
** case-insensitivity.
*/
unsigned char ch = p[iStartOffset+i];
c->pToken[i] = ch<0x80 ? tolower(ch) : ch;
}
*ppToken = c->pToken;
*pnBytes = n;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the simple tokenizer
*/
static const sqlite3_tokenizer_module simpleTokenizerModule = {
0,
simpleCreate,
simpleDestroy,
simpleOpen,
simpleClose,
simpleNext,
};
/*
** Allocate a new simple tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts1SimpleTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &simpleTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) */
-1496
View File
File diff suppressed because it is too large Load Diff
-11
View File
@@ -1,11 +0,0 @@
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int fulltext_init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-174
View File
@@ -1,174 +0,0 @@
/*
** The author disclaims copyright to this source code.
**
*************************************************************************
** Implementation of the "simple" full-text-search tokenizer.
*/
#include <assert.h>
#if !defined(__APPLE__)
#include <malloc.h>
#else
#include <stdlib.h>
#endif
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "tokenizer.h"
/* Duplicate a string; the caller must free() the returned string.
* (We don't use strdup() since it's not part of the standard C library and
* may not be available everywhere.) */
/* TODO(shess) Copied from fulltext.c, consider util.c for such
** things. */
static char *string_dup(const char *s){
char *str = malloc(strlen(s) + 1);
strcpy(str, s);
return str;
}
typedef struct simple_tokenizer {
sqlite3_tokenizer base;
const char *zDelim; /* token delimiters */
} simple_tokenizer;
typedef struct simple_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *pInput; /* input we are tokenizing */
int nBytes; /* size of the input */
const char *pCurrent; /* current position in pInput */
int iToken; /* index of next token to be returned */
char *zToken; /* storage for current token */
int nTokenBytes; /* actual size of current token */
int nTokenAllocated; /* space allocated to zToken buffer */
} simple_tokenizer_cursor;
static sqlite3_tokenizer_module simpleTokenizerModule;/* forward declaration */
static int simpleCreate(
int argc, const char **argv,
sqlite3_tokenizer **ppTokenizer
){
simple_tokenizer *t;
t = (simple_tokenizer *) malloc(sizeof(simple_tokenizer));
/* TODO(shess) Delimiters need to remain the same from run to run,
** else we need to reindex. One solution would be a meta-table to
** track such information in the database, then we'd only want this
** information on the initial create.
*/
if( argc>1 ){
t->zDelim = string_dup(argv[1]);
} else {
/* Build a string excluding alphanumeric ASCII characters */
char zDelim[0x80]; /* nul-terminated, so nul not a member */
int i, j;
for(i=1, j=0; i<0x80; i++){
if( !isalnum(i) ){
zDelim[j++] = i;
}
}
zDelim[j++] = '\0';
assert( j<=sizeof(zDelim) );
t->zDelim = string_dup(zDelim);
}
*ppTokenizer = &t->base;
return SQLITE_OK;
}
static int simpleDestroy(sqlite3_tokenizer *pTokenizer){
simple_tokenizer *t = (simple_tokenizer *) pTokenizer;
free((void *) t->zDelim);
free(t);
return SQLITE_OK;
}
static int simpleOpen(
sqlite3_tokenizer *pTokenizer,
const char *pInput, int nBytes,
sqlite3_tokenizer_cursor **ppCursor
){
simple_tokenizer_cursor *c;
c = (simple_tokenizer_cursor *) malloc(sizeof(simple_tokenizer_cursor));
c->pInput = pInput;
c->nBytes = nBytes<0 ? (int) strlen(pInput) : nBytes;
c->pCurrent = c->pInput; /* start tokenizing at the beginning */
c->iToken = 0;
c->zToken = NULL; /* no space allocated, yet. */
c->nTokenBytes = 0;
c->nTokenAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
static int simpleClose(sqlite3_tokenizer_cursor *pCursor){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
if( NULL!=c->zToken ){
free(c->zToken);
}
free(c);
return SQLITE_OK;
}
static int simpleNext(
sqlite3_tokenizer_cursor *pCursor,
const char **ppToken, int *pnBytes,
int *piStartOffset, int *piEndOffset, int *piPosition
){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
simple_tokenizer *t = (simple_tokenizer *) pCursor->pTokenizer;
int ii;
while( c->pCurrent-c->pInput<c->nBytes ){
int n = (int) strcspn(c->pCurrent, t->zDelim);
if( n>0 ){
if( n+1>c->nTokenAllocated ){
c->zToken = realloc(c->zToken, n+1);
}
for(ii=0; ii<n; ii++){
/* TODO(shess) This needs expansion to handle UTF-8
** case-insensitivity.
*/
char ch = c->pCurrent[ii];
c->zToken[ii] = (unsigned char)ch<0x80 ? tolower(ch) : ch;
}
c->zToken[n] = '\0';
*ppToken = c->zToken;
*pnBytes = n;
*piStartOffset = (int) (c->pCurrent-c->pInput);
*piEndOffset = *piStartOffset+n;
*piPosition = c->iToken++;
c->pCurrent += n + 1;
return SQLITE_OK;
}
c->pCurrent += n + 1;
/* TODO(shess) could strspn() to skip delimiters en masse. Needs
** to happen in two places, though, which is annoying.
*/
}
return SQLITE_DONE;
}
static sqlite3_tokenizer_module simpleTokenizerModule = {
0,
simpleCreate,
simpleDestroy,
simpleOpen,
simpleClose,
simpleNext,
};
void get_simple_tokenizer_module(
sqlite3_tokenizer_module **ppModule
){
*ppModule = &simpleTokenizerModule;
}
-89
View File
@@ -1,89 +0,0 @@
/*
** 2006 July 10
**
** The author disclaims copyright to this source code.
**
*************************************************************************
** Defines the interface to tokenizers used by fulltext-search. There
** are three basic components:
**
** sqlite3_tokenizer_module is a singleton defining the tokenizer
** interface functions. This is essentially the class structure for
** tokenizers.
**
** sqlite3_tokenizer is used to define a particular tokenizer, perhaps
** including customization information defined at creation time.
**
** sqlite3_tokenizer_cursor is generated by a tokenizer to generate
** tokens from a particular input.
*/
#ifndef _TOKENIZER_H_
#define _TOKENIZER_H_
/* TODO(shess) Only used for SQLITE_OK and SQLITE_DONE at this time.
** If tokenizers are to be allowed to call sqlite3_*() functions, then
** we will need a way to register the API consistently.
*/
#include "sqlite3.h"
/*
** Structures used by the tokenizer interface.
*/
typedef struct sqlite3_tokenizer sqlite3_tokenizer;
typedef struct sqlite3_tokenizer_cursor sqlite3_tokenizer_cursor;
typedef struct sqlite3_tokenizer_module sqlite3_tokenizer_module;
struct sqlite3_tokenizer_module {
int iVersion; /* currently 0 */
/*
** Create and destroy a tokenizer. argc/argv are passed down from
** the fulltext virtual table creation to allow customization.
*/
int (*xCreate)(int argc, const char **argv,
sqlite3_tokenizer **ppTokenizer);
int (*xDestroy)(sqlite3_tokenizer *pTokenizer);
/*
** Tokenize a particular input. Call xOpen() to prepare to
** tokenize, xNext() repeatedly until it returns SQLITE_DONE, then
** xClose() to free any internal state. The pInput passed to
** xOpen() must exist until the cursor is closed. The ppToken
** result from xNext() is only valid until the next call to xNext()
** or until xClose() is called.
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
** should be converted to zInput.
*/
int (*xOpen)(sqlite3_tokenizer *pTokenizer,
const char *pInput, int nBytes,
sqlite3_tokenizer_cursor **ppCursor);
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
int (*xNext)(sqlite3_tokenizer_cursor *pCursor,
const char **ppToken, int *pnBytes,
int *piStartOffset, int *piEndOffset, int *piPosition);
};
struct sqlite3_tokenizer {
sqlite3_tokenizer_module *pModule; /* The module for this tokenizer */
/* Tokenizer implementations will typically add additional fields */
};
struct sqlite3_tokenizer_cursor {
sqlite3_tokenizer *pTokenizer; /* Tokenizer for this cursor. */
/* Tokenizer implementations will typically add additional fields */
};
/*
** Get the module for a tokenizer which generates tokens based on a
** set of non-token characters. The default is to break tokens at any
** non-alnum character, though the set of delimiters can also be
** specified by the first argv argument to xCreate().
*/
/* TODO(shess) This doesn't belong here. Need some sort of
** registration process.
*/
void get_simple_tokenizer_module(sqlite3_tokenizer_module **ppModule);
#endif /* _TOKENIZER_H_ */
-133
View File
@@ -1,133 +0,0 @@
1. FTS2 Tokenizers
When creating a new full-text table, FTS2 allows the user to select
the text tokenizer implementation to be used when indexing text
by specifying a "tokenizer" clause as part of the CREATE VIRTUAL TABLE
statement:
CREATE VIRTUAL TABLE <table-name> USING fts2(
<columns ...> [, tokenizer <tokenizer-name> [<tokenizer-args>]]
);
The built-in tokenizers (valid values to pass as <tokenizer name>) are
"simple" and "porter".
<tokenizer-args> should consist of zero or more white-space separated
arguments to pass to the selected tokenizer implementation. The
interpretation of the arguments, if any, depends on the individual
tokenizer.
2. Custom Tokenizers
FTS2 allows users to provide custom tokenizer implementations. The
interface used to create a new tokenizer is defined and described in
the fts2_tokenizer.h source file.
Registering a new FTS2 tokenizer is similar to registering a new
virtual table module with SQLite. The user passes a pointer to a
structure containing pointers to various callback functions that
make up the implementation of the new tokenizer type. For tokenizers,
the structure (defined in fts2_tokenizer.h) is called
"sqlite3_tokenizer_module".
FTS2 does not expose a C-function that users call to register new
tokenizer types with a database handle. Instead, the pointer must
be encoded as an SQL blob value and passed to FTS2 through the SQL
engine by evaluating a special scalar function, "fts2_tokenizer()".
The fts2_tokenizer() function may be called with one or two arguments,
as follows:
SELECT fts2_tokenizer(<tokenizer-name>);
SELECT fts2_tokenizer(<tokenizer-name>, <sqlite3_tokenizer_module ptr>);
Where <tokenizer-name> is a string identifying the tokenizer and
<sqlite3_tokenizer_module ptr> is a pointer to an sqlite3_tokenizer_module
structure encoded as an SQL blob. If the second argument is present,
it is registered as tokenizer <tokenizer-name> and a copy of it
returned. If only one argument is passed, a pointer to the tokenizer
implementation currently registered as <tokenizer-name> is returned,
encoded as a blob. Or, if no such tokenizer exists, an SQL exception
(error) is raised.
SECURITY: If the fts2 extension is used in an environment where potentially
malicious users may execute arbitrary SQL (i.e. gears), they should be
prevented from invoking the fts2_tokenizer() function, possibly using the
authorisation callback.
See "Sample code" below for an example of calling the fts2_tokenizer()
function from C code.
3. ICU Library Tokenizers
If this extension is compiled with the SQLITE_ENABLE_ICU pre-processor
symbol defined, then there exists a built-in tokenizer named "icu"
implemented using the ICU library. The first argument passed to the
xCreate() method (see fts2_tokenizer.h) of this tokenizer may be
an ICU locale identifier. For example "tr_TR" for Turkish as used
in Turkey, or "en_AU" for English as used in Australia. For example:
"CREATE VIRTUAL TABLE thai_text USING fts2(text, tokenizer icu th_TH)"
The ICU tokenizer implementation is very simple. It splits the input
text according to the ICU rules for finding word boundaries and discards
any tokens that consist entirely of white-space. This may be suitable
for some applications in some locales, but not all. If more complex
processing is required, for example to implement stemming or
discard punctuation, this can be done by creating a tokenizer
implementation that uses the ICU tokenizer as part of its implementation.
When using the ICU tokenizer this way, it is safe to overwrite the
contents of the strings returned by the xNext() method (see
fts2_tokenizer.h).
4. Sample code.
The following two code samples illustrate the way C code should invoke
the fts2_tokenizer() scalar function:
int registerTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module *p
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts2_tokenizer(?, ?)";
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
sqlite3_bind_blob(pStmt, 2, &p, sizeof(p), SQLITE_STATIC);
sqlite3_step(pStmt);
return sqlite3_finalize(pStmt);
}
int queryTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module **pp
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts2_tokenizer(?)";
*pp = 0;
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
if( SQLITE_ROW==sqlite3_step(pStmt) ){
if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
}
}
return sqlite3_finalize(pStmt);
}
-4
View File
@@ -1,4 +0,0 @@
This folder contains source code to the second full-text search
extension for SQLite. While the API is the same, this version uses a
substantially different storage schema from fts1, so tables will need
to be rebuilt.
-6859
View File
File diff suppressed because it is too large Load Diff
-26
View File
@@ -1,26 +0,0 @@
/*
** 2006 Oct 10
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This header file is used by programs that want to link against the
** FTS2 library. All it does is declare the sqlite3Fts2Init() interface.
*/
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3Fts2Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-374
View File
@@ -1,374 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the implementation of generic hash-tables used in SQLite.
** We've modified it slightly to serve as a standalone hash table
** implementation for the full-text indexing module.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS2 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS2 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS2 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "sqlite3.h"
#include "fts2_hash.h"
/*
** Malloc and Free functions
*/
static void *fts2HashMalloc(int n){
void *p = sqlite3_malloc(n);
if( p ){
memset(p, 0, n);
}
return p;
}
static void fts2HashFree(void *p){
sqlite3_free(p);
}
/* Turn bulk memory into a hash table object by initializing the
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
** keyClass is one of the constants
** FTS2_HASH_BINARY or FTS2_HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer.
*/
void sqlite3Fts2HashInit(fts2Hash *pNew, int keyClass, int copyKey){
assert( pNew!=0 );
assert( keyClass>=FTS2_HASH_STRING && keyClass<=FTS2_HASH_BINARY );
pNew->keyClass = keyClass;
pNew->copyKey = copyKey;
pNew->first = 0;
pNew->count = 0;
pNew->htsize = 0;
pNew->ht = 0;
}
/* Remove all entries from a hash table. Reclaim all memory.
** Call this routine to delete a hash table or to reset a hash table
** to the empty state.
*/
void sqlite3Fts2HashClear(fts2Hash *pH){
fts2HashElem *elem; /* For looping over all elements of the table */
assert( pH!=0 );
elem = pH->first;
pH->first = 0;
fts2HashFree(pH->ht);
pH->ht = 0;
pH->htsize = 0;
while( elem ){
fts2HashElem *next_elem = elem->next;
if( pH->copyKey && elem->pKey ){
fts2HashFree(elem->pKey);
}
fts2HashFree(elem);
elem = next_elem;
}
pH->count = 0;
}
/*
** Hash and comparison functions when the mode is FTS2_HASH_STRING
*/
static int strHash(const void *pKey, int nKey){
const char *z = (const char *)pKey;
int h = 0;
if( nKey<=0 ) nKey = (int) strlen(z);
while( nKey > 0 ){
h = (h<<3) ^ h ^ *z++;
nKey--;
}
return h & 0x7fffffff;
}
static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return strncmp((const char*)pKey1,(const char*)pKey2,n1);
}
/*
** Hash and comparison functions when the mode is FTS2_HASH_BINARY
*/
static int binHash(const void *pKey, int nKey){
int h = 0;
const char *z = (const char *)pKey;
while( nKey-- > 0 ){
h = (h<<3) ^ h ^ *(z++);
}
return h & 0x7fffffff;
}
static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return memcmp(pKey1,pKey2,n1);
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "hashFunction". The function takes a
** single parameter "keyClass". The return value of hashFunction()
** is a pointer to another function. Specifically, the return value
** of hashFunction() is a pointer to a function that takes two parameters
** with types "const void*" and "int" and returns an "int".
*/
static int (*hashFunction(int keyClass))(const void*,int){
if( keyClass==FTS2_HASH_STRING ){
return &strHash;
}else{
assert( keyClass==FTS2_HASH_BINARY );
return &binHash;
}
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** For help in interpreted the obscure C code in the function definition,
** see the header comment on the previous function.
*/
static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
if( keyClass==FTS2_HASH_STRING ){
return &strCompare;
}else{
assert( keyClass==FTS2_HASH_BINARY );
return &binCompare;
}
}
/* Link an element into the hash table
*/
static void insertElement(
fts2Hash *pH, /* The complete hash table */
struct _fts2ht *pEntry, /* The entry into which pNew is inserted */
fts2HashElem *pNew /* The element to be inserted */
){
fts2HashElem *pHead; /* First element already in pEntry */
pHead = pEntry->chain;
if( pHead ){
pNew->next = pHead;
pNew->prev = pHead->prev;
if( pHead->prev ){ pHead->prev->next = pNew; }
else { pH->first = pNew; }
pHead->prev = pNew;
}else{
pNew->next = pH->first;
if( pH->first ){ pH->first->prev = pNew; }
pNew->prev = 0;
pH->first = pNew;
}
pEntry->count++;
pEntry->chain = pNew;
}
/* Resize the hash table so that it cantains "new_size" buckets.
** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void rehash(fts2Hash *pH, int new_size){
struct _fts2ht *new_ht; /* The new hash table */
fts2HashElem *elem, *next_elem; /* For looping over existing elements */
int (*xHash)(const void*,int); /* The hash function */
assert( (new_size & (new_size-1))==0 );
new_ht = (struct _fts2ht *)fts2HashMalloc( new_size*sizeof(struct _fts2ht) );
if( new_ht==0 ) return;
fts2HashFree(pH->ht);
pH->ht = new_ht;
pH->htsize = new_size;
xHash = hashFunction(pH->keyClass);
for(elem=pH->first, pH->first=0; elem; elem = next_elem){
int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
next_elem = elem->next;
insertElement(pH, &new_ht[h], elem);
}
}
/* This function (for internal use only) locates an element in an
** hash table that matches the given key. The hash for this key has
** already been computed and is passed as the 4th parameter.
*/
static fts2HashElem *findElementGivenHash(
const fts2Hash *pH, /* The pH to be searched */
const void *pKey, /* The key we are searching for */
int nKey,
int h /* The hash for this key. */
){
fts2HashElem *elem; /* Used to loop thru the element list */
int count; /* Number of elements left to test */
int (*xCompare)(const void*,int,const void*,int); /* comparison function */
if( pH->ht ){
struct _fts2ht *pEntry = &pH->ht[h];
elem = pEntry->chain;
count = pEntry->count;
xCompare = compareFunction(pH->keyClass);
while( count-- && elem ){
if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
}
}
return 0;
}
/* Remove a single entry from the hash table given a pointer to that
** element and a hash on the element's key.
*/
static void removeElementGivenHash(
fts2Hash *pH, /* The pH containing "elem" */
fts2HashElem* elem, /* The element to be removed from the pH */
int h /* Hash value for the element */
){
struct _fts2ht *pEntry;
if( elem->prev ){
elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
if( elem->next ){
elem->next->prev = elem->prev;
}
pEntry = &pH->ht[h];
if( pEntry->chain==elem ){
pEntry->chain = elem->next;
}
pEntry->count--;
if( pEntry->count<=0 ){
pEntry->chain = 0;
}
if( pH->copyKey && elem->pKey ){
fts2HashFree(elem->pKey);
}
fts2HashFree( elem );
pH->count--;
if( pH->count<=0 ){
assert( pH->first==0 );
assert( pH->count==0 );
fts2HashClear(pH);
}
}
/* Attempt to locate an element of the hash table pH with a key
** that matches pKey,nKey. Return the data for this element if it is
** found, or NULL if there is no match.
*/
void *sqlite3Fts2HashFind(const fts2Hash *pH, const void *pKey, int nKey){
int h; /* A hash on key */
fts2HashElem *elem; /* The element that matches key */
int (*xHash)(const void*,int); /* The hash function */
if( pH==0 || pH->ht==0 ) return 0;
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
h = (*xHash)(pKey,nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1));
return elem ? elem->data : 0;
}
/* Insert an element into the hash table pH. The key is pKey,nKey
** and the data is "data".
**
** If no element exists with a matching key, then a new
** element is created. A copy of the key is made if the copyKey
** flag is set. NULL is returned.
**
** If another element already exists with the same key, then the
** new data replaces the old data and the old data is returned.
** The key is not copied in this instance. If a malloc fails, then
** the new data is returned and the hash table is unchanged.
**
** If the "data" parameter to this function is NULL, then the
** element corresponding to "key" is removed from the hash table.
*/
void *sqlite3Fts2HashInsert(
fts2Hash *pH, /* The hash table to insert into */
const void *pKey, /* The key */
int nKey, /* Number of bytes in the key */
void *data /* The data */
){
int hraw; /* Raw hash value of the key */
int h; /* the hash of the key modulo hash table size */
fts2HashElem *elem; /* Used to loop thru the element list */
fts2HashElem *new_elem; /* New element added to the pH */
int (*xHash)(const void*,int); /* The hash function */
assert( pH!=0 );
xHash = hashFunction(pH->keyClass);
assert( xHash!=0 );
hraw = (*xHash)(pKey, nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
elem = findElementGivenHash(pH,pKey,nKey,h);
if( elem ){
void *old_data = elem->data;
if( data==0 ){
removeElementGivenHash(pH,elem,h);
}else{
elem->data = data;
}
return old_data;
}
if( data==0 ) return 0;
new_elem = (fts2HashElem*)fts2HashMalloc( sizeof(fts2HashElem) );
if( new_elem==0 ) return data;
if( pH->copyKey && pKey!=0 ){
new_elem->pKey = fts2HashMalloc( nKey );
if( new_elem->pKey==0 ){
fts2HashFree(new_elem);
return data;
}
memcpy((void*)new_elem->pKey, pKey, nKey);
}else{
new_elem->pKey = (void*)pKey;
}
new_elem->nKey = nKey;
pH->count++;
if( pH->htsize==0 ){
rehash(pH,8);
if( pH->htsize==0 ){
pH->count = 0;
fts2HashFree(new_elem);
return data;
}
}
if( pH->count > pH->htsize ){
rehash(pH,pH->htsize*2);
}
assert( pH->htsize>0 );
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
insertElement(pH, &pH->ht[h], new_elem);
new_elem->data = data;
return 0;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) */
-110
View File
@@ -1,110 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the header file for the generic hash-table implemenation
** used in SQLite. We've modified it slightly to serve as a standalone
** hash table implementation for the full-text indexing module.
**
*/
#ifndef _FTS2_HASH_H_
#define _FTS2_HASH_H_
/* Forward declarations of structures. */
typedef struct fts2Hash fts2Hash;
typedef struct fts2HashElem fts2HashElem;
/* A complete hash table is an instance of the following structure.
** The internals of this structure are intended to be opaque -- client
** code should not attempt to access or modify the fields of this structure
** directly. Change this structure only by using the routines below.
** However, many of the "procedures" and "functions" for modifying and
** accessing this structure are really macros, so we can't really make
** this structure opaque.
*/
struct fts2Hash {
char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
char copyKey; /* True if copy of key made on insert */
int count; /* Number of entries in this table */
fts2HashElem *first; /* The first element of the array */
int htsize; /* Number of buckets in the hash table */
struct _fts2ht { /* the hash table */
int count; /* Number of entries with this hash */
fts2HashElem *chain; /* Pointer to first entry with this hash */
} *ht;
};
/* Each element in the hash table is an instance of the following
** structure. All elements are stored on a single doubly-linked list.
**
** Again, this structure is intended to be opaque, but it can't really
** be opaque because it is used by macros.
*/
struct fts2HashElem {
fts2HashElem *next, *prev; /* Next and previous elements in the table */
void *data; /* Data associated with this element */
void *pKey; int nKey; /* Key associated with this element */
};
/*
** There are 2 different modes of operation for a hash table:
**
** FTS2_HASH_STRING pKey points to a string that is nKey bytes long
** (including the null-terminator, if any). Case
** is respected in comparisons.
**
** FTS2_HASH_BINARY pKey points to binary data nKey bytes long.
** memcmp() is used to compare keys.
**
** A copy of the key is made if the copyKey parameter to fts2HashInit is 1.
*/
#define FTS2_HASH_STRING 1
#define FTS2_HASH_BINARY 2
/*
** Access routines. To delete, insert a NULL pointer.
*/
void sqlite3Fts2HashInit(fts2Hash*, int keytype, int copyKey);
void *sqlite3Fts2HashInsert(fts2Hash*, const void *pKey, int nKey, void *pData);
void *sqlite3Fts2HashFind(const fts2Hash*, const void *pKey, int nKey);
void sqlite3Fts2HashClear(fts2Hash*);
/*
** Shorthand for the functions above
*/
#define fts2HashInit sqlite3Fts2HashInit
#define fts2HashInsert sqlite3Fts2HashInsert
#define fts2HashFind sqlite3Fts2HashFind
#define fts2HashClear sqlite3Fts2HashClear
/*
** Macros for looping over all elements of a hash table. The idiom is
** like this:
**
** fts2Hash h;
** fts2HashElem *p;
** ...
** for(p=fts2HashFirst(&h); p; p=fts2HashNext(p)){
** SomeStructure *pData = fts2HashData(p);
** // do something with pData
** }
*/
#define fts2HashFirst(H) ((H)->first)
#define fts2HashNext(E) ((E)->next)
#define fts2HashData(E) ((E)->data)
#define fts2HashKey(E) ((E)->pKey)
#define fts2HashKeysize(E) ((E)->nKey)
/*
** Number of entries in a hash table
*/
#define fts2HashCount(H) ((H)->count)
#endif /* _FTS2_HASH_H_ */
-260
View File
@@ -1,260 +0,0 @@
/*
** 2007 June 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This file implements a tokenizer for fts2 based on the ICU library.
**
** $Id: fts2_icu.c,v 1.3 2008/12/18 05:30:26 danielk1977 Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#ifdef SQLITE_ENABLE_ICU
#include <assert.h>
#include <string.h>
#include "fts2_tokenizer.h"
#include <unicode/ubrk.h>
#include <unicode/ucol.h>
#include <unicode/ustring.h>
#include <unicode/utf16.h>
typedef struct IcuTokenizer IcuTokenizer;
typedef struct IcuCursor IcuCursor;
struct IcuTokenizer {
sqlite3_tokenizer base;
char *zLocale;
};
struct IcuCursor {
sqlite3_tokenizer_cursor base;
UBreakIterator *pIter; /* ICU break-iterator object */
int nChar; /* Number of UChar elements in pInput */
UChar *aChar; /* Copy of input using utf-16 encoding */
int *aOffset; /* Offsets of each character in utf-8 input */
int nBuffer;
char *zBuffer;
int iToken;
};
/*
** Create a new tokenizer instance.
*/
static int icuCreate(
int argc, /* Number of entries in argv[] */
const char * const *argv, /* Tokenizer creation arguments */
sqlite3_tokenizer **ppTokenizer /* OUT: Created tokenizer */
){
IcuTokenizer *p;
int n = 0;
if( argc>0 ){
n = strlen(argv[0])+1;
}
p = (IcuTokenizer *)sqlite3_malloc(sizeof(IcuTokenizer)+n);
if( !p ){
return SQLITE_NOMEM;
}
memset(p, 0, sizeof(IcuTokenizer));
if( n ){
p->zLocale = (char *)&p[1];
memcpy(p->zLocale, argv[0], n);
}
*ppTokenizer = (sqlite3_tokenizer *)p;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int icuDestroy(sqlite3_tokenizer *pTokenizer){
IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
sqlite3_free(p);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is pInput[0..nBytes-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int icuOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *zInput, /* Input string */
int nInput, /* Length of zInput in bytes */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
IcuCursor *pCsr;
const int32_t opt = U_FOLD_CASE_DEFAULT;
UErrorCode status = U_ZERO_ERROR;
int nChar;
UChar32 c;
int iInput = 0;
int iOut = 0;
*ppCursor = 0;
if( nInput<0 ){
nInput = strlen(zInput);
}
nChar = nInput+1;
pCsr = (IcuCursor *)sqlite3_malloc(
sizeof(IcuCursor) + /* IcuCursor */
nChar * sizeof(UChar) + /* IcuCursor.aChar[] */
(nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */
);
if( !pCsr ){
return SQLITE_NOMEM;
}
memset(pCsr, 0, sizeof(IcuCursor));
pCsr->aChar = (UChar *)&pCsr[1];
pCsr->aOffset = (int *)&pCsr->aChar[nChar];
pCsr->aOffset[iOut] = iInput;
U8_NEXT(zInput, iInput, nInput, c);
while( c>0 ){
int isError = 0;
c = u_foldCase(c, opt);
U16_APPEND(pCsr->aChar, iOut, nChar, c, isError);
if( isError ){
sqlite3_free(pCsr);
return SQLITE_ERROR;
}
pCsr->aOffset[iOut] = iInput;
if( iInput<nInput ){
U8_NEXT(zInput, iInput, nInput, c);
}else{
c = 0;
}
}
pCsr->pIter = ubrk_open(UBRK_WORD, p->zLocale, pCsr->aChar, iOut, &status);
if( !U_SUCCESS(status) ){
sqlite3_free(pCsr);
return SQLITE_ERROR;
}
pCsr->nChar = iOut;
ubrk_first(pCsr->pIter);
*ppCursor = (sqlite3_tokenizer_cursor *)pCsr;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to icuOpen().
*/
static int icuClose(sqlite3_tokenizer_cursor *pCursor){
IcuCursor *pCsr = (IcuCursor *)pCursor;
ubrk_close(pCsr->pIter);
sqlite3_free(pCsr->zBuffer);
sqlite3_free(pCsr);
return SQLITE_OK;
}
/*
** Extract the next token from a tokenization cursor.
*/
static int icuNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by simpleOpen */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
IcuCursor *pCsr = (IcuCursor *)pCursor;
int iStart = 0;
int iEnd = 0;
int nByte = 0;
while( iStart==iEnd ){
UChar32 c;
iStart = ubrk_current(pCsr->pIter);
iEnd = ubrk_next(pCsr->pIter);
if( iEnd==UBRK_DONE ){
return SQLITE_DONE;
}
while( iStart<iEnd ){
int iWhite = iStart;
U8_NEXT(pCsr->aChar, iWhite, pCsr->nChar, c);
if( u_isspace(c) ){
iStart = iWhite;
}else{
break;
}
}
assert(iStart<=iEnd);
}
do {
UErrorCode status = U_ZERO_ERROR;
if( nByte ){
char *zNew = sqlite3_realloc(pCsr->zBuffer, nByte);
if( !zNew ){
return SQLITE_NOMEM;
}
pCsr->zBuffer = zNew;
pCsr->nBuffer = nByte;
}
u_strToUTF8(
pCsr->zBuffer, pCsr->nBuffer, &nByte, /* Output vars */
&pCsr->aChar[iStart], iEnd-iStart, /* Input vars */
&status /* Output success/failure */
);
} while( nByte>pCsr->nBuffer );
*ppToken = pCsr->zBuffer;
*pnBytes = nByte;
*piStartOffset = pCsr->aOffset[iStart];
*piEndOffset = pCsr->aOffset[iEnd];
*piPosition = pCsr->iToken++;
return SQLITE_OK;
}
/*
** The set of routines that implement the simple tokenizer
*/
static const sqlite3_tokenizer_module icuTokenizerModule = {
0, /* iVersion */
icuCreate, /* xCreate */
icuDestroy, /* xCreate */
icuOpen, /* xOpen */
icuClose, /* xClose */
icuNext, /* xNext */
};
/*
** Set *ppModule to point at the implementation of the ICU tokenizer.
*/
void sqlite3Fts2IcuTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &icuTokenizerModule;
}
#endif /* defined(SQLITE_ENABLE_ICU) */
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) */
-642
View File
@@ -1,642 +0,0 @@
/*
** 2006 September 30
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** Implementation of the full-text-search tokenizer that implements
** a Porter stemmer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS2 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS2 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS2 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts2_tokenizer.h"
/*
** Class derived from sqlite3_tokenizer
*/
typedef struct porter_tokenizer {
sqlite3_tokenizer base; /* Base class */
} porter_tokenizer;
/*
** Class derived from sqlit3_tokenizer_cursor
*/
typedef struct porter_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *zInput; /* input we are tokenizing */
int nInput; /* size of the input */
int iOffset; /* current position in zInput */
int iToken; /* index of next token to be returned */
char *zToken; /* storage for current token */
int nAllocated; /* space allocated to zToken buffer */
} porter_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module porterTokenizerModule;
/*
** Create a new tokenizer instance.
*/
static int porterCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
porter_tokenizer *t;
t = (porter_tokenizer *) sqlite3_malloc(sizeof(*t));
if( t==NULL ) return SQLITE_NOMEM;
memset(t, 0, sizeof(*t));
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int porterDestroy(sqlite3_tokenizer *pTokenizer){
sqlite3_free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is zInput[0..nInput-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int porterOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *zInput, int nInput, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
porter_tokenizer_cursor *c;
c = (porter_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->zInput = zInput;
if( zInput==0 ){
c->nInput = 0;
}else if( nInput<0 ){
c->nInput = (int)strlen(zInput);
}else{
c->nInput = nInput;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->zToken = NULL; /* no space allocated, yet. */
c->nAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** porterOpen() above.
*/
static int porterClose(sqlite3_tokenizer_cursor *pCursor){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
sqlite3_free(c->zToken);
sqlite3_free(c);
return SQLITE_OK;
}
/*
** Vowel or consonant
*/
static const char cType[] = {
0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0,
1, 1, 1, 2, 1
};
/*
** isConsonant() and isVowel() determine if their first character in
** the string they point to is a consonant or a vowel, according
** to Porter ruls.
**
** A consonate is any letter other than 'a', 'e', 'i', 'o', or 'u'.
** 'Y' is a consonant unless it follows another consonant,
** in which case it is a vowel.
**
** In these routine, the letters are in reverse order. So the 'y' rule
** is that 'y' is a consonant unless it is followed by another
** consonent.
*/
static int isVowel(const char*);
static int isConsonant(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return j;
return z[1]==0 || isVowel(z + 1);
}
static int isVowel(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return 1-j;
return isConsonant(z + 1);
}
/*
** Let any sequence of one or more vowels be represented by V and let
** C be sequence of one or more consonants. Then every word can be
** represented as:
**
** [C] (VC){m} [V]
**
** In prose: A word is an optional consonant followed by zero or
** vowel-consonant pairs followed by an optional vowel. "m" is the
** number of vowel consonant pairs. This routine computes the value
** of m for the first i bytes of a word.
**
** Return true if the m-value for z is 1 or more. In other words,
** return true if z contains at least one vowel that is followed
** by a consonant.
**
** In this routine z[] is in reverse order. So we are really looking
** for an instance of of a consonant followed by a vowel.
*/
static int m_gt_0(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/* Like mgt0 above except we are looking for a value of m which is
** exactly 1
*/
static int m_eq_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 1;
while( isConsonant(z) ){ z++; }
return *z==0;
}
/* Like mgt0 above except we are looking for a value of m>1 instead
** or m>0
*/
static int m_gt_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if there is a vowel anywhere within z[0..n-1]
*/
static int hasVowel(const char *z){
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if the word ends in a double consonant.
**
** The text is reversed here. So we are really looking at
** the first two characters of z[].
*/
static int doubleConsonant(const char *z){
return isConsonant(z) && z[0]==z[1] && isConsonant(z+1);
}
/*
** Return TRUE if the word ends with three letters which
** are consonant-vowel-consonent and where the final consonant
** is not 'w', 'x', or 'y'.
**
** The word is reversed here. So we are really checking the
** first three letters and the first one cannot be in [wxy].
*/
static int star_oh(const char *z){
return
z[0]!=0 && isConsonant(z) &&
z[0]!='w' && z[0]!='x' && z[0]!='y' &&
z[1]!=0 && isVowel(z+1) &&
z[2]!=0 && isConsonant(z+2);
}
/*
** If the word ends with zFrom and xCond() is true for the stem
** of the word that preceeds the zFrom ending, then change the
** ending to zTo.
**
** The input word *pz and zFrom are both in reverse order. zTo
** is in normal order.
**
** Return TRUE if zFrom matches. Return FALSE if zFrom does not
** match. Not that TRUE is returned even if xCond() fails and
** no substitution occurs.
*/
static int stem(
char **pz, /* The word being stemmed (Reversed) */
const char *zFrom, /* If the ending matches this... (Reversed) */
const char *zTo, /* ... change the ending to this (not reversed) */
int (*xCond)(const char*) /* Condition that must be true */
){
char *z = *pz;
while( *zFrom && *zFrom==*z ){ z++; zFrom++; }
if( *zFrom!=0 ) return 0;
if( xCond && !xCond(z) ) return 1;
while( *zTo ){
*(--z) = *(zTo++);
}
*pz = z;
return 1;
}
/*
** This is the fallback stemmer used when the porter stemmer is
** inappropriate. The input word is copied into the output with
** US-ASCII case folding. If the input word is too long (more
** than 20 bytes if it contains no digits or more than 6 bytes if
** it contains digits) then word is truncated to 20 or 6 bytes
** by taking 10 or 3 bytes from the beginning and end.
*/
static void copy_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, mx, j;
int hasDigit = 0;
for(i=0; i<nIn; i++){
int c = zIn[i];
if( c>='A' && c<='Z' ){
zOut[i] = c - 'A' + 'a';
}else{
if( c>='0' && c<='9' ) hasDigit = 1;
zOut[i] = c;
}
}
mx = hasDigit ? 3 : 10;
if( nIn>mx*2 ){
for(j=mx, i=nIn-mx; i<nIn; i++, j++){
zOut[j] = zOut[i];
}
i = j;
}
zOut[i] = 0;
*pnOut = i;
}
/*
** Stem the input word zIn[0..nIn-1]. Store the output in zOut.
** zOut is at least big enough to hold nIn bytes. Write the actual
** size of the output word (exclusive of the '\0' terminator) into *pnOut.
**
** Any upper-case characters in the US-ASCII character set ([A-Z])
** are converted to lower case. Upper-case UTF characters are
** unchanged.
**
** Words that are longer than about 20 bytes are stemmed by retaining
** a few bytes from the beginning and the end of the word. If the
** word contains digits, 3 bytes are taken from the beginning and
** 3 bytes from the end. For long words without digits, 10 bytes
** are taken from each end. US-ASCII case folding still applies.
**
** If the input word contains not digits but does characters not
** in [a-zA-Z] then no stemming is attempted and this routine just
** copies the input into the input into the output with US-ASCII
** case folding.
**
** Stemming never increases the length of the word. So there is
** no chance of overflowing the zOut buffer.
*/
static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, j, c;
char zReverse[28];
char *z, *z2;
if( nIn<3 || nIn>=sizeof(zReverse)-7 ){
/* The word is too big or too small for the porter stemmer.
** Fallback to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
for(i=0, j=sizeof(zReverse)-6; i<nIn; i++, j--){
c = zIn[i];
if( c>='A' && c<='Z' ){
zReverse[j] = c + 'a' - 'A';
}else if( c>='a' && c<='z' ){
zReverse[j] = c;
}else{
/* The use of a character not in [a-zA-Z] means that we fallback
** to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
}
memset(&zReverse[sizeof(zReverse)-5], 0, 5);
z = &zReverse[j+1];
/* Step 1a */
if( z[0]=='s' ){
if(
!stem(&z, "sess", "ss", 0) &&
!stem(&z, "sei", "i", 0) &&
!stem(&z, "ss", "ss", 0)
){
z++;
}
}
/* Step 1b */
z2 = z;
if( stem(&z, "dee", "ee", m_gt_0) ){
/* Do nothing. The work was all in the test */
}else if(
(stem(&z, "gni", "", hasVowel) || stem(&z, "de", "", hasVowel))
&& z!=z2
){
if( stem(&z, "ta", "ate", 0) ||
stem(&z, "lb", "ble", 0) ||
stem(&z, "zi", "ize", 0) ){
/* Do nothing. The work was all in the test */
}else if( doubleConsonant(z) && (*z!='l' && *z!='s' && *z!='z') ){
z++;
}else if( m_eq_1(z) && star_oh(z) ){
*(--z) = 'e';
}
}
/* Step 1c */
if( z[0]=='y' && hasVowel(z+1) ){
z[0] = 'i';
}
/* Step 2 */
switch( z[1] ){
case 'a':
stem(&z, "lanoita", "ate", m_gt_0) ||
stem(&z, "lanoit", "tion", m_gt_0);
break;
case 'c':
stem(&z, "icne", "ence", m_gt_0) ||
stem(&z, "icna", "ance", m_gt_0);
break;
case 'e':
stem(&z, "rezi", "ize", m_gt_0);
break;
case 'g':
stem(&z, "igol", "log", m_gt_0);
break;
case 'l':
stem(&z, "ilb", "ble", m_gt_0) ||
stem(&z, "illa", "al", m_gt_0) ||
stem(&z, "iltne", "ent", m_gt_0) ||
stem(&z, "ile", "e", m_gt_0) ||
stem(&z, "ilsuo", "ous", m_gt_0);
break;
case 'o':
stem(&z, "noitazi", "ize", m_gt_0) ||
stem(&z, "noita", "ate", m_gt_0) ||
stem(&z, "rota", "ate", m_gt_0);
break;
case 's':
stem(&z, "msila", "al", m_gt_0) ||
stem(&z, "ssenevi", "ive", m_gt_0) ||
stem(&z, "ssenluf", "ful", m_gt_0) ||
stem(&z, "ssensuo", "ous", m_gt_0);
break;
case 't':
stem(&z, "itila", "al", m_gt_0) ||
stem(&z, "itivi", "ive", m_gt_0) ||
stem(&z, "itilib", "ble", m_gt_0);
break;
}
/* Step 3 */
switch( z[0] ){
case 'e':
stem(&z, "etaci", "ic", m_gt_0) ||
stem(&z, "evita", "", m_gt_0) ||
stem(&z, "ezila", "al", m_gt_0);
break;
case 'i':
stem(&z, "itici", "ic", m_gt_0);
break;
case 'l':
stem(&z, "laci", "ic", m_gt_0) ||
stem(&z, "luf", "", m_gt_0);
break;
case 's':
stem(&z, "ssen", "", m_gt_0);
break;
}
/* Step 4 */
switch( z[1] ){
case 'a':
if( z[0]=='l' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'c':
if( z[0]=='e' && z[2]=='n' && (z[3]=='a' || z[3]=='e') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'e':
if( z[0]=='r' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'i':
if( z[0]=='c' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'l':
if( z[0]=='e' && z[2]=='b' && (z[3]=='a' || z[3]=='i') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'n':
if( z[0]=='t' ){
if( z[2]=='a' ){
if( m_gt_1(z+3) ){
z += 3;
}
}else if( z[2]=='e' ){
stem(&z, "tneme", "", m_gt_1) ||
stem(&z, "tnem", "", m_gt_1) ||
stem(&z, "tne", "", m_gt_1);
}
}
break;
case 'o':
if( z[0]=='u' ){
if( m_gt_1(z+2) ){
z += 2;
}
}else if( z[3]=='s' || z[3]=='t' ){
stem(&z, "noi", "", m_gt_1);
}
break;
case 's':
if( z[0]=='m' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
case 't':
stem(&z, "eta", "", m_gt_1) ||
stem(&z, "iti", "", m_gt_1);
break;
case 'u':
if( z[0]=='s' && z[2]=='o' && m_gt_1(z+3) ){
z += 3;
}
break;
case 'v':
case 'z':
if( z[0]=='e' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
}
/* Step 5a */
if( z[0]=='e' ){
if( m_gt_1(z+1) ){
z++;
}else if( m_eq_1(z+1) && !star_oh(z+1) ){
z++;
}
}
/* Step 5b */
if( m_gt_1(z) && z[0]=='l' && z[1]=='l' ){
z++;
}
/* z[] is now the stemmed word in reverse order. Flip it back
** around into forward order and return.
*/
*pnOut = i = strlen(z);
zOut[i] = 0;
while( *z ){
zOut[--i] = *(z++);
}
}
/*
** Characters that can be part of a token. We assume any character
** whose value is greater than 0x80 (any UTF character) can be
** part of a token. In other words, delimiters all must have
** values of 0x7f or lower.
*/
static const char porterIdChar[] = {
/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */
};
#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !porterIdChar[ch-0x30]))
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to porterOpen().
*/
static int porterNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by porterOpen */
const char **pzToken, /* OUT: *pzToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
const char *z = c->zInput;
while( c->iOffset<c->nInput ){
int iStartOffset, ch;
/* Scan past delimiter characters */
while( c->iOffset<c->nInput && isDelim(z[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nInput && !isDelim(z[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int n = c->iOffset-iStartOffset;
if( n>c->nAllocated ){
c->nAllocated = n+20;
c->zToken = sqlite3_realloc(c->zToken, c->nAllocated);
if( c->zToken==NULL ) return SQLITE_NOMEM;
}
porter_stemmer(&z[iStartOffset], n, c->zToken, pnBytes);
*pzToken = c->zToken;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the porter-stemmer tokenizer
*/
static const sqlite3_tokenizer_module porterTokenizerModule = {
0,
porterCreate,
porterDestroy,
porterOpen,
porterClose,
porterNext,
};
/*
** Allocate a new porter tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts2PorterTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &porterTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) */
-371
View File
@@ -1,371 +0,0 @@
/*
** 2007 June 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This is part of an SQLite module implementing full-text search.
** This particular file implements the generic tokenizer interface.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS2 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS2 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS2 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#include "sqlite3.h"
#include "sqlite3ext.h"
SQLITE_EXTENSION_INIT1
#include "fts2_hash.h"
#include "fts2_tokenizer.h"
#include <assert.h>
/*
** Implementation of the SQL scalar function for accessing the underlying
** hash table. This function may be called as follows:
**
** SELECT <function-name>(<key-name>);
** SELECT <function-name>(<key-name>, <pointer>);
**
** where <function-name> is the name passed as the second argument
** to the sqlite3Fts2InitHashTable() function (e.g. 'fts2_tokenizer').
**
** If the <pointer> argument is specified, it must be a blob value
** containing a pointer to be stored as the hash data corresponding
** to the string <key-name>. If <pointer> is not specified, then
** the string <key-name> must already exist in the has table. Otherwise,
** an error is returned.
**
** Whether or not the <pointer> argument is specified, the value returned
** is a blob containing the pointer stored as the hash data corresponding
** to string <key-name> (after the hash-table is updated, if applicable).
*/
static void scalarFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
fts2Hash *pHash;
void *pPtr = 0;
const unsigned char *zName;
int nName;
assert( argc==1 || argc==2 );
pHash = (fts2Hash *)sqlite3_user_data(context);
zName = sqlite3_value_text(argv[0]);
nName = sqlite3_value_bytes(argv[0])+1;
if( argc==2 ){
void *pOld;
int n = sqlite3_value_bytes(argv[1]);
if( n!=sizeof(pPtr) ){
sqlite3_result_error(context, "argument type mismatch", -1);
return;
}
pPtr = *(void **)sqlite3_value_blob(argv[1]);
pOld = sqlite3Fts2HashInsert(pHash, (void *)zName, nName, pPtr);
if( pOld==pPtr ){
sqlite3_result_error(context, "out of memory", -1);
return;
}
}else{
pPtr = sqlite3Fts2HashFind(pHash, zName, nName);
if( !pPtr ){
char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
sqlite3_result_error(context, zErr, -1);
sqlite3_free(zErr);
return;
}
}
sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
}
#ifdef SQLITE_TEST
#include <tcl.h>
#include <string.h>
/*
** Implementation of a special SQL scalar function for testing tokenizers
** designed to be used in concert with the Tcl testing framework. This
** function must be called with two arguments:
**
** SELECT <function-name>(<key-name>, <input-string>);
** SELECT <function-name>(<key-name>, <pointer>);
**
** where <function-name> is the name passed as the second argument
** to the sqlite3Fts2InitHashTable() function (e.g. 'fts2_tokenizer')
** concatenated with the string '_test' (e.g. 'fts2_tokenizer_test').
**
** The return value is a string that may be interpreted as a Tcl
** list. For each token in the <input-string>, three elements are
** added to the returned list. The first is the token position, the
** second is the token text (folded, stemmed, etc.) and the third is the
** substring of <input-string> associated with the token. For example,
** using the built-in "simple" tokenizer:
**
** SELECT fts_tokenizer_test('simple', 'I don't see how');
**
** will return the string:
**
** "{0 i I 1 dont don't 2 see see 3 how how}"
**
*/
static void testFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
fts2Hash *pHash;
sqlite3_tokenizer_module *p;
sqlite3_tokenizer *pTokenizer = 0;
sqlite3_tokenizer_cursor *pCsr = 0;
const char *zErr = 0;
const char *zName;
int nName;
const char *zInput;
int nInput;
const char *zArg = 0;
const char *zToken;
int nToken;
int iStart;
int iEnd;
int iPos;
Tcl_Obj *pRet;
assert( argc==2 || argc==3 );
nName = sqlite3_value_bytes(argv[0]);
zName = (const char *)sqlite3_value_text(argv[0]);
nInput = sqlite3_value_bytes(argv[argc-1]);
zInput = (const char *)sqlite3_value_text(argv[argc-1]);
if( argc==3 ){
zArg = (const char *)sqlite3_value_text(argv[1]);
}
pHash = (fts2Hash *)sqlite3_user_data(context);
p = (sqlite3_tokenizer_module *)sqlite3Fts2HashFind(pHash, zName, nName+1);
if( !p ){
char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
sqlite3_result_error(context, zErr, -1);
sqlite3_free(zErr);
return;
}
pRet = Tcl_NewObj();
Tcl_IncrRefCount(pRet);
if( SQLITE_OK!=p->xCreate(zArg ? 1 : 0, &zArg, &pTokenizer) ){
zErr = "error in xCreate()";
goto finish;
}
pTokenizer->pModule = p;
if( SQLITE_OK!=p->xOpen(pTokenizer, zInput, nInput, &pCsr) ){
zErr = "error in xOpen()";
goto finish;
}
pCsr->pTokenizer = pTokenizer;
while( SQLITE_OK==p->xNext(pCsr, &zToken, &nToken, &iStart, &iEnd, &iPos) ){
Tcl_ListObjAppendElement(0, pRet, Tcl_NewIntObj(iPos));
Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
zToken = &zInput[iStart];
nToken = iEnd-iStart;
Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
}
if( SQLITE_OK!=p->xClose(pCsr) ){
zErr = "error in xClose()";
goto finish;
}
if( SQLITE_OK!=p->xDestroy(pTokenizer) ){
zErr = "error in xDestroy()";
goto finish;
}
finish:
if( zErr ){
sqlite3_result_error(context, zErr, -1);
}else{
sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
}
Tcl_DecrRefCount(pRet);
}
static
int registerTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module *p
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts2_tokenizer(?, ?)";
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
sqlite3_bind_blob(pStmt, 2, &p, sizeof(p), SQLITE_STATIC);
sqlite3_step(pStmt);
return sqlite3_finalize(pStmt);
}
static
int queryFts2Tokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module **pp
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts2_tokenizer(?)";
*pp = 0;
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
if( SQLITE_ROW==sqlite3_step(pStmt) ){
if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
}
}
return sqlite3_finalize(pStmt);
}
void sqlite3Fts2SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
/*
** Implementation of the scalar function fts2_tokenizer_internal_test().
** This function is used for testing only, it is not included in the
** build unless SQLITE_TEST is defined.
**
** The purpose of this is to test that the fts2_tokenizer() function
** can be used as designed by the C-code in the queryFts2Tokenizer and
** registerTokenizer() functions above. These two functions are repeated
** in the README.tokenizer file as an example, so it is important to
** test them.
**
** To run the tests, evaluate the fts2_tokenizer_internal_test() scalar
** function with no arguments. An assert() will fail if a problem is
** detected. i.e.:
**
** SELECT fts2_tokenizer_internal_test();
**
*/
static void intTestFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
int rc;
const sqlite3_tokenizer_module *p1;
const sqlite3_tokenizer_module *p2;
sqlite3 *db = (sqlite3 *)sqlite3_user_data(context);
/* Test the query function */
sqlite3Fts2SimpleTokenizerModule(&p1);
rc = queryFts2Tokenizer(db, "simple", &p2);
assert( rc==SQLITE_OK );
assert( p1==p2 );
rc = queryFts2Tokenizer(db, "nosuchtokenizer", &p2);
assert( rc==SQLITE_ERROR );
assert( p2==0 );
assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
/* Test the storage function */
rc = registerTokenizer(db, "nosuchtokenizer", p1);
assert( rc==SQLITE_OK );
rc = queryFts2Tokenizer(db, "nosuchtokenizer", &p2);
assert( rc==SQLITE_OK );
assert( p2==p1 );
sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
}
#endif
/*
** Set up SQL objects in database db used to access the contents of
** the hash table pointed to by argument pHash. The hash table must
** been initialised to use string keys, and to take a private copy
** of the key when a value is inserted. i.e. by a call similar to:
**
** sqlite3Fts2HashInit(pHash, FTS2_HASH_STRING, 1);
**
** This function adds a scalar function (see header comment above
** scalarFunc() in this file for details) and, if ENABLE_TABLE is
** defined at compilation time, a temporary virtual table (see header
** comment above struct HashTableVtab) to the database schema. Both
** provide read/write access to the contents of *pHash.
**
** The third argument to this function, zName, is used as the name
** of both the scalar and, if created, the virtual table.
*/
int sqlite3Fts2InitHashTable(
sqlite3 *db,
fts2Hash *pHash,
const char *zName
){
int rc = SQLITE_OK;
void *p = (void *)pHash;
const int any = SQLITE_ANY;
char *zTest = 0;
char *zTest2 = 0;
#ifdef SQLITE_TEST
void *pdb = (void *)db;
zTest = sqlite3_mprintf("%s_test", zName);
zTest2 = sqlite3_mprintf("%s_internal_test", zName);
if( !zTest || !zTest2 ){
rc = SQLITE_NOMEM;
}
#endif
if( rc!=SQLITE_OK
|| (rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0))
#ifdef SQLITE_TEST
|| (rc = sqlite3_create_function(db, zTest, 2, any, p, testFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zTest, 3, any, p, testFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zTest2, 0, any, pdb, intTestFunc, 0, 0))
#endif
);
sqlite3_free(zTest);
sqlite3_free(zTest2);
return rc;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) */
-145
View File
@@ -1,145 +0,0 @@
/*
** 2006 July 10
**
** The author disclaims copyright to this source code.
**
*************************************************************************
** Defines the interface to tokenizers used by fulltext-search. There
** are three basic components:
**
** sqlite3_tokenizer_module is a singleton defining the tokenizer
** interface functions. This is essentially the class structure for
** tokenizers.
**
** sqlite3_tokenizer is used to define a particular tokenizer, perhaps
** including customization information defined at creation time.
**
** sqlite3_tokenizer_cursor is generated by a tokenizer to generate
** tokens from a particular input.
*/
#ifndef _FTS2_TOKENIZER_H_
#define _FTS2_TOKENIZER_H_
/* TODO(shess) Only used for SQLITE_OK and SQLITE_DONE at this time.
** If tokenizers are to be allowed to call sqlite3_*() functions, then
** we will need a way to register the API consistently.
*/
#include "sqlite3.h"
/*
** Structures used by the tokenizer interface. When a new tokenizer
** implementation is registered, the caller provides a pointer to
** an sqlite3_tokenizer_module containing pointers to the callback
** functions that make up an implementation.
**
** When an fts2 table is created, it passes any arguments passed to
** the tokenizer clause of the CREATE VIRTUAL TABLE statement to the
** sqlite3_tokenizer_module.xCreate() function of the requested tokenizer
** implementation. The xCreate() function in turn returns an
** sqlite3_tokenizer structure representing the specific tokenizer to
** be used for the fts2 table (customized by the tokenizer clause arguments).
**
** To tokenize an input buffer, the sqlite3_tokenizer_module.xOpen()
** method is called. It returns an sqlite3_tokenizer_cursor object
** that may be used to tokenize a specific input buffer based on
** the tokenization rules supplied by a specific sqlite3_tokenizer
** object.
*/
typedef struct sqlite3_tokenizer_module sqlite3_tokenizer_module;
typedef struct sqlite3_tokenizer sqlite3_tokenizer;
typedef struct sqlite3_tokenizer_cursor sqlite3_tokenizer_cursor;
struct sqlite3_tokenizer_module {
/*
** Structure version. Should always be set to 0.
*/
int iVersion;
/*
** Create a new tokenizer. The values in the argv[] array are the
** arguments passed to the "tokenizer" clause of the CREATE VIRTUAL
** TABLE statement that created the fts2 table. For example, if
** the following SQL is executed:
**
** CREATE .. USING fts2( ... , tokenizer <tokenizer-name> arg1 arg2)
**
** then argc is set to 2, and the argv[] array contains pointers
** to the strings "arg1" and "arg2".
**
** This method should return either SQLITE_OK (0), or an SQLite error
** code. If SQLITE_OK is returned, then *ppTokenizer should be set
** to point at the newly created tokenizer structure. The generic
** sqlite3_tokenizer.pModule variable should not be initialised by
** this callback. The caller will do so.
*/
int (*xCreate)(
int argc, /* Size of argv array */
const char *const*argv, /* Tokenizer argument strings */
sqlite3_tokenizer **ppTokenizer /* OUT: Created tokenizer */
);
/*
** Destroy an existing tokenizer. The fts2 module calls this method
** exactly once for each successful call to xCreate().
*/
int (*xDestroy)(sqlite3_tokenizer *pTokenizer);
/*
** Create a tokenizer cursor to tokenize an input buffer. The caller
** is responsible for ensuring that the input buffer remains valid
** until the cursor is closed (using the xClose() method).
*/
int (*xOpen)(
sqlite3_tokenizer *pTokenizer, /* Tokenizer object */
const char *pInput, int nBytes, /* Input buffer */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Created tokenizer cursor */
);
/*
** Destroy an existing tokenizer cursor. The fts2 module calls this
** method exactly once for each successful call to xOpen().
*/
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
/*
** Retrieve the next token from the tokenizer cursor pCursor. This
** method should either return SQLITE_OK and set the values of the
** "OUT" variables identified below, or SQLITE_DONE to indicate that
** the end of the buffer has been reached, or an SQLite error code.
**
** *ppToken should be set to point at a buffer containing the
** normalized version of the token (i.e. after any case-folding and/or
** stemming has been performed). *pnBytes should be set to the length
** of this buffer in bytes. The input text that generated the token is
** identified by the byte offsets returned in *piStartOffset and
** *piEndOffset.
**
** The buffer *ppToken is set to point at is managed by the tokenizer
** implementation. It is only required to be valid until the next call
** to xNext() or xClose().
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
** should be converted to zInput.
*/
int (*xNext)(
sqlite3_tokenizer_cursor *pCursor, /* Tokenizer cursor */
const char **ppToken, int *pnBytes, /* OUT: Normalized text for token */
int *piStartOffset, /* OUT: Byte offset of token in input buffer */
int *piEndOffset, /* OUT: Byte offset of end of token in input buffer */
int *piPosition /* OUT: Number of tokens returned before this one */
);
};
struct sqlite3_tokenizer {
const sqlite3_tokenizer_module *pModule; /* The module for this tokenizer */
/* Tokenizer implementations will typically add additional fields */
};
struct sqlite3_tokenizer_cursor {
sqlite3_tokenizer *pTokenizer; /* Tokenizer for this cursor. */
/* Tokenizer implementations will typically add additional fields */
};
#endif /* _FTS2_TOKENIZER_H_ */
-230
View File
@@ -1,230 +0,0 @@
/*
** 2006 Oct 10
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** Implementation of the "simple" full-text-search tokenizer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS2 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS2 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS2 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts2_tokenizer.h"
typedef struct simple_tokenizer {
sqlite3_tokenizer base;
char delim[128]; /* flag ASCII delimiters */
} simple_tokenizer;
typedef struct simple_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *pInput; /* input we are tokenizing */
int nBytes; /* size of the input */
int iOffset; /* current position in pInput */
int iToken; /* index of next token to be returned */
char *pToken; /* storage for current token */
int nTokenAllocated; /* space allocated to zToken buffer */
} simple_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module simpleTokenizerModule;
static int simpleDelim(simple_tokenizer *t, unsigned char c){
return c<0x80 && t->delim[c];
}
/*
** Create a new tokenizer instance.
*/
static int simpleCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
simple_tokenizer *t;
t = (simple_tokenizer *) sqlite3_malloc(sizeof(*t));
if( t==NULL ) return SQLITE_NOMEM;
memset(t, 0, sizeof(*t));
/* TODO(shess) Delimiters need to remain the same from run to run,
** else we need to reindex. One solution would be a meta-table to
** track such information in the database, then we'd only want this
** information on the initial create.
*/
if( argc>1 ){
int i, n = strlen(argv[1]);
for(i=0; i<n; i++){
unsigned char ch = argv[1][i];
/* We explicitly don't support UTF-8 delimiters for now. */
if( ch>=0x80 ){
sqlite3_free(t);
return SQLITE_ERROR;
}
t->delim[ch] = 1;
}
} else {
/* Mark non-alphanumeric ASCII characters as delimiters */
int i;
for(i=1; i<0x80; i++){
t->delim[i] = !isalnum(i);
}
}
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int simpleDestroy(sqlite3_tokenizer *pTokenizer){
sqlite3_free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is pInput[0..nBytes-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int simpleOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *pInput, int nBytes, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
simple_tokenizer_cursor *c;
c = (simple_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->pInput = pInput;
if( pInput==0 ){
c->nBytes = 0;
}else if( nBytes<0 ){
c->nBytes = (int)strlen(pInput);
}else{
c->nBytes = nBytes;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->pToken = NULL; /* no space allocated, yet. */
c->nTokenAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** simpleOpen() above.
*/
static int simpleClose(sqlite3_tokenizer_cursor *pCursor){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
sqlite3_free(c->pToken);
sqlite3_free(c);
return SQLITE_OK;
}
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to simpleOpen().
*/
static int simpleNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by simpleOpen */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
simple_tokenizer *t = (simple_tokenizer *) pCursor->pTokenizer;
unsigned char *p = (unsigned char *)c->pInput;
while( c->iOffset<c->nBytes ){
int iStartOffset;
/* Scan past delimiter characters */
while( c->iOffset<c->nBytes && simpleDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nBytes && !simpleDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int i, n = c->iOffset-iStartOffset;
if( n>c->nTokenAllocated ){
c->nTokenAllocated = n+20;
c->pToken = sqlite3_realloc(c->pToken, c->nTokenAllocated);
if( c->pToken==NULL ) return SQLITE_NOMEM;
}
for(i=0; i<n; i++){
/* TODO(shess) This needs expansion to handle UTF-8
** case-insensitivity.
*/
unsigned char ch = p[iStartOffset+i];
c->pToken[i] = ch<0x80 ? tolower(ch) : ch;
}
*ppToken = c->pToken;
*pnBytes = n;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the simple tokenizer
*/
static const sqlite3_tokenizer_module simpleTokenizerModule = {
0,
simpleCreate,
simpleDestroy,
simpleOpen,
simpleClose,
simpleNext,
};
/*
** Allocate a new simple tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts2SimpleTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &simpleTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) */
-116
View File
@@ -1,116 +0,0 @@
#!/usr/bin/tclsh
#
# This script builds a single C code file holding all of FTS2 code.
# The name of the output file is fts2amal.c. To build this file,
# first do:
#
# make target_source
#
# The make target above moves all of the source code files into
# a subdirectory named "tsrc". (This script expects to find the files
# there and will not work if they are not found.)
#
# After the "tsrc" directory has been created and populated, run
# this script:
#
# tclsh mkfts2amal.tcl
#
# The amalgamated FTS2 code will be written into fts2amal.c
#
# Open the output file and write a header comment at the beginning
# of the file.
#
set out [open fts2amal.c w]
set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1]
puts $out [subst \
{/******************************************************************************
** This file is an amalgamation of separate C source files from the SQLite
** Full Text Search extension 2 (fts2). By combining all the individual C
** code files into this single large file, the entire code can be compiled
** as a one translation unit. This allows many compilers to do optimizations
** that would not be possible if the files were compiled separately. It also
** makes the code easier to import into other projects.
**
** This amalgamation was generated on $today.
*/}]
# These are the header files used by FTS2. The first time any of these
# files are seen in a #include statement in the C code, include the complete
# text of the file in-line. The file only needs to be included once.
#
foreach hdr {
fts2.h
fts2_hash.h
fts2_tokenizer.h
sqlite3.h
sqlite3ext.h
} {
set available_hdr($hdr) 1
}
# 78 stars used for comment formatting.
set s78 \
{*****************************************************************************}
# Insert a comment into the code
#
proc section_comment {text} {
global out s78
set n [string length $text]
set nstar [expr {60 - $n}]
set stars [string range $s78 0 $nstar]
puts $out "/************** $text $stars/"
}
# Read the source file named $filename and write it into the
# sqlite3.c output file. If any #include statements are seen,
# process them approprately.
#
proc copy_file {filename} {
global seen_hdr available_hdr out
set tail [file tail $filename]
section_comment "Begin file $tail"
set in [open $filename r]
while {![eof $in]} {
set line [gets $in]
if {[regexp {^#\s*include\s+["<]([^">]+)[">]} $line all hdr]} {
if {[info exists available_hdr($hdr)]} {
if {$available_hdr($hdr)} {
section_comment "Include $hdr in the middle of $tail"
copy_file tsrc/$hdr
section_comment "Continuing where we left off in $tail"
}
} elseif {![info exists seen_hdr($hdr)]} {
set seen_hdr($hdr) 1
puts $out $line
}
} elseif {[regexp {^#ifdef __cplusplus} $line]} {
puts $out "#if 0"
} elseif {[regexp {^#line} $line]} {
# Skip #line directives.
} else {
puts $out $line
}
}
close $in
section_comment "End of $tail"
}
# Process the source files. Process files containing commonly
# used subroutines first in order to help the compiler find
# inlining opportunities.
#
foreach file {
fts2.c
fts2_hash.c
fts2_porter.c
fts2_tokenizer.c
fts2_tokenizer1.c
fts2_icu.c
} {
copy_file tsrc/$file
}
close $out
-209
View File
@@ -1,209 +0,0 @@
1. OVERVIEW
This README file describes the syntax of the arguments that may be passed to
the FTS3 MATCH operator used for full-text queries. For example, if table
"t1" is an Fts3 virtual table, the following SQL query:
SELECT * FROM t1 WHERE <col> MATCH <full-text query>
may be used to retrieve all rows that match a specified for full-text query.
The text "<col>" should be replaced by either the name of the fts3 table
(in this case "t1"), or by the name of one of the columns of the fts3
table. <full-text-query> should be replaced by an SQL expression that
computes to a string containing an Fts3 query.
If the left-hand-side of the MATCH operator is set to the name of the
fts3 table, then by default the query may be matched against any column
of the table. If it is set to a column name, then by default the query
may only match the specified column. In both cases this may be overriden
as part of the query text (see sections 2 and 3 below).
As of SQLite version 3.6.8, Fts3 supports two slightly different query
formats; the standard syntax, which is used by default, and the enhanced
query syntax which can be selected by compiling with the pre-processor
symbol SQLITE_ENABLE_FTS3_PARENTHESIS defined.
-DSQLITE_ENABLE_FTS3_PARENTHESIS
2. STANDARD QUERY SYNTAX
When using the standard Fts3 query syntax, a query usually consists of a
list of terms (words) separated by white-space characters. To match a
query, a row (or column) of an Fts3 table must contain each of the specified
terms. For example, the following query:
<col> MATCH 'hello world'
matches rows (or columns, if <col> is the name of a column name) that
contain at least one instance of the token "hello", and at least one
instance of the token "world". Tokens may be grouped into phrases using
quotation marks. In this case, a matching row or column must contain each
of the tokens in the phrase in the order specified, with no intervening
tokens. For example, the query:
<col> MATCH '"hello world" joe"
matches the first of the following two documents, but not the second or
third:
"'Hello world', said Joe."
"One should always greet the world with a cheery hello, thought Joe."
"How many hello world programs could their be?"
As well as grouping tokens together by phrase, the binary NEAR operator
may be used to search for rows that contain two or more specified tokens
or phrases within a specified proximity of each other. The NEAR operator
must always be specified in upper case. The word "near" in lower or mixed
case is treated as an ordinary token. For example, the following query:
<col> MATCH 'engineering NEAR consultancy'
matches rows that contain both the "engineering" and "consultancy" tokens
in the same column with not more than 10 other words between them. It does
not matter which of the two terms occurs first in the document, only that
they be seperated by only 10 tokens or less. The user may also specify
a different required proximity by adding "/N" immediately after the NEAR
operator, where N is an integer. For example:
<col> MATCH 'engineering NEAR/5 consultancy'
searches for a row containing an instance of each specified token seperated
by not more than 5 other tokens. More than one NEAR operator can be used
in as sequence. For example this query:
<col> MATCH 'reliable NEAR/2 engineering NEAR/5 consultancy'
searches for a row that contains an instance of the token "reliable"
seperated by not more than two tokens from an instance of "engineering",
which is in turn separated by not more than 5 other tokens from an
instance of the term "consultancy". Phrases enclosed in quotes may
also be used as arguments to the NEAR operator.
Similar to the NEAR operator, one or more tokens or phrases may be
separated by OR operators. In this case, only one of the specified tokens
or phrases must appear in the document. For example, the query:
<col> MATCH 'hello OR world'
matches rows that contain either the term "hello", or the term "world",
or both. Note that unlike in many programming languages, the OR operator
has a higher precedence than the AND operators implied between white-space
separated tokens. The following query matches documents that contain the
term 'sqlite' and at least one of the terms 'fantastic' or 'impressive',
not those that contain both 'sqlite' and 'fantastic' or 'impressive':
<col> MATCH 'sqlite fantastic OR impressive'
Any token that is part of an Fts3 query expression, whether or not it is
part of a phrase enclosed in quotes, may have a '*' character appended to
it. In this case, the token matches all terms that begin with the characters
of the token, not just those that exactly match it. For example, the
following query:
<col> MATCH 'sql*'
matches all rows that contain the term "SQLite", as well as those that
contain "SQL".
A token that is not part of a quoted phrase may be preceded by a '-'
character, which indicates that matching rows must not contain the
specified term. For example, the following:
<col> MATCH '"database engine" -sqlite'
matches rows that contain the phrase "database engine" but do not contain
the term "sqlite". If the '-' character occurs inside a quoted phrase,
it is ignored. It is possible to use both the '-' prefix and the '*' postfix
on a single term. At this time, all Fts3 queries must contain at least
one term or phrase that is not preceded by the '-' prefix.
Regardless of whether or not a table name or column name is used on the
left hand side of the MATCH operator, a specific column of the fts3 table
may be associated with each token in a query by preceding a token with
a column name followed by a ':' character. For example, regardless of what
is specified for <col>, the following query requires that column "col1"
of the table contains the term "hello", and that column "col2" of the
table contains the term "world". If the table does not contain columns
named "col1" and "col2", then an error is returned and the query is
not run.
<col> MATCH 'col1:hello col2:world'
It is not possible to associate a specific table column with a quoted
phrase or a term preceded by a '-' operator. A '*' character may be
appended to a term associated with a specific column for prefix matching.
3. ENHANCED QUERY SYNTAX
The enhanced query syntax is quite similar to the standard query syntax,
with the following four differences:
1) Parenthesis are supported. When using the enhanced query syntax,
parenthesis may be used to overcome the built-in precedence of the
supplied binary operators. For example, the following query:
<col> MATCH '(hello world) OR (simple example)'
matches documents that contain both "hello" and "world", and documents
that contain both "simple" and "example". It is not possible to forumlate
such a query using the standard syntax.
2) Instead of separating tokens and phrases by whitespace, an AND operator
may be explicitly specified. This does not change query processing at
all, but may be used to improve readability. For example, the following
query is handled identically to the one above:
<col> MATCH '(hello AND world) OR (simple AND example)'
As with the OR and NEAR operators, the AND operator must be specified
in upper case. The word "and" specified in lower or mixed case is
handled as a regular token.
3) The '-' token prefix is not supported. Instead, a new binary operator,
NOT, is included. The NOT operator requires that the query specified
as its left-hand operator matches, but that the query specified as the
right-hand operator does not. For example, to query for all rows that
contain the term "example" but not the term "simple", the following
query could be used:
<col> MATCH 'example NOT simple'
As for all other operators, the NOT operator must be specified in
upper case. Otherwise it will be treated as a regular token.
4) Unlike in the standard syntax, where the OR operator has a higher
precedence than the implicit AND operator, when using the enhanced
syntax implicit and explict AND operators have a higher precedence
than OR operators. Using the enhanced syntax, the following two
queries are equivalent:
<col> MATCH 'sqlite fantastic OR impressive'
<col> MATCH '(sqlite AND fantastic) OR impressive'
however, when using the standard syntax, the query:
<col> MATCH 'sqlite fantastic OR impressive'
is equivalent to the enhanced syntax query:
<col> MATCH 'sqlite AND (fantastic OR impressive)'
The precedence of all enhanced syntax operators, in order from highest
to lowest, is:
NEAR (highest precedence, tightest grouping)
NOT
AND
OR (lowest precedence, loosest grouping)
Using the advanced syntax, it is possible to specify expressions enclosed
in parenthesis as operands to the NOT, AND and OR operators. However both
the left and right hand side operands of NEAR operators must be either
tokens or phrases. Attempting the following query will return an error:
<col> MATCH 'sqlite NEAR (fantastic OR impressive)'
Queries of this form must be re-written as:
<col> MATCH 'sqlite NEAR fantastic OR sqlite NEAR impressive'
-133
View File
@@ -1,133 +0,0 @@
1. FTS3 Tokenizers
When creating a new full-text table, FTS3 allows the user to select
the text tokenizer implementation to be used when indexing text
by specifying a "tokenize" clause as part of the CREATE VIRTUAL TABLE
statement:
CREATE VIRTUAL TABLE <table-name> USING fts3(
<columns ...> [, tokenize <tokenizer-name> [<tokenizer-args>]]
);
The built-in tokenizers (valid values to pass as <tokenizer name>) are
"simple" and "porter".
<tokenizer-args> should consist of zero or more white-space separated
arguments to pass to the selected tokenizer implementation. The
interpretation of the arguments, if any, depends on the individual
tokenizer.
2. Custom Tokenizers
FTS3 allows users to provide custom tokenizer implementations. The
interface used to create a new tokenizer is defined and described in
the fts3_tokenizer.h source file.
Registering a new FTS3 tokenizer is similar to registering a new
virtual table module with SQLite. The user passes a pointer to a
structure containing pointers to various callback functions that
make up the implementation of the new tokenizer type. For tokenizers,
the structure (defined in fts3_tokenizer.h) is called
"sqlite3_tokenizer_module".
FTS3 does not expose a C-function that users call to register new
tokenizer types with a database handle. Instead, the pointer must
be encoded as an SQL blob value and passed to FTS3 through the SQL
engine by evaluating a special scalar function, "fts3_tokenizer()".
The fts3_tokenizer() function may be called with one or two arguments,
as follows:
SELECT fts3_tokenizer(<tokenizer-name>);
SELECT fts3_tokenizer(<tokenizer-name>, <sqlite3_tokenizer_module ptr>);
Where <tokenizer-name> is a string identifying the tokenizer and
<sqlite3_tokenizer_module ptr> is a pointer to an sqlite3_tokenizer_module
structure encoded as an SQL blob. If the second argument is present,
it is registered as tokenizer <tokenizer-name> and a copy of it
returned. If only one argument is passed, a pointer to the tokenizer
implementation currently registered as <tokenizer-name> is returned,
encoded as a blob. Or, if no such tokenizer exists, an SQL exception
(error) is raised.
SECURITY: If the fts3 extension is used in an environment where potentially
malicious users may execute arbitrary SQL (i.e. gears), they should be
prevented from invoking the fts3_tokenizer() function, possibly using the
authorisation callback.
See "Sample code" below for an example of calling the fts3_tokenizer()
function from C code.
3. ICU Library Tokenizers
If this extension is compiled with the SQLITE_ENABLE_ICU pre-processor
symbol defined, then there exists a built-in tokenizer named "icu"
implemented using the ICU library. The first argument passed to the
xCreate() method (see fts3_tokenizer.h) of this tokenizer may be
an ICU locale identifier. For example "tr_TR" for Turkish as used
in Turkey, or "en_AU" for English as used in Australia. For example:
"CREATE VIRTUAL TABLE thai_text USING fts3(text, tokenizer icu th_TH)"
The ICU tokenizer implementation is very simple. It splits the input
text according to the ICU rules for finding word boundaries and discards
any tokens that consist entirely of white-space. This may be suitable
for some applications in some locales, but not all. If more complex
processing is required, for example to implement stemming or
discard punctuation, this can be done by creating a tokenizer
implementation that uses the ICU tokenizer as part of its implementation.
When using the ICU tokenizer this way, it is safe to overwrite the
contents of the strings returned by the xNext() method (see
fts3_tokenizer.h).
4. Sample code.
The following two code samples illustrate the way C code should invoke
the fts3_tokenizer() scalar function:
int registerTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module *p
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts3_tokenizer(?, ?)";
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
sqlite3_bind_blob(pStmt, 2, &p, sizeof(p), SQLITE_STATIC);
sqlite3_step(pStmt);
return sqlite3_finalize(pStmt);
}
int queryTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module **pp
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts3_tokenizer(?)";
*pp = 0;
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
if( SQLITE_ROW==sqlite3_step(pStmt) ){
if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
}
}
return sqlite3_finalize(pStmt);
}
-4
View File
@@ -1,4 +0,0 @@
This folder contains source code to the second full-text search
extension for SQLite. While the API is the same, this version uses a
substantially different storage schema from fts1, so tables will need
to be rebuilt.
-7024
View File
File diff suppressed because it is too large Load Diff
-26
View File
@@ -1,26 +0,0 @@
/*
** 2006 Oct 10
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This header file is used by programs that want to link against the
** FTS3 library. All it does is declare the sqlite3Fts3Init() interface.
*/
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3Fts3Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-900
View File
@@ -1,900 +0,0 @@
/*
** 2008 Nov 28
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This module contains code that implements a parser for fts3 query strings
** (the right-hand argument to the MATCH operator). Because the supported
** syntax is relatively simple, the whole tokenizer/parser system is
** hand-coded. The public interface to this module is declared in source
** code file "fts3_expr.h".
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/*
** By default, this module parses the legacy syntax that has been
** traditionally used by fts3. Or, if SQLITE_ENABLE_FTS3_PARENTHESIS
** is defined, then it uses the new syntax. The differences between
** the new and the old syntaxes are:
**
** a) The new syntax supports parenthesis. The old does not.
**
** b) The new syntax supports the AND and NOT operators. The old does not.
**
** c) The old syntax supports the "-" token qualifier. This is not
** supported by the new syntax (it is replaced by the NOT operator).
**
** d) When using the old syntax, the OR operator has a greater precedence
** than an implicit AND. When using the new, both implicity and explicit
** AND operators have a higher precedence than OR.
**
** If compiled with SQLITE_TEST defined, then this module exports the
** symbol "int sqlite3_fts3_enable_parentheses". Setting this variable
** to zero causes the module to use the old syntax. If it is set to
** non-zero the new syntax is activated. This is so both syntaxes can
** be tested using a single build of testfixture.
*/
#ifdef SQLITE_TEST
int sqlite3_fts3_enable_parentheses = 0;
#else
# ifdef SQLITE_ENABLE_FTS3_PARENTHESIS
# define sqlite3_fts3_enable_parentheses 1
# else
# define sqlite3_fts3_enable_parentheses 0
# endif
#endif
/*
** Default span for NEAR operators.
*/
#define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10
#include "fts3_expr.h"
#include "sqlite3.h"
#include <ctype.h>
#include <string.h>
#include <assert.h>
typedef struct ParseContext ParseContext;
struct ParseContext {
sqlite3_tokenizer *pTokenizer; /* Tokenizer module */
const char **azCol; /* Array of column names for fts3 table */
int nCol; /* Number of entries in azCol[] */
int iDefaultCol; /* Default column to query */
sqlite3_context *pCtx; /* Write error message here */
int nNest; /* Number of nested brackets */
};
/*
** This function is equivalent to the standard isspace() function.
**
** The standard isspace() can be awkward to use safely, because although it
** is defined to accept an argument of type int, its behaviour when passed
** an integer that falls outside of the range of the unsigned char type
** is undefined (and sometimes, "undefined" means segfault). This wrapper
** is defined to accept an argument of type char, and always returns 0 for
** any values that fall outside of the range of the unsigned char type (i.e.
** negative values).
*/
static int fts3isspace(char c){
return (c&0x80)==0 ? isspace(c) : 0;
}
/*
** Extract the next token from buffer z (length n) using the tokenizer
** and other information (column names etc.) in pParse. Create an Fts3Expr
** structure of type FTSQUERY_PHRASE containing a phrase consisting of this
** single token and set *ppExpr to point to it. If the end of the buffer is
** reached before a token is found, set *ppExpr to zero. It is the
** responsibility of the caller to eventually deallocate the allocated
** Fts3Expr structure (if any) by passing it to sqlite3_free().
**
** Return SQLITE_OK if successful, or SQLITE_NOMEM if a memory allocation
** fails.
*/
static int getNextToken(
ParseContext *pParse, /* fts3 query parse context */
int iCol, /* Value for Fts3Phrase.iColumn */
const char *z, int n, /* Input string */
Fts3Expr **ppExpr, /* OUT: expression */
int *pnConsumed /* OUT: Number of bytes consumed */
){
sqlite3_tokenizer *pTokenizer = pParse->pTokenizer;
sqlite3_tokenizer_module const *pModule = pTokenizer->pModule;
int rc;
sqlite3_tokenizer_cursor *pCursor;
Fts3Expr *pRet = 0;
int nConsumed = 0;
rc = pModule->xOpen(pTokenizer, z, n, &pCursor);
if( rc==SQLITE_OK ){
const char *zToken;
int nToken, iStart, iEnd, iPosition;
int nByte; /* total space to allocate */
pCursor->pTokenizer = pTokenizer;
rc = pModule->xNext(pCursor, &zToken, &nToken, &iStart, &iEnd, &iPosition);
if( rc==SQLITE_OK ){
nByte = sizeof(Fts3Expr) + sizeof(Fts3Phrase) + nToken;
pRet = (Fts3Expr *)sqlite3_malloc(nByte);
if( !pRet ){
rc = SQLITE_NOMEM;
}else{
memset(pRet, 0, nByte);
pRet->eType = FTSQUERY_PHRASE;
pRet->pPhrase = (Fts3Phrase *)&pRet[1];
pRet->pPhrase->nToken = 1;
pRet->pPhrase->iColumn = iCol;
pRet->pPhrase->aToken[0].n = nToken;
pRet->pPhrase->aToken[0].z = (char *)&pRet->pPhrase[1];
memcpy(pRet->pPhrase->aToken[0].z, zToken, nToken);
if( iEnd<n && z[iEnd]=='*' ){
pRet->pPhrase->aToken[0].isPrefix = 1;
iEnd++;
}
if( !sqlite3_fts3_enable_parentheses && iStart>0 && z[iStart-1]=='-' ){
pRet->pPhrase->isNot = 1;
}
}
nConsumed = iEnd;
}
pModule->xClose(pCursor);
}
*pnConsumed = nConsumed;
*ppExpr = pRet;
return rc;
}
/*
** Enlarge a memory allocation. If an out-of-memory allocation occurs,
** then free the old allocation.
*/
void *fts3ReallocOrFree(void *pOrig, int nNew){
void *pRet = sqlite3_realloc(pOrig, nNew);
if( !pRet ){
sqlite3_free(pOrig);
}
return pRet;
}
/*
** Buffer zInput, length nInput, contains the contents of a quoted string
** that appeared as part of an fts3 query expression. Neither quote character
** is included in the buffer. This function attempts to tokenize the entire
** input buffer and create an Fts3Expr structure of type FTSQUERY_PHRASE
** containing the results.
**
** If successful, SQLITE_OK is returned and *ppExpr set to point at the
** allocated Fts3Expr structure. Otherwise, either SQLITE_NOMEM (out of memory
** error) or SQLITE_ERROR (tokenization error) is returned and *ppExpr set
** to 0.
*/
static int getNextString(
ParseContext *pParse, /* fts3 query parse context */
const char *zInput, int nInput, /* Input string */
Fts3Expr **ppExpr /* OUT: expression */
){
sqlite3_tokenizer *pTokenizer = pParse->pTokenizer;
sqlite3_tokenizer_module const *pModule = pTokenizer->pModule;
int rc;
Fts3Expr *p = 0;
sqlite3_tokenizer_cursor *pCursor = 0;
char *zTemp = 0;
int nTemp = 0;
rc = pModule->xOpen(pTokenizer, zInput, nInput, &pCursor);
if( rc==SQLITE_OK ){
int ii;
pCursor->pTokenizer = pTokenizer;
for(ii=0; rc==SQLITE_OK; ii++){
const char *zToken;
int nToken, iBegin, iEnd, iPos;
rc = pModule->xNext(pCursor, &zToken, &nToken, &iBegin, &iEnd, &iPos);
if( rc==SQLITE_OK ){
int nByte = sizeof(Fts3Expr) + sizeof(Fts3Phrase);
p = fts3ReallocOrFree(p, nByte+ii*sizeof(struct PhraseToken));
zTemp = fts3ReallocOrFree(zTemp, nTemp + nToken);
if( !p || !zTemp ){
goto no_mem;
}
if( ii==0 ){
memset(p, 0, nByte);
p->pPhrase = (Fts3Phrase *)&p[1];
}
p->pPhrase = (Fts3Phrase *)&p[1];
p->pPhrase->nToken = ii+1;
p->pPhrase->aToken[ii].n = nToken;
memcpy(&zTemp[nTemp], zToken, nToken);
nTemp += nToken;
if( iEnd<nInput && zInput[iEnd]=='*' ){
p->pPhrase->aToken[ii].isPrefix = 1;
}else{
p->pPhrase->aToken[ii].isPrefix = 0;
}
}
}
pModule->xClose(pCursor);
pCursor = 0;
}
if( rc==SQLITE_DONE ){
int jj;
char *zNew;
int nNew = 0;
int nByte = sizeof(Fts3Expr) + sizeof(Fts3Phrase);
nByte += (p?(p->pPhrase->nToken-1):0) * sizeof(struct PhraseToken);
p = fts3ReallocOrFree(p, nByte + nTemp);
if( !p ){
goto no_mem;
}
if( zTemp ){
zNew = &(((char *)p)[nByte]);
memcpy(zNew, zTemp, nTemp);
}else{
memset(p, 0, nByte+nTemp);
}
p->pPhrase = (Fts3Phrase *)&p[1];
for(jj=0; jj<p->pPhrase->nToken; jj++){
p->pPhrase->aToken[jj].z = &zNew[nNew];
nNew += p->pPhrase->aToken[jj].n;
}
sqlite3_free(zTemp);
p->eType = FTSQUERY_PHRASE;
p->pPhrase->iColumn = pParse->iDefaultCol;
rc = SQLITE_OK;
}
*ppExpr = p;
return rc;
no_mem:
if( pCursor ){
pModule->xClose(pCursor);
}
sqlite3_free(zTemp);
sqlite3_free(p);
*ppExpr = 0;
return SQLITE_NOMEM;
}
/*
** Function getNextNode(), which is called by fts3ExprParse(), may itself
** call fts3ExprParse(). So this forward declaration is required.
*/
static int fts3ExprParse(ParseContext *, const char *, int, Fts3Expr **, int *);
/*
** The output variable *ppExpr is populated with an allocated Fts3Expr
** structure, or set to 0 if the end of the input buffer is reached.
**
** Returns an SQLite error code. SQLITE_OK if everything works, SQLITE_NOMEM
** if a malloc failure occurs, or SQLITE_ERROR if a parse error is encountered.
** If SQLITE_ERROR is returned, pContext is populated with an error message.
*/
static int getNextNode(
ParseContext *pParse, /* fts3 query parse context */
const char *z, int n, /* Input string */
Fts3Expr **ppExpr, /* OUT: expression */
int *pnConsumed /* OUT: Number of bytes consumed */
){
static const struct Fts3Keyword {
char z[4]; /* Keyword text */
unsigned char n; /* Length of the keyword */
unsigned char parenOnly; /* Only valid in paren mode */
unsigned char eType; /* Keyword code */
} aKeyword[] = {
{ "OR" , 2, 0, FTSQUERY_OR },
{ "AND", 3, 1, FTSQUERY_AND },
{ "NOT", 3, 1, FTSQUERY_NOT },
{ "NEAR", 4, 0, FTSQUERY_NEAR }
};
int ii;
int iCol;
int iColLen;
int rc;
Fts3Expr *pRet = 0;
const char *zInput = z;
int nInput = n;
/* Skip over any whitespace before checking for a keyword, an open or
** close bracket, or a quoted string.
*/
while( nInput>0 && fts3isspace(*zInput) ){
nInput--;
zInput++;
}
if( nInput==0 ){
return SQLITE_DONE;
}
/* See if we are dealing with a keyword. */
for(ii=0; ii<(int)(sizeof(aKeyword)/sizeof(struct Fts3Keyword)); ii++){
const struct Fts3Keyword *pKey = &aKeyword[ii];
if( (pKey->parenOnly & ~sqlite3_fts3_enable_parentheses)!=0 ){
continue;
}
if( nInput>=pKey->n && 0==memcmp(zInput, pKey->z, pKey->n) ){
int nNear = SQLITE_FTS3_DEFAULT_NEAR_PARAM;
int nKey = pKey->n;
char cNext;
/* If this is a "NEAR" keyword, check for an explicit nearness. */
if( pKey->eType==FTSQUERY_NEAR ){
assert( nKey==4 );
if( zInput[4]=='/' && zInput[5]>='0' && zInput[5]<='9' ){
nNear = 0;
for(nKey=5; zInput[nKey]>='0' && zInput[nKey]<='9'; nKey++){
nNear = nNear * 10 + (zInput[nKey] - '0');
}
}
}
/* At this point this is probably a keyword. But for that to be true,
** the next byte must contain either whitespace, an open or close
** parenthesis, a quote character, or EOF.
*/
cNext = zInput[nKey];
if( fts3isspace(cNext)
|| cNext=='"' || cNext=='(' || cNext==')' || cNext==0
){
pRet = (Fts3Expr *)sqlite3_malloc(sizeof(Fts3Expr));
memset(pRet, 0, sizeof(Fts3Expr));
pRet->eType = pKey->eType;
pRet->nNear = nNear;
*ppExpr = pRet;
*pnConsumed = (zInput - z) + nKey;
return SQLITE_OK;
}
/* Turns out that wasn't a keyword after all. This happens if the
** user has supplied a token such as "ORacle". Continue.
*/
}
}
/* Check for an open bracket. */
if( sqlite3_fts3_enable_parentheses ){
if( *zInput=='(' ){
int nConsumed;
int rc;
pParse->nNest++;
rc = fts3ExprParse(pParse, &zInput[1], nInput-1, ppExpr, &nConsumed);
if( rc==SQLITE_OK && !*ppExpr ){
rc = SQLITE_DONE;
}
*pnConsumed = (zInput - z) + 1 + nConsumed;
return rc;
}
/* Check for a close bracket. */
if( *zInput==')' ){
pParse->nNest--;
*pnConsumed = (zInput - z) + 1;
return SQLITE_DONE;
}
}
/* See if we are dealing with a quoted phrase. If this is the case, then
** search for the closing quote and pass the whole string to getNextString()
** for processing. This is easy to do, as fts3 has no syntax for escaping
** a quote character embedded in a string.
*/
if( *zInput=='"' ){
for(ii=1; ii<nInput && zInput[ii]!='"'; ii++);
*pnConsumed = (zInput - z) + ii + 1;
if( ii==nInput ){
return SQLITE_ERROR;
}
return getNextString(pParse, &zInput[1], ii-1, ppExpr);
}
/* If control flows to this point, this must be a regular token, or
** the end of the input. Read a regular token using the sqlite3_tokenizer
** interface. Before doing so, figure out if there is an explicit
** column specifier for the token.
**
** TODO: Strangely, it is not possible to associate a column specifier
** with a quoted phrase, only with a single token. Not sure if this was
** an implementation artifact or an intentional decision when fts3 was
** first implemented. Whichever it was, this module duplicates the
** limitation.
*/
iCol = pParse->iDefaultCol;
iColLen = 0;
for(ii=0; ii<pParse->nCol; ii++){
const char *zStr = pParse->azCol[ii];
int nStr = strlen(zStr);
if( nInput>nStr && zInput[nStr]==':'
&& sqlite3_strnicmp(zStr, zInput, nStr)==0
){
iCol = ii;
iColLen = ((zInput - z) + nStr + 1);
break;
}
}
rc = getNextToken(pParse, iCol, &z[iColLen], n-iColLen, ppExpr, pnConsumed);
*pnConsumed += iColLen;
return rc;
}
/*
** The argument is an Fts3Expr structure for a binary operator (any type
** except an FTSQUERY_PHRASE). Return an integer value representing the
** precedence of the operator. Lower values have a higher precedence (i.e.
** group more tightly). For example, in the C language, the == operator
** groups more tightly than ||, and would therefore have a higher precedence.
**
** When using the new fts3 query syntax (when SQLITE_ENABLE_FTS3_PARENTHESIS
** is defined), the order of the operators in precedence from highest to
** lowest is:
**
** NEAR
** NOT
** AND (including implicit ANDs)
** OR
**
** Note that when using the old query syntax, the OR operator has a higher
** precedence than the AND operator.
*/
static int opPrecedence(Fts3Expr *p){
assert( p->eType!=FTSQUERY_PHRASE );
if( sqlite3_fts3_enable_parentheses ){
return p->eType;
}else if( p->eType==FTSQUERY_NEAR ){
return 1;
}else if( p->eType==FTSQUERY_OR ){
return 2;
}
assert( p->eType==FTSQUERY_AND );
return 3;
}
/*
** Argument ppHead contains a pointer to the current head of a query
** expression tree being parsed. pPrev is the expression node most recently
** inserted into the tree. This function adds pNew, which is always a binary
** operator node, into the expression tree based on the relative precedence
** of pNew and the existing nodes of the tree. This may result in the head
** of the tree changing, in which case *ppHead is set to the new root node.
*/
static void insertBinaryOperator(
Fts3Expr **ppHead, /* Pointer to the root node of a tree */
Fts3Expr *pPrev, /* Node most recently inserted into the tree */
Fts3Expr *pNew /* New binary node to insert into expression tree */
){
Fts3Expr *pSplit = pPrev;
while( pSplit->pParent && opPrecedence(pSplit->pParent)<=opPrecedence(pNew) ){
pSplit = pSplit->pParent;
}
if( pSplit->pParent ){
assert( pSplit->pParent->pRight==pSplit );
pSplit->pParent->pRight = pNew;
pNew->pParent = pSplit->pParent;
}else{
*ppHead = pNew;
}
pNew->pLeft = pSplit;
pSplit->pParent = pNew;
}
/*
** Parse the fts3 query expression found in buffer z, length n. This function
** returns either when the end of the buffer is reached or an unmatched
** closing bracket - ')' - is encountered.
**
** If successful, SQLITE_OK is returned, *ppExpr is set to point to the
** parsed form of the expression and *pnConsumed is set to the number of
** bytes read from buffer z. Otherwise, *ppExpr is set to 0 and SQLITE_NOMEM
** (out of memory error) or SQLITE_ERROR (parse error) is returned.
*/
static int fts3ExprParse(
ParseContext *pParse, /* fts3 query parse context */
const char *z, int n, /* Text of MATCH query */
Fts3Expr **ppExpr, /* OUT: Parsed query structure */
int *pnConsumed /* OUT: Number of bytes consumed */
){
Fts3Expr *pRet = 0;
Fts3Expr *pPrev = 0;
Fts3Expr *pNotBranch = 0; /* Only used in legacy parse mode */
int nIn = n;
const char *zIn = z;
int rc = SQLITE_OK;
int isRequirePhrase = 1;
while( rc==SQLITE_OK ){
Fts3Expr *p = 0;
int nByte = 0;
rc = getNextNode(pParse, zIn, nIn, &p, &nByte);
if( rc==SQLITE_OK ){
int isPhrase;
if( !sqlite3_fts3_enable_parentheses
&& p->eType==FTSQUERY_PHRASE && p->pPhrase->isNot
){
/* Create an implicit NOT operator. */
Fts3Expr *pNot = sqlite3_malloc(sizeof(Fts3Expr));
if( !pNot ){
sqlite3Fts3ExprFree(p);
rc = SQLITE_NOMEM;
goto exprparse_out;
}
memset(pNot, 0, sizeof(Fts3Expr));
pNot->eType = FTSQUERY_NOT;
pNot->pRight = p;
if( pNotBranch ){
pNot->pLeft = pNotBranch;
}
pNotBranch = pNot;
p = pPrev;
}else{
int eType = p->eType;
assert( eType!=FTSQUERY_PHRASE || !p->pPhrase->isNot );
isPhrase = (eType==FTSQUERY_PHRASE || p->pLeft);
/* The isRequirePhrase variable is set to true if a phrase or
** an expression contained in parenthesis is required. If a
** binary operator (AND, OR, NOT or NEAR) is encounted when
** isRequirePhrase is set, this is a syntax error.
*/
if( !isPhrase && isRequirePhrase ){
sqlite3Fts3ExprFree(p);
rc = SQLITE_ERROR;
goto exprparse_out;
}
if( isPhrase && !isRequirePhrase ){
/* Insert an implicit AND operator. */
Fts3Expr *pAnd;
assert( pRet && pPrev );
pAnd = sqlite3_malloc(sizeof(Fts3Expr));
if( !pAnd ){
sqlite3Fts3ExprFree(p);
rc = SQLITE_NOMEM;
goto exprparse_out;
}
memset(pAnd, 0, sizeof(Fts3Expr));
pAnd->eType = FTSQUERY_AND;
insertBinaryOperator(&pRet, pPrev, pAnd);
pPrev = pAnd;
}
/* This test catches attempts to make either operand of a NEAR
** operator something other than a phrase. For example, either of
** the following:
**
** (bracketed expression) NEAR phrase
** phrase NEAR (bracketed expression)
**
** Return an error in either case.
*/
if( pPrev && (
(eType==FTSQUERY_NEAR && !isPhrase && pPrev->eType!=FTSQUERY_PHRASE)
|| (eType!=FTSQUERY_PHRASE && isPhrase && pPrev->eType==FTSQUERY_NEAR)
)){
sqlite3Fts3ExprFree(p);
rc = SQLITE_ERROR;
goto exprparse_out;
}
if( isPhrase ){
if( pRet ){
assert( pPrev && pPrev->pLeft && pPrev->pRight==0 );
pPrev->pRight = p;
p->pParent = pPrev;
}else{
pRet = p;
}
}else{
insertBinaryOperator(&pRet, pPrev, p);
}
isRequirePhrase = !isPhrase;
}
assert( nByte>0 );
}
assert( rc!=SQLITE_OK || (nByte>0 && nByte<=nIn) );
nIn -= nByte;
zIn += nByte;
pPrev = p;
}
if( rc==SQLITE_DONE && pRet && isRequirePhrase ){
rc = SQLITE_ERROR;
}
if( rc==SQLITE_DONE ){
rc = SQLITE_OK;
if( !sqlite3_fts3_enable_parentheses && pNotBranch ){
if( !pRet ){
rc = SQLITE_ERROR;
}else{
Fts3Expr *pIter = pNotBranch;
while( pIter->pLeft ){
pIter = pIter->pLeft;
}
pIter->pLeft = pRet;
pRet = pNotBranch;
}
}
}
*pnConsumed = n - nIn;
exprparse_out:
if( rc!=SQLITE_OK ){
sqlite3Fts3ExprFree(pRet);
sqlite3Fts3ExprFree(pNotBranch);
pRet = 0;
}
*ppExpr = pRet;
return rc;
}
/*
** Parameters z and n contain a pointer to and length of a buffer containing
** an fts3 query expression, respectively. This function attempts to parse the
** query expression and create a tree of Fts3Expr structures representing the
** parsed expression. If successful, *ppExpr is set to point to the head
** of the parsed expression tree and SQLITE_OK is returned. If an error
** occurs, either SQLITE_NOMEM (out-of-memory error) or SQLITE_ERROR (parse
** error) is returned and *ppExpr is set to 0.
**
** If parameter n is a negative number, then z is assumed to point to a
** nul-terminated string and the length is determined using strlen().
**
** The first parameter, pTokenizer, is passed the fts3 tokenizer module to
** use to normalize query tokens while parsing the expression. The azCol[]
** array, which is assumed to contain nCol entries, should contain the names
** of each column in the target fts3 table, in order from left to right.
** Column names must be nul-terminated strings.
**
** The iDefaultCol parameter should be passed the index of the table column
** that appears on the left-hand-side of the MATCH operator (the default
** column to match against for tokens for which a column name is not explicitly
** specified as part of the query string), or -1 if tokens may by default
** match any table column.
*/
int sqlite3Fts3ExprParse(
sqlite3_tokenizer *pTokenizer, /* Tokenizer module */
char **azCol, /* Array of column names for fts3 table */
int nCol, /* Number of entries in azCol[] */
int iDefaultCol, /* Default column to query */
const char *z, int n, /* Text of MATCH query */
Fts3Expr **ppExpr /* OUT: Parsed query structure */
){
int nParsed;
int rc;
ParseContext sParse;
sParse.pTokenizer = pTokenizer;
sParse.azCol = (const char **)azCol;
sParse.nCol = nCol;
sParse.iDefaultCol = iDefaultCol;
sParse.nNest = 0;
if( z==0 ){
*ppExpr = 0;
return SQLITE_OK;
}
if( n<0 ){
n = strlen(z);
}
rc = fts3ExprParse(&sParse, z, n, ppExpr, &nParsed);
/* Check for mismatched parenthesis */
if( rc==SQLITE_OK && sParse.nNest ){
rc = SQLITE_ERROR;
sqlite3Fts3ExprFree(*ppExpr);
*ppExpr = 0;
}
return rc;
}
/*
** Free a parsed fts3 query expression allocated by sqlite3Fts3ExprParse().
*/
void sqlite3Fts3ExprFree(Fts3Expr *p){
if( p ){
sqlite3Fts3ExprFree(p->pLeft);
sqlite3Fts3ExprFree(p->pRight);
sqlite3_free(p);
}
}
/****************************************************************************
*****************************************************************************
** Everything after this point is just test code.
*/
#ifdef SQLITE_TEST
#include <stdio.h>
/*
** Function to query the hash-table of tokenizers (see README.tokenizers).
*/
static int queryTestTokenizer(
sqlite3 *db,
const char *zName,
const sqlite3_tokenizer_module **pp
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts3_tokenizer(?)";
*pp = 0;
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
if( SQLITE_ROW==sqlite3_step(pStmt) ){
if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
}
}
return sqlite3_finalize(pStmt);
}
/*
** This function is part of the test interface for the query parser. It
** writes a text representation of the query expression pExpr into the
** buffer pointed to by argument zBuf. It is assumed that zBuf is large
** enough to store the required text representation.
*/
static void exprToString(Fts3Expr *pExpr, char *zBuf){
switch( pExpr->eType ){
case FTSQUERY_PHRASE: {
Fts3Phrase *pPhrase = pExpr->pPhrase;
int i;
zBuf += sprintf(zBuf, "PHRASE %d %d", pPhrase->iColumn, pPhrase->isNot);
for(i=0; i<pPhrase->nToken; i++){
zBuf += sprintf(zBuf," %.*s",pPhrase->aToken[i].n,pPhrase->aToken[i].z);
zBuf += sprintf(zBuf,"%s", (pPhrase->aToken[i].isPrefix?"+":""));
}
return;
}
case FTSQUERY_NEAR:
zBuf += sprintf(zBuf, "NEAR/%d ", pExpr->nNear);
break;
case FTSQUERY_NOT:
zBuf += sprintf(zBuf, "NOT ");
break;
case FTSQUERY_AND:
zBuf += sprintf(zBuf, "AND ");
break;
case FTSQUERY_OR:
zBuf += sprintf(zBuf, "OR ");
break;
}
zBuf += sprintf(zBuf, "{");
exprToString(pExpr->pLeft, zBuf);
zBuf += strlen(zBuf);
zBuf += sprintf(zBuf, "} ");
zBuf += sprintf(zBuf, "{");
exprToString(pExpr->pRight, zBuf);
zBuf += strlen(zBuf);
zBuf += sprintf(zBuf, "}");
}
/*
** This is the implementation of a scalar SQL function used to test the
** expression parser. It should be called as follows:
**
** fts3_exprtest(<tokenizer>, <expr>, <column 1>, ...);
**
** The first argument, <tokenizer>, is the name of the fts3 tokenizer used
** to parse the query expression (see README.tokenizers). The second argument
** is the query expression to parse. Each subsequent argument is the name
** of a column of the fts3 table that the query expression may refer to.
** For example:
**
** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2');
*/
static void fts3ExprTest(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
sqlite3_tokenizer_module const *pModule = 0;
sqlite3_tokenizer *pTokenizer = 0;
int rc;
char **azCol = 0;
const char *zExpr;
int nExpr;
int nCol;
int ii;
Fts3Expr *pExpr;
sqlite3 *db = sqlite3_context_db_handle(context);
if( argc<3 ){
sqlite3_result_error(context,
"Usage: fts3_exprtest(tokenizer, expr, col1, ...", -1
);
return;
}
rc = queryTestTokenizer(db,
(const char *)sqlite3_value_text(argv[0]), &pModule);
if( rc==SQLITE_NOMEM ){
sqlite3_result_error_nomem(context);
goto exprtest_out;
}else if( !pModule ){
sqlite3_result_error(context, "No such tokenizer module", -1);
goto exprtest_out;
}
rc = pModule->xCreate(0, 0, &pTokenizer);
assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
if( rc==SQLITE_NOMEM ){
sqlite3_result_error_nomem(context);
goto exprtest_out;
}
pTokenizer->pModule = pModule;
zExpr = (const char *)sqlite3_value_text(argv[1]);
nExpr = sqlite3_value_bytes(argv[1]);
nCol = argc-2;
azCol = (char **)sqlite3_malloc(nCol*sizeof(char *));
if( !azCol ){
sqlite3_result_error_nomem(context);
goto exprtest_out;
}
for(ii=0; ii<nCol; ii++){
azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]);
}
rc = sqlite3Fts3ExprParse(
pTokenizer, azCol, nCol, nCol, zExpr, nExpr, &pExpr
);
if( rc==SQLITE_NOMEM ){
sqlite3_result_error_nomem(context);
goto exprtest_out;
}else if( rc==SQLITE_OK ){
char zBuf[4096];
exprToString(pExpr, zBuf);
sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
sqlite3Fts3ExprFree(pExpr);
}else{
sqlite3_result_error(context, "Error parsing expression", -1);
}
exprtest_out:
if( pModule && pTokenizer ){
rc = pModule->xDestroy(pTokenizer);
}
sqlite3_free(azCol);
}
/*
** Register the query expression parser test function fts3_exprtest()
** with database connection db.
*/
void sqlite3Fts3ExprInitTestInterface(sqlite3* db){
sqlite3_create_function(
db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0
);
}
#endif
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-96
View File
@@ -1,96 +0,0 @@
/*
** 2008 Nov 28
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
*/
#include "fts3_tokenizer.h"
#include "sqlite3.h"
/*
** The following describes the syntax supported by the fts3 MATCH
** operator in a similar format to that used by the lemon parser
** generator. This module does not use actually lemon, it uses a
** custom parser.
**
** query ::= andexpr (OR andexpr)*.
**
** andexpr ::= notexpr (AND? notexpr)*.
**
** notexpr ::= nearexpr (NOT nearexpr|-TOKEN)*.
** notexpr ::= LP query RP.
**
** nearexpr ::= phrase (NEAR distance_opt nearexpr)*.
**
** distance_opt ::= .
** distance_opt ::= / INTEGER.
**
** phrase ::= TOKEN.
** phrase ::= COLUMN:TOKEN.
** phrase ::= "TOKEN TOKEN TOKEN...".
*/
typedef struct Fts3Expr Fts3Expr;
typedef struct Fts3Phrase Fts3Phrase;
/*
** A "phrase" is a sequence of one or more tokens that must match in
** sequence. A single token is the base case and the most common case.
** For a sequence of tokens contained in "...", nToken will be the number
** of tokens in the string.
*/
struct Fts3Phrase {
int nToken; /* Number of tokens in the phrase */
int iColumn; /* Index of column this phrase must match */
int isNot; /* Phrase prefixed by unary not (-) operator */
struct PhraseToken {
char *z; /* Text of the token */
int n; /* Number of bytes in buffer pointed to by z */
int isPrefix; /* True if token ends in with a "*" character */
} aToken[1]; /* One entry for each token in the phrase */
};
/*
** A tree of these objects forms the RHS of a MATCH operator.
*/
struct Fts3Expr {
int eType; /* One of the FTSQUERY_XXX values defined below */
int nNear; /* Valid if eType==FTSQUERY_NEAR */
Fts3Expr *pParent; /* pParent->pLeft==this or pParent->pRight==this */
Fts3Expr *pLeft; /* Left operand */
Fts3Expr *pRight; /* Right operand */
Fts3Phrase *pPhrase; /* Valid if eType==FTSQUERY_PHRASE */
};
int sqlite3Fts3ExprParse(sqlite3_tokenizer *, char **, int, int,
const char *, int, Fts3Expr **);
void sqlite3Fts3ExprFree(Fts3Expr *);
/*
** Candidate values for Fts3Query.eType. Note that the order of the first
** four values is in order of precedence when parsing expressions. For
** example, the following:
**
** "a OR b AND c NOT d NEAR e"
**
** is equivalent to:
**
** "a OR (b AND (c NOT (d NEAR e)))"
*/
#define FTSQUERY_NEAR 1
#define FTSQUERY_NOT 2
#define FTSQUERY_AND 3
#define FTSQUERY_OR 4
#define FTSQUERY_PHRASE 5
#ifdef SQLITE_TEST
void sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
#endif
-373
View File
@@ -1,373 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the implementation of generic hash-tables used in SQLite.
** We've modified it slightly to serve as a standalone hash table
** implementation for the full-text indexing module.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "sqlite3.h"
#include "fts3_hash.h"
/*
** Malloc and Free functions
*/
static void *fts3HashMalloc(int n){
void *p = sqlite3_malloc(n);
if( p ){
memset(p, 0, n);
}
return p;
}
static void fts3HashFree(void *p){
sqlite3_free(p);
}
/* Turn bulk memory into a hash table object by initializing the
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
** keyClass is one of the constants
** FTS3_HASH_BINARY or FTS3_HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer.
*/
void sqlite3Fts3HashInit(fts3Hash *pNew, int keyClass, int copyKey){
assert( pNew!=0 );
assert( keyClass>=FTS3_HASH_STRING && keyClass<=FTS3_HASH_BINARY );
pNew->keyClass = keyClass;
pNew->copyKey = copyKey;
pNew->first = 0;
pNew->count = 0;
pNew->htsize = 0;
pNew->ht = 0;
}
/* Remove all entries from a hash table. Reclaim all memory.
** Call this routine to delete a hash table or to reset a hash table
** to the empty state.
*/
void sqlite3Fts3HashClear(fts3Hash *pH){
fts3HashElem *elem; /* For looping over all elements of the table */
assert( pH!=0 );
elem = pH->first;
pH->first = 0;
fts3HashFree(pH->ht);
pH->ht = 0;
pH->htsize = 0;
while( elem ){
fts3HashElem *next_elem = elem->next;
if( pH->copyKey && elem->pKey ){
fts3HashFree(elem->pKey);
}
fts3HashFree(elem);
elem = next_elem;
}
pH->count = 0;
}
/*
** Hash and comparison functions when the mode is FTS3_HASH_STRING
*/
static int fts3StrHash(const void *pKey, int nKey){
const char *z = (const char *)pKey;
int h = 0;
if( nKey<=0 ) nKey = (int) strlen(z);
while( nKey > 0 ){
h = (h<<3) ^ h ^ *z++;
nKey--;
}
return h & 0x7fffffff;
}
static int fts3StrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return strncmp((const char*)pKey1,(const char*)pKey2,n1);
}
/*
** Hash and comparison functions when the mode is FTS3_HASH_BINARY
*/
static int fts3BinHash(const void *pKey, int nKey){
int h = 0;
const char *z = (const char *)pKey;
while( nKey-- > 0 ){
h = (h<<3) ^ h ^ *(z++);
}
return h & 0x7fffffff;
}
static int fts3BinCompare(const void *pKey1, int n1, const void *pKey2, int n2){
if( n1!=n2 ) return 1;
return memcmp(pKey1,pKey2,n1);
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "ftsHashFunction". The function takes a
** single parameter "keyClass". The return value of ftsHashFunction()
** is a pointer to another function. Specifically, the return value
** of ftsHashFunction() is a pointer to a function that takes two parameters
** with types "const void*" and "int" and returns an "int".
*/
static int (*ftsHashFunction(int keyClass))(const void*,int){
if( keyClass==FTS3_HASH_STRING ){
return &fts3StrHash;
}else{
assert( keyClass==FTS3_HASH_BINARY );
return &fts3BinHash;
}
}
/*
** Return a pointer to the appropriate hash function given the key class.
**
** For help in interpreted the obscure C code in the function definition,
** see the header comment on the previous function.
*/
static int (*ftsCompareFunction(int keyClass))(const void*,int,const void*,int){
if( keyClass==FTS3_HASH_STRING ){
return &fts3StrCompare;
}else{
assert( keyClass==FTS3_HASH_BINARY );
return &fts3BinCompare;
}
}
/* Link an element into the hash table
*/
static void fts3HashInsertElement(
fts3Hash *pH, /* The complete hash table */
struct _fts3ht *pEntry, /* The entry into which pNew is inserted */
fts3HashElem *pNew /* The element to be inserted */
){
fts3HashElem *pHead; /* First element already in pEntry */
pHead = pEntry->chain;
if( pHead ){
pNew->next = pHead;
pNew->prev = pHead->prev;
if( pHead->prev ){ pHead->prev->next = pNew; }
else { pH->first = pNew; }
pHead->prev = pNew;
}else{
pNew->next = pH->first;
if( pH->first ){ pH->first->prev = pNew; }
pNew->prev = 0;
pH->first = pNew;
}
pEntry->count++;
pEntry->chain = pNew;
}
/* Resize the hash table so that it cantains "new_size" buckets.
** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void fts3Rehash(fts3Hash *pH, int new_size){
struct _fts3ht *new_ht; /* The new hash table */
fts3HashElem *elem, *next_elem; /* For looping over existing elements */
int (*xHash)(const void*,int); /* The hash function */
assert( (new_size & (new_size-1))==0 );
new_ht = (struct _fts3ht *)fts3HashMalloc( new_size*sizeof(struct _fts3ht) );
if( new_ht==0 ) return;
fts3HashFree(pH->ht);
pH->ht = new_ht;
pH->htsize = new_size;
xHash = ftsHashFunction(pH->keyClass);
for(elem=pH->first, pH->first=0; elem; elem = next_elem){
int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
next_elem = elem->next;
fts3HashInsertElement(pH, &new_ht[h], elem);
}
}
/* This function (for internal use only) locates an element in an
** hash table that matches the given key. The hash for this key has
** already been computed and is passed as the 4th parameter.
*/
static fts3HashElem *fts3FindElementByHash(
const fts3Hash *pH, /* The pH to be searched */
const void *pKey, /* The key we are searching for */
int nKey,
int h /* The hash for this key. */
){
fts3HashElem *elem; /* Used to loop thru the element list */
int count; /* Number of elements left to test */
int (*xCompare)(const void*,int,const void*,int); /* comparison function */
if( pH->ht ){
struct _fts3ht *pEntry = &pH->ht[h];
elem = pEntry->chain;
count = pEntry->count;
xCompare = ftsCompareFunction(pH->keyClass);
while( count-- && elem ){
if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
}
}
return 0;
}
/* Remove a single entry from the hash table given a pointer to that
** element and a hash on the element's key.
*/
static void fts3RemoveElementByHash(
fts3Hash *pH, /* The pH containing "elem" */
fts3HashElem* elem, /* The element to be removed from the pH */
int h /* Hash value for the element */
){
struct _fts3ht *pEntry;
if( elem->prev ){
elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
if( elem->next ){
elem->next->prev = elem->prev;
}
pEntry = &pH->ht[h];
if( pEntry->chain==elem ){
pEntry->chain = elem->next;
}
pEntry->count--;
if( pEntry->count<=0 ){
pEntry->chain = 0;
}
if( pH->copyKey && elem->pKey ){
fts3HashFree(elem->pKey);
}
fts3HashFree( elem );
pH->count--;
if( pH->count<=0 ){
assert( pH->first==0 );
assert( pH->count==0 );
fts3HashClear(pH);
}
}
/* Attempt to locate an element of the hash table pH with a key
** that matches pKey,nKey. Return the data for this element if it is
** found, or NULL if there is no match.
*/
void *sqlite3Fts3HashFind(const fts3Hash *pH, const void *pKey, int nKey){
int h; /* A hash on key */
fts3HashElem *elem; /* The element that matches key */
int (*xHash)(const void*,int); /* The hash function */
if( pH==0 || pH->ht==0 ) return 0;
xHash = ftsHashFunction(pH->keyClass);
assert( xHash!=0 );
h = (*xHash)(pKey,nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
elem = fts3FindElementByHash(pH,pKey,nKey, h & (pH->htsize-1));
return elem ? elem->data : 0;
}
/* Insert an element into the hash table pH. The key is pKey,nKey
** and the data is "data".
**
** If no element exists with a matching key, then a new
** element is created. A copy of the key is made if the copyKey
** flag is set. NULL is returned.
**
** If another element already exists with the same key, then the
** new data replaces the old data and the old data is returned.
** The key is not copied in this instance. If a malloc fails, then
** the new data is returned and the hash table is unchanged.
**
** If the "data" parameter to this function is NULL, then the
** element corresponding to "key" is removed from the hash table.
*/
void *sqlite3Fts3HashInsert(
fts3Hash *pH, /* The hash table to insert into */
const void *pKey, /* The key */
int nKey, /* Number of bytes in the key */
void *data /* The data */
){
int hraw; /* Raw hash value of the key */
int h; /* the hash of the key modulo hash table size */
fts3HashElem *elem; /* Used to loop thru the element list */
fts3HashElem *new_elem; /* New element added to the pH */
int (*xHash)(const void*,int); /* The hash function */
assert( pH!=0 );
xHash = ftsHashFunction(pH->keyClass);
assert( xHash!=0 );
hraw = (*xHash)(pKey, nKey);
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
elem = fts3FindElementByHash(pH,pKey,nKey,h);
if( elem ){
void *old_data = elem->data;
if( data==0 ){
fts3RemoveElementByHash(pH,elem,h);
}else{
elem->data = data;
}
return old_data;
}
if( data==0 ) return 0;
if( pH->htsize==0 ){
fts3Rehash(pH,8);
if( pH->htsize==0 ){
pH->count = 0;
return data;
}
}
new_elem = (fts3HashElem*)fts3HashMalloc( sizeof(fts3HashElem) );
if( new_elem==0 ) return data;
if( pH->copyKey && pKey!=0 ){
new_elem->pKey = fts3HashMalloc( nKey );
if( new_elem->pKey==0 ){
fts3HashFree(new_elem);
return data;
}
memcpy((void*)new_elem->pKey, pKey, nKey);
}else{
new_elem->pKey = (void*)pKey;
}
new_elem->nKey = nKey;
pH->count++;
if( pH->count > pH->htsize ){
fts3Rehash(pH,pH->htsize*2);
}
assert( pH->htsize>0 );
assert( (pH->htsize & (pH->htsize-1))==0 );
h = hraw & (pH->htsize-1);
fts3HashInsertElement(pH, &pH->ht[h], new_elem);
new_elem->data = data;
return 0;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-110
View File
@@ -1,110 +0,0 @@
/*
** 2001 September 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This is the header file for the generic hash-table implemenation
** used in SQLite. We've modified it slightly to serve as a standalone
** hash table implementation for the full-text indexing module.
**
*/
#ifndef _FTS3_HASH_H_
#define _FTS3_HASH_H_
/* Forward declarations of structures. */
typedef struct fts3Hash fts3Hash;
typedef struct fts3HashElem fts3HashElem;
/* A complete hash table is an instance of the following structure.
** The internals of this structure are intended to be opaque -- client
** code should not attempt to access or modify the fields of this structure
** directly. Change this structure only by using the routines below.
** However, many of the "procedures" and "functions" for modifying and
** accessing this structure are really macros, so we can't really make
** this structure opaque.
*/
struct fts3Hash {
char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
char copyKey; /* True if copy of key made on insert */
int count; /* Number of entries in this table */
fts3HashElem *first; /* The first element of the array */
int htsize; /* Number of buckets in the hash table */
struct _fts3ht { /* the hash table */
int count; /* Number of entries with this hash */
fts3HashElem *chain; /* Pointer to first entry with this hash */
} *ht;
};
/* Each element in the hash table is an instance of the following
** structure. All elements are stored on a single doubly-linked list.
**
** Again, this structure is intended to be opaque, but it can't really
** be opaque because it is used by macros.
*/
struct fts3HashElem {
fts3HashElem *next, *prev; /* Next and previous elements in the table */
void *data; /* Data associated with this element */
void *pKey; int nKey; /* Key associated with this element */
};
/*
** There are 2 different modes of operation for a hash table:
**
** FTS3_HASH_STRING pKey points to a string that is nKey bytes long
** (including the null-terminator, if any). Case
** is respected in comparisons.
**
** FTS3_HASH_BINARY pKey points to binary data nKey bytes long.
** memcmp() is used to compare keys.
**
** A copy of the key is made if the copyKey parameter to fts3HashInit is 1.
*/
#define FTS3_HASH_STRING 1
#define FTS3_HASH_BINARY 2
/*
** Access routines. To delete, insert a NULL pointer.
*/
void sqlite3Fts3HashInit(fts3Hash*, int keytype, int copyKey);
void *sqlite3Fts3HashInsert(fts3Hash*, const void *pKey, int nKey, void *pData);
void *sqlite3Fts3HashFind(const fts3Hash*, const void *pKey, int nKey);
void sqlite3Fts3HashClear(fts3Hash*);
/*
** Shorthand for the functions above
*/
#define fts3HashInit sqlite3Fts3HashInit
#define fts3HashInsert sqlite3Fts3HashInsert
#define fts3HashFind sqlite3Fts3HashFind
#define fts3HashClear sqlite3Fts3HashClear
/*
** Macros for looping over all elements of a hash table. The idiom is
** like this:
**
** fts3Hash h;
** fts3HashElem *p;
** ...
** for(p=fts3HashFirst(&h); p; p=fts3HashNext(p)){
** SomeStructure *pData = fts3HashData(p);
** // do something with pData
** }
*/
#define fts3HashFirst(H) ((H)->first)
#define fts3HashNext(E) ((E)->next)
#define fts3HashData(E) ((E)->data)
#define fts3HashKey(E) ((E)->pKey)
#define fts3HashKeysize(E) ((E)->nKey)
/*
** Number of entries in a hash table
*/
#define fts3HashCount(H) ((H)->count)
#endif /* _FTS3_HASH_H_ */
-260
View File
@@ -1,260 +0,0 @@
/*
** 2007 June 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This file implements a tokenizer for fts3 based on the ICU library.
**
** $Id: fts3_icu.c,v 1.3 2008/09/01 18:34:20 danielk1977 Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#ifdef SQLITE_ENABLE_ICU
#include <assert.h>
#include <string.h>
#include "fts3_tokenizer.h"
#include <unicode/ubrk.h>
#include <unicode/ucol.h>
#include <unicode/ustring.h>
#include <unicode/utf16.h>
typedef struct IcuTokenizer IcuTokenizer;
typedef struct IcuCursor IcuCursor;
struct IcuTokenizer {
sqlite3_tokenizer base;
char *zLocale;
};
struct IcuCursor {
sqlite3_tokenizer_cursor base;
UBreakIterator *pIter; /* ICU break-iterator object */
int nChar; /* Number of UChar elements in pInput */
UChar *aChar; /* Copy of input using utf-16 encoding */
int *aOffset; /* Offsets of each character in utf-8 input */
int nBuffer;
char *zBuffer;
int iToken;
};
/*
** Create a new tokenizer instance.
*/
static int icuCreate(
int argc, /* Number of entries in argv[] */
const char * const *argv, /* Tokenizer creation arguments */
sqlite3_tokenizer **ppTokenizer /* OUT: Created tokenizer */
){
IcuTokenizer *p;
int n = 0;
if( argc>0 ){
n = strlen(argv[0])+1;
}
p = (IcuTokenizer *)sqlite3_malloc(sizeof(IcuTokenizer)+n);
if( !p ){
return SQLITE_NOMEM;
}
memset(p, 0, sizeof(IcuTokenizer));
if( n ){
p->zLocale = (char *)&p[1];
memcpy(p->zLocale, argv[0], n);
}
*ppTokenizer = (sqlite3_tokenizer *)p;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int icuDestroy(sqlite3_tokenizer *pTokenizer){
IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
sqlite3_free(p);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is pInput[0..nBytes-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int icuOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *zInput, /* Input string */
int nInput, /* Length of zInput in bytes */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
IcuTokenizer *p = (IcuTokenizer *)pTokenizer;
IcuCursor *pCsr;
const int32_t opt = U_FOLD_CASE_DEFAULT;
UErrorCode status = U_ZERO_ERROR;
int nChar;
UChar32 c;
int iInput = 0;
int iOut = 0;
*ppCursor = 0;
if( nInput<0 ){
nInput = strlen(zInput);
}
nChar = nInput+1;
pCsr = (IcuCursor *)sqlite3_malloc(
sizeof(IcuCursor) + /* IcuCursor */
nChar * sizeof(UChar) + /* IcuCursor.aChar[] */
(nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */
);
if( !pCsr ){
return SQLITE_NOMEM;
}
memset(pCsr, 0, sizeof(IcuCursor));
pCsr->aChar = (UChar *)&pCsr[1];
pCsr->aOffset = (int *)&pCsr->aChar[nChar];
pCsr->aOffset[iOut] = iInput;
U8_NEXT(zInput, iInput, nInput, c);
while( c>0 ){
int isError = 0;
c = u_foldCase(c, opt);
U16_APPEND(pCsr->aChar, iOut, nChar, c, isError);
if( isError ){
sqlite3_free(pCsr);
return SQLITE_ERROR;
}
pCsr->aOffset[iOut] = iInput;
if( iInput<nInput ){
U8_NEXT(zInput, iInput, nInput, c);
}else{
c = 0;
}
}
pCsr->pIter = ubrk_open(UBRK_WORD, p->zLocale, pCsr->aChar, iOut, &status);
if( !U_SUCCESS(status) ){
sqlite3_free(pCsr);
return SQLITE_ERROR;
}
pCsr->nChar = iOut;
ubrk_first(pCsr->pIter);
*ppCursor = (sqlite3_tokenizer_cursor *)pCsr;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to icuOpen().
*/
static int icuClose(sqlite3_tokenizer_cursor *pCursor){
IcuCursor *pCsr = (IcuCursor *)pCursor;
ubrk_close(pCsr->pIter);
sqlite3_free(pCsr->zBuffer);
sqlite3_free(pCsr);
return SQLITE_OK;
}
/*
** Extract the next token from a tokenization cursor.
*/
static int icuNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by simpleOpen */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
IcuCursor *pCsr = (IcuCursor *)pCursor;
int iStart = 0;
int iEnd = 0;
int nByte = 0;
while( iStart==iEnd ){
UChar32 c;
iStart = ubrk_current(pCsr->pIter);
iEnd = ubrk_next(pCsr->pIter);
if( iEnd==UBRK_DONE ){
return SQLITE_DONE;
}
while( iStart<iEnd ){
int iWhite = iStart;
U8_NEXT(pCsr->aChar, iWhite, pCsr->nChar, c);
if( u_isspace(c) ){
iStart = iWhite;
}else{
break;
}
}
assert(iStart<=iEnd);
}
do {
UErrorCode status = U_ZERO_ERROR;
if( nByte ){
char *zNew = sqlite3_realloc(pCsr->zBuffer, nByte);
if( !zNew ){
return SQLITE_NOMEM;
}
pCsr->zBuffer = zNew;
pCsr->nBuffer = nByte;
}
u_strToUTF8(
pCsr->zBuffer, pCsr->nBuffer, &nByte, /* Output vars */
&pCsr->aChar[iStart], iEnd-iStart, /* Input vars */
&status /* Output success/failure */
);
} while( nByte>pCsr->nBuffer );
*ppToken = pCsr->zBuffer;
*pnBytes = nByte;
*piStartOffset = pCsr->aOffset[iStart];
*piEndOffset = pCsr->aOffset[iEnd];
*piPosition = pCsr->iToken++;
return SQLITE_OK;
}
/*
** The set of routines that implement the simple tokenizer
*/
static const sqlite3_tokenizer_module icuTokenizerModule = {
0, /* iVersion */
icuCreate, /* xCreate */
icuDestroy, /* xCreate */
icuOpen, /* xOpen */
icuClose, /* xClose */
icuNext, /* xNext */
};
/*
** Set *ppModule to point at the implementation of the ICU tokenizer.
*/
void sqlite3Fts3IcuTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &icuTokenizerModule;
}
#endif /* defined(SQLITE_ENABLE_ICU) */
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-642
View File
@@ -1,642 +0,0 @@
/*
** 2006 September 30
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** Implementation of the full-text-search tokenizer that implements
** a Porter stemmer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts3_tokenizer.h"
/*
** Class derived from sqlite3_tokenizer
*/
typedef struct porter_tokenizer {
sqlite3_tokenizer base; /* Base class */
} porter_tokenizer;
/*
** Class derived from sqlit3_tokenizer_cursor
*/
typedef struct porter_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *zInput; /* input we are tokenizing */
int nInput; /* size of the input */
int iOffset; /* current position in zInput */
int iToken; /* index of next token to be returned */
char *zToken; /* storage for current token */
int nAllocated; /* space allocated to zToken buffer */
} porter_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module porterTokenizerModule;
/*
** Create a new tokenizer instance.
*/
static int porterCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
porter_tokenizer *t;
t = (porter_tokenizer *) sqlite3_malloc(sizeof(*t));
if( t==NULL ) return SQLITE_NOMEM;
memset(t, 0, sizeof(*t));
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int porterDestroy(sqlite3_tokenizer *pTokenizer){
sqlite3_free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is zInput[0..nInput-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int porterOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *zInput, int nInput, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
porter_tokenizer_cursor *c;
c = (porter_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->zInput = zInput;
if( zInput==0 ){
c->nInput = 0;
}else if( nInput<0 ){
c->nInput = (int)strlen(zInput);
}else{
c->nInput = nInput;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->zToken = NULL; /* no space allocated, yet. */
c->nAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** porterOpen() above.
*/
static int porterClose(sqlite3_tokenizer_cursor *pCursor){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
sqlite3_free(c->zToken);
sqlite3_free(c);
return SQLITE_OK;
}
/*
** Vowel or consonant
*/
static const char cType[] = {
0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0,
1, 1, 1, 2, 1
};
/*
** isConsonant() and isVowel() determine if their first character in
** the string they point to is a consonant or a vowel, according
** to Porter ruls.
**
** A consonate is any letter other than 'a', 'e', 'i', 'o', or 'u'.
** 'Y' is a consonant unless it follows another consonant,
** in which case it is a vowel.
**
** In these routine, the letters are in reverse order. So the 'y' rule
** is that 'y' is a consonant unless it is followed by another
** consonent.
*/
static int isVowel(const char*);
static int isConsonant(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return j;
return z[1]==0 || isVowel(z + 1);
}
static int isVowel(const char *z){
int j;
char x = *z;
if( x==0 ) return 0;
assert( x>='a' && x<='z' );
j = cType[x-'a'];
if( j<2 ) return 1-j;
return isConsonant(z + 1);
}
/*
** Let any sequence of one or more vowels be represented by V and let
** C be sequence of one or more consonants. Then every word can be
** represented as:
**
** [C] (VC){m} [V]
**
** In prose: A word is an optional consonant followed by zero or
** vowel-consonant pairs followed by an optional vowel. "m" is the
** number of vowel consonant pairs. This routine computes the value
** of m for the first i bytes of a word.
**
** Return true if the m-value for z is 1 or more. In other words,
** return true if z contains at least one vowel that is followed
** by a consonant.
**
** In this routine z[] is in reverse order. So we are really looking
** for an instance of of a consonant followed by a vowel.
*/
static int m_gt_0(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/* Like mgt0 above except we are looking for a value of m which is
** exactly 1
*/
static int m_eq_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 1;
while( isConsonant(z) ){ z++; }
return *z==0;
}
/* Like mgt0 above except we are looking for a value of m>1 instead
** or m>0
*/
static int m_gt_1(const char *z){
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
if( *z==0 ) return 0;
while( isVowel(z) ){ z++; }
if( *z==0 ) return 0;
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if there is a vowel anywhere within z[0..n-1]
*/
static int hasVowel(const char *z){
while( isConsonant(z) ){ z++; }
return *z!=0;
}
/*
** Return TRUE if the word ends in a double consonant.
**
** The text is reversed here. So we are really looking at
** the first two characters of z[].
*/
static int doubleConsonant(const char *z){
return isConsonant(z) && z[0]==z[1] && isConsonant(z+1);
}
/*
** Return TRUE if the word ends with three letters which
** are consonant-vowel-consonent and where the final consonant
** is not 'w', 'x', or 'y'.
**
** The word is reversed here. So we are really checking the
** first three letters and the first one cannot be in [wxy].
*/
static int star_oh(const char *z){
return
z[0]!=0 && isConsonant(z) &&
z[0]!='w' && z[0]!='x' && z[0]!='y' &&
z[1]!=0 && isVowel(z+1) &&
z[2]!=0 && isConsonant(z+2);
}
/*
** If the word ends with zFrom and xCond() is true for the stem
** of the word that preceeds the zFrom ending, then change the
** ending to zTo.
**
** The input word *pz and zFrom are both in reverse order. zTo
** is in normal order.
**
** Return TRUE if zFrom matches. Return FALSE if zFrom does not
** match. Not that TRUE is returned even if xCond() fails and
** no substitution occurs.
*/
static int stem(
char **pz, /* The word being stemmed (Reversed) */
const char *zFrom, /* If the ending matches this... (Reversed) */
const char *zTo, /* ... change the ending to this (not reversed) */
int (*xCond)(const char*) /* Condition that must be true */
){
char *z = *pz;
while( *zFrom && *zFrom==*z ){ z++; zFrom++; }
if( *zFrom!=0 ) return 0;
if( xCond && !xCond(z) ) return 1;
while( *zTo ){
*(--z) = *(zTo++);
}
*pz = z;
return 1;
}
/*
** This is the fallback stemmer used when the porter stemmer is
** inappropriate. The input word is copied into the output with
** US-ASCII case folding. If the input word is too long (more
** than 20 bytes if it contains no digits or more than 6 bytes if
** it contains digits) then word is truncated to 20 or 6 bytes
** by taking 10 or 3 bytes from the beginning and end.
*/
static void copy_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, mx, j;
int hasDigit = 0;
for(i=0; i<nIn; i++){
int c = zIn[i];
if( c>='A' && c<='Z' ){
zOut[i] = c - 'A' + 'a';
}else{
if( c>='0' && c<='9' ) hasDigit = 1;
zOut[i] = c;
}
}
mx = hasDigit ? 3 : 10;
if( nIn>mx*2 ){
for(j=mx, i=nIn-mx; i<nIn; i++, j++){
zOut[j] = zOut[i];
}
i = j;
}
zOut[i] = 0;
*pnOut = i;
}
/*
** Stem the input word zIn[0..nIn-1]. Store the output in zOut.
** zOut is at least big enough to hold nIn bytes. Write the actual
** size of the output word (exclusive of the '\0' terminator) into *pnOut.
**
** Any upper-case characters in the US-ASCII character set ([A-Z])
** are converted to lower case. Upper-case UTF characters are
** unchanged.
**
** Words that are longer than about 20 bytes are stemmed by retaining
** a few bytes from the beginning and the end of the word. If the
** word contains digits, 3 bytes are taken from the beginning and
** 3 bytes from the end. For long words without digits, 10 bytes
** are taken from each end. US-ASCII case folding still applies.
**
** If the input word contains not digits but does characters not
** in [a-zA-Z] then no stemming is attempted and this routine just
** copies the input into the input into the output with US-ASCII
** case folding.
**
** Stemming never increases the length of the word. So there is
** no chance of overflowing the zOut buffer.
*/
static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
int i, j, c;
char zReverse[28];
char *z, *z2;
if( nIn<3 || nIn>=sizeof(zReverse)-7 ){
/* The word is too big or too small for the porter stemmer.
** Fallback to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
for(i=0, j=sizeof(zReverse)-6; i<nIn; i++, j--){
c = zIn[i];
if( c>='A' && c<='Z' ){
zReverse[j] = c + 'a' - 'A';
}else if( c>='a' && c<='z' ){
zReverse[j] = c;
}else{
/* The use of a character not in [a-zA-Z] means that we fallback
** to the copy stemmer */
copy_stemmer(zIn, nIn, zOut, pnOut);
return;
}
}
memset(&zReverse[sizeof(zReverse)-5], 0, 5);
z = &zReverse[j+1];
/* Step 1a */
if( z[0]=='s' ){
if(
!stem(&z, "sess", "ss", 0) &&
!stem(&z, "sei", "i", 0) &&
!stem(&z, "ss", "ss", 0)
){
z++;
}
}
/* Step 1b */
z2 = z;
if( stem(&z, "dee", "ee", m_gt_0) ){
/* Do nothing. The work was all in the test */
}else if(
(stem(&z, "gni", "", hasVowel) || stem(&z, "de", "", hasVowel))
&& z!=z2
){
if( stem(&z, "ta", "ate", 0) ||
stem(&z, "lb", "ble", 0) ||
stem(&z, "zi", "ize", 0) ){
/* Do nothing. The work was all in the test */
}else if( doubleConsonant(z) && (*z!='l' && *z!='s' && *z!='z') ){
z++;
}else if( m_eq_1(z) && star_oh(z) ){
*(--z) = 'e';
}
}
/* Step 1c */
if( z[0]=='y' && hasVowel(z+1) ){
z[0] = 'i';
}
/* Step 2 */
switch( z[1] ){
case 'a':
stem(&z, "lanoita", "ate", m_gt_0) ||
stem(&z, "lanoit", "tion", m_gt_0);
break;
case 'c':
stem(&z, "icne", "ence", m_gt_0) ||
stem(&z, "icna", "ance", m_gt_0);
break;
case 'e':
stem(&z, "rezi", "ize", m_gt_0);
break;
case 'g':
stem(&z, "igol", "log", m_gt_0);
break;
case 'l':
stem(&z, "ilb", "ble", m_gt_0) ||
stem(&z, "illa", "al", m_gt_0) ||
stem(&z, "iltne", "ent", m_gt_0) ||
stem(&z, "ile", "e", m_gt_0) ||
stem(&z, "ilsuo", "ous", m_gt_0);
break;
case 'o':
stem(&z, "noitazi", "ize", m_gt_0) ||
stem(&z, "noita", "ate", m_gt_0) ||
stem(&z, "rota", "ate", m_gt_0);
break;
case 's':
stem(&z, "msila", "al", m_gt_0) ||
stem(&z, "ssenevi", "ive", m_gt_0) ||
stem(&z, "ssenluf", "ful", m_gt_0) ||
stem(&z, "ssensuo", "ous", m_gt_0);
break;
case 't':
stem(&z, "itila", "al", m_gt_0) ||
stem(&z, "itivi", "ive", m_gt_0) ||
stem(&z, "itilib", "ble", m_gt_0);
break;
}
/* Step 3 */
switch( z[0] ){
case 'e':
stem(&z, "etaci", "ic", m_gt_0) ||
stem(&z, "evita", "", m_gt_0) ||
stem(&z, "ezila", "al", m_gt_0);
break;
case 'i':
stem(&z, "itici", "ic", m_gt_0);
break;
case 'l':
stem(&z, "laci", "ic", m_gt_0) ||
stem(&z, "luf", "", m_gt_0);
break;
case 's':
stem(&z, "ssen", "", m_gt_0);
break;
}
/* Step 4 */
switch( z[1] ){
case 'a':
if( z[0]=='l' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'c':
if( z[0]=='e' && z[2]=='n' && (z[3]=='a' || z[3]=='e') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'e':
if( z[0]=='r' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'i':
if( z[0]=='c' && m_gt_1(z+2) ){
z += 2;
}
break;
case 'l':
if( z[0]=='e' && z[2]=='b' && (z[3]=='a' || z[3]=='i') && m_gt_1(z+4) ){
z += 4;
}
break;
case 'n':
if( z[0]=='t' ){
if( z[2]=='a' ){
if( m_gt_1(z+3) ){
z += 3;
}
}else if( z[2]=='e' ){
stem(&z, "tneme", "", m_gt_1) ||
stem(&z, "tnem", "", m_gt_1) ||
stem(&z, "tne", "", m_gt_1);
}
}
break;
case 'o':
if( z[0]=='u' ){
if( m_gt_1(z+2) ){
z += 2;
}
}else if( z[3]=='s' || z[3]=='t' ){
stem(&z, "noi", "", m_gt_1);
}
break;
case 's':
if( z[0]=='m' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
case 't':
stem(&z, "eta", "", m_gt_1) ||
stem(&z, "iti", "", m_gt_1);
break;
case 'u':
if( z[0]=='s' && z[2]=='o' && m_gt_1(z+3) ){
z += 3;
}
break;
case 'v':
case 'z':
if( z[0]=='e' && z[2]=='i' && m_gt_1(z+3) ){
z += 3;
}
break;
}
/* Step 5a */
if( z[0]=='e' ){
if( m_gt_1(z+1) ){
z++;
}else if( m_eq_1(z+1) && !star_oh(z+1) ){
z++;
}
}
/* Step 5b */
if( m_gt_1(z) && z[0]=='l' && z[1]=='l' ){
z++;
}
/* z[] is now the stemmed word in reverse order. Flip it back
** around into forward order and return.
*/
*pnOut = i = strlen(z);
zOut[i] = 0;
while( *z ){
zOut[--i] = *(z++);
}
}
/*
** Characters that can be part of a token. We assume any character
** whose value is greater than 0x80 (any UTF character) can be
** part of a token. In other words, delimiters all must have
** values of 0x7f or lower.
*/
static const char porterIdChar[] = {
/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */
};
#define isDelim(C) (((ch=C)&0x80)==0 && (ch<0x30 || !porterIdChar[ch-0x30]))
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to porterOpen().
*/
static int porterNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by porterOpen */
const char **pzToken, /* OUT: *pzToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
porter_tokenizer_cursor *c = (porter_tokenizer_cursor *) pCursor;
const char *z = c->zInput;
while( c->iOffset<c->nInput ){
int iStartOffset, ch;
/* Scan past delimiter characters */
while( c->iOffset<c->nInput && isDelim(z[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nInput && !isDelim(z[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int n = c->iOffset-iStartOffset;
if( n>c->nAllocated ){
c->nAllocated = n+20;
c->zToken = sqlite3_realloc(c->zToken, c->nAllocated);
if( c->zToken==NULL ) return SQLITE_NOMEM;
}
porter_stemmer(&z[iStartOffset], n, c->zToken, pnBytes);
*pzToken = c->zToken;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the porter-stemmer tokenizer
*/
static const sqlite3_tokenizer_module porterTokenizerModule = {
0,
porterCreate,
porterDestroy,
porterOpen,
porterClose,
porterNext,
};
/*
** Allocate a new porter tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts3PorterTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &porterTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-371
View File
@@ -1,371 +0,0 @@
/*
** 2007 June 22
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This is part of an SQLite module implementing full-text search.
** This particular file implements the generic tokenizer interface.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#include "sqlite3ext.h"
#ifndef SQLITE_CORE
SQLITE_EXTENSION_INIT1
#endif
#include "fts3_hash.h"
#include "fts3_tokenizer.h"
#include <assert.h>
/*
** Implementation of the SQL scalar function for accessing the underlying
** hash table. This function may be called as follows:
**
** SELECT <function-name>(<key-name>);
** SELECT <function-name>(<key-name>, <pointer>);
**
** where <function-name> is the name passed as the second argument
** to the sqlite3Fts3InitHashTable() function (e.g. 'fts3_tokenizer').
**
** If the <pointer> argument is specified, it must be a blob value
** containing a pointer to be stored as the hash data corresponding
** to the string <key-name>. If <pointer> is not specified, then
** the string <key-name> must already exist in the has table. Otherwise,
** an error is returned.
**
** Whether or not the <pointer> argument is specified, the value returned
** is a blob containing the pointer stored as the hash data corresponding
** to string <key-name> (after the hash-table is updated, if applicable).
*/
static void scalarFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
fts3Hash *pHash;
void *pPtr = 0;
const unsigned char *zName;
int nName;
assert( argc==1 || argc==2 );
pHash = (fts3Hash *)sqlite3_user_data(context);
zName = sqlite3_value_text(argv[0]);
nName = sqlite3_value_bytes(argv[0])+1;
if( argc==2 ){
void *pOld;
int n = sqlite3_value_bytes(argv[1]);
if( n!=sizeof(pPtr) ){
sqlite3_result_error(context, "argument type mismatch", -1);
return;
}
pPtr = *(void **)sqlite3_value_blob(argv[1]);
pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
if( pOld==pPtr ){
sqlite3_result_error(context, "out of memory", -1);
return;
}
}else{
pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
if( !pPtr ){
char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
sqlite3_result_error(context, zErr, -1);
sqlite3_free(zErr);
return;
}
}
sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
}
#ifdef SQLITE_TEST
#include <tcl.h>
#include <string.h>
/*
** Implementation of a special SQL scalar function for testing tokenizers
** designed to be used in concert with the Tcl testing framework. This
** function must be called with two arguments:
**
** SELECT <function-name>(<key-name>, <input-string>);
** SELECT <function-name>(<key-name>, <pointer>);
**
** where <function-name> is the name passed as the second argument
** to the sqlite3Fts3InitHashTable() function (e.g. 'fts3_tokenizer')
** concatenated with the string '_test' (e.g. 'fts3_tokenizer_test').
**
** The return value is a string that may be interpreted as a Tcl
** list. For each token in the <input-string>, three elements are
** added to the returned list. The first is the token position, the
** second is the token text (folded, stemmed, etc.) and the third is the
** substring of <input-string> associated with the token. For example,
** using the built-in "simple" tokenizer:
**
** SELECT fts_tokenizer_test('simple', 'I don't see how');
**
** will return the string:
**
** "{0 i I 1 dont don't 2 see see 3 how how}"
**
*/
static void testFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
fts3Hash *pHash;
sqlite3_tokenizer_module *p;
sqlite3_tokenizer *pTokenizer = 0;
sqlite3_tokenizer_cursor *pCsr = 0;
const char *zErr = 0;
const char *zName;
int nName;
const char *zInput;
int nInput;
const char *zArg = 0;
const char *zToken;
int nToken;
int iStart;
int iEnd;
int iPos;
Tcl_Obj *pRet;
assert( argc==2 || argc==3 );
nName = sqlite3_value_bytes(argv[0]);
zName = (const char *)sqlite3_value_text(argv[0]);
nInput = sqlite3_value_bytes(argv[argc-1]);
zInput = (const char *)sqlite3_value_text(argv[argc-1]);
if( argc==3 ){
zArg = (const char *)sqlite3_value_text(argv[1]);
}
pHash = (fts3Hash *)sqlite3_user_data(context);
p = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash, zName, nName+1);
if( !p ){
char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
sqlite3_result_error(context, zErr, -1);
sqlite3_free(zErr);
return;
}
pRet = Tcl_NewObj();
Tcl_IncrRefCount(pRet);
if( SQLITE_OK!=p->xCreate(zArg ? 1 : 0, &zArg, &pTokenizer) ){
zErr = "error in xCreate()";
goto finish;
}
pTokenizer->pModule = p;
if( SQLITE_OK!=p->xOpen(pTokenizer, zInput, nInput, &pCsr) ){
zErr = "error in xOpen()";
goto finish;
}
pCsr->pTokenizer = pTokenizer;
while( SQLITE_OK==p->xNext(pCsr, &zToken, &nToken, &iStart, &iEnd, &iPos) ){
Tcl_ListObjAppendElement(0, pRet, Tcl_NewIntObj(iPos));
Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
zToken = &zInput[iStart];
nToken = iEnd-iStart;
Tcl_ListObjAppendElement(0, pRet, Tcl_NewStringObj(zToken, nToken));
}
if( SQLITE_OK!=p->xClose(pCsr) ){
zErr = "error in xClose()";
goto finish;
}
if( SQLITE_OK!=p->xDestroy(pTokenizer) ){
zErr = "error in xDestroy()";
goto finish;
}
finish:
if( zErr ){
sqlite3_result_error(context, zErr, -1);
}else{
sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
}
Tcl_DecrRefCount(pRet);
}
static
int registerTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module *p
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts3_tokenizer(?, ?)";
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
sqlite3_bind_blob(pStmt, 2, &p, sizeof(p), SQLITE_STATIC);
sqlite3_step(pStmt);
return sqlite3_finalize(pStmt);
}
static
int queryTokenizer(
sqlite3 *db,
char *zName,
const sqlite3_tokenizer_module **pp
){
int rc;
sqlite3_stmt *pStmt;
const char zSql[] = "SELECT fts3_tokenizer(?)";
*pp = 0;
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
if( SQLITE_ROW==sqlite3_step(pStmt) ){
if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
}
}
return sqlite3_finalize(pStmt);
}
void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
/*
** Implementation of the scalar function fts3_tokenizer_internal_test().
** This function is used for testing only, it is not included in the
** build unless SQLITE_TEST is defined.
**
** The purpose of this is to test that the fts3_tokenizer() function
** can be used as designed by the C-code in the queryTokenizer and
** registerTokenizer() functions above. These two functions are repeated
** in the README.tokenizer file as an example, so it is important to
** test them.
**
** To run the tests, evaluate the fts3_tokenizer_internal_test() scalar
** function with no arguments. An assert() will fail if a problem is
** detected. i.e.:
**
** SELECT fts3_tokenizer_internal_test();
**
*/
static void intTestFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
int rc;
const sqlite3_tokenizer_module *p1;
const sqlite3_tokenizer_module *p2;
sqlite3 *db = (sqlite3 *)sqlite3_user_data(context);
/* Test the query function */
sqlite3Fts3SimpleTokenizerModule(&p1);
rc = queryTokenizer(db, "simple", &p2);
assert( rc==SQLITE_OK );
assert( p1==p2 );
rc = queryTokenizer(db, "nosuchtokenizer", &p2);
assert( rc==SQLITE_ERROR );
assert( p2==0 );
assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
/* Test the storage function */
rc = registerTokenizer(db, "nosuchtokenizer", p1);
assert( rc==SQLITE_OK );
rc = queryTokenizer(db, "nosuchtokenizer", &p2);
assert( rc==SQLITE_OK );
assert( p2==p1 );
sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
}
#endif
/*
** Set up SQL objects in database db used to access the contents of
** the hash table pointed to by argument pHash. The hash table must
** been initialised to use string keys, and to take a private copy
** of the key when a value is inserted. i.e. by a call similar to:
**
** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
**
** This function adds a scalar function (see header comment above
** scalarFunc() in this file for details) and, if ENABLE_TABLE is
** defined at compilation time, a temporary virtual table (see header
** comment above struct HashTableVtab) to the database schema. Both
** provide read/write access to the contents of *pHash.
**
** The third argument to this function, zName, is used as the name
** of both the scalar and, if created, the virtual table.
*/
int sqlite3Fts3InitHashTable(
sqlite3 *db,
fts3Hash *pHash,
const char *zName
){
int rc = SQLITE_OK;
void *p = (void *)pHash;
const int any = SQLITE_ANY;
char *zTest = 0;
char *zTest2 = 0;
#ifdef SQLITE_TEST
void *pdb = (void *)db;
zTest = sqlite3_mprintf("%s_test", zName);
zTest2 = sqlite3_mprintf("%s_internal_test", zName);
if( !zTest || !zTest2 ){
rc = SQLITE_NOMEM;
}
#endif
if( rc!=SQLITE_OK
|| (rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0))
#ifdef SQLITE_TEST
|| (rc = sqlite3_create_function(db, zTest, 2, any, p, testFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zTest, 3, any, p, testFunc, 0, 0))
|| (rc = sqlite3_create_function(db, zTest2, 0, any, pdb, intTestFunc, 0, 0))
#endif
);
sqlite3_free(zTest);
sqlite3_free(zTest2);
return rc;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-148
View File
@@ -1,148 +0,0 @@
/*
** 2006 July 10
**
** The author disclaims copyright to this source code.
**
*************************************************************************
** Defines the interface to tokenizers used by fulltext-search. There
** are three basic components:
**
** sqlite3_tokenizer_module is a singleton defining the tokenizer
** interface functions. This is essentially the class structure for
** tokenizers.
**
** sqlite3_tokenizer is used to define a particular tokenizer, perhaps
** including customization information defined at creation time.
**
** sqlite3_tokenizer_cursor is generated by a tokenizer to generate
** tokens from a particular input.
*/
#ifndef _FTS3_TOKENIZER_H_
#define _FTS3_TOKENIZER_H_
/* TODO(shess) Only used for SQLITE_OK and SQLITE_DONE at this time.
** If tokenizers are to be allowed to call sqlite3_*() functions, then
** we will need a way to register the API consistently.
*/
#include "sqlite3.h"
/*
** Structures used by the tokenizer interface. When a new tokenizer
** implementation is registered, the caller provides a pointer to
** an sqlite3_tokenizer_module containing pointers to the callback
** functions that make up an implementation.
**
** When an fts3 table is created, it passes any arguments passed to
** the tokenizer clause of the CREATE VIRTUAL TABLE statement to the
** sqlite3_tokenizer_module.xCreate() function of the requested tokenizer
** implementation. The xCreate() function in turn returns an
** sqlite3_tokenizer structure representing the specific tokenizer to
** be used for the fts3 table (customized by the tokenizer clause arguments).
**
** To tokenize an input buffer, the sqlite3_tokenizer_module.xOpen()
** method is called. It returns an sqlite3_tokenizer_cursor object
** that may be used to tokenize a specific input buffer based on
** the tokenization rules supplied by a specific sqlite3_tokenizer
** object.
*/
typedef struct sqlite3_tokenizer_module sqlite3_tokenizer_module;
typedef struct sqlite3_tokenizer sqlite3_tokenizer;
typedef struct sqlite3_tokenizer_cursor sqlite3_tokenizer_cursor;
struct sqlite3_tokenizer_module {
/*
** Structure version. Should always be set to 0.
*/
int iVersion;
/*
** Create a new tokenizer. The values in the argv[] array are the
** arguments passed to the "tokenizer" clause of the CREATE VIRTUAL
** TABLE statement that created the fts3 table. For example, if
** the following SQL is executed:
**
** CREATE .. USING fts3( ... , tokenizer <tokenizer-name> arg1 arg2)
**
** then argc is set to 2, and the argv[] array contains pointers
** to the strings "arg1" and "arg2".
**
** This method should return either SQLITE_OK (0), or an SQLite error
** code. If SQLITE_OK is returned, then *ppTokenizer should be set
** to point at the newly created tokenizer structure. The generic
** sqlite3_tokenizer.pModule variable should not be initialised by
** this callback. The caller will do so.
*/
int (*xCreate)(
int argc, /* Size of argv array */
const char *const*argv, /* Tokenizer argument strings */
sqlite3_tokenizer **ppTokenizer /* OUT: Created tokenizer */
);
/*
** Destroy an existing tokenizer. The fts3 module calls this method
** exactly once for each successful call to xCreate().
*/
int (*xDestroy)(sqlite3_tokenizer *pTokenizer);
/*
** Create a tokenizer cursor to tokenize an input buffer. The caller
** is responsible for ensuring that the input buffer remains valid
** until the cursor is closed (using the xClose() method).
*/
int (*xOpen)(
sqlite3_tokenizer *pTokenizer, /* Tokenizer object */
const char *pInput, int nBytes, /* Input buffer */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Created tokenizer cursor */
);
/*
** Destroy an existing tokenizer cursor. The fts3 module calls this
** method exactly once for each successful call to xOpen().
*/
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
/*
** Retrieve the next token from the tokenizer cursor pCursor. This
** method should either return SQLITE_OK and set the values of the
** "OUT" variables identified below, or SQLITE_DONE to indicate that
** the end of the buffer has been reached, or an SQLite error code.
**
** *ppToken should be set to point at a buffer containing the
** normalized version of the token (i.e. after any case-folding and/or
** stemming has been performed). *pnBytes should be set to the length
** of this buffer in bytes. The input text that generated the token is
** identified by the byte offsets returned in *piStartOffset and
** *piEndOffset. *piStartOffset should be set to the index of the first
** byte of the token in the input buffer. *piEndOffset should be set
** to the index of the first byte just past the end of the token in
** the input buffer.
**
** The buffer *ppToken is set to point at is managed by the tokenizer
** implementation. It is only required to be valid until the next call
** to xNext() or xClose().
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
** should be converted to zInput.
*/
int (*xNext)(
sqlite3_tokenizer_cursor *pCursor, /* Tokenizer cursor */
const char **ppToken, int *pnBytes, /* OUT: Normalized text for token */
int *piStartOffset, /* OUT: Byte offset of token in input buffer */
int *piEndOffset, /* OUT: Byte offset of end of token in input buffer */
int *piPosition /* OUT: Number of tokens returned before this one */
);
};
struct sqlite3_tokenizer {
const sqlite3_tokenizer_module *pModule; /* The module for this tokenizer */
/* Tokenizer implementations will typically add additional fields */
};
struct sqlite3_tokenizer_cursor {
sqlite3_tokenizer *pTokenizer; /* Tokenizer for this cursor. */
/* Tokenizer implementations will typically add additional fields */
};
#endif /* _FTS3_TOKENIZER_H_ */
-230
View File
@@ -1,230 +0,0 @@
/*
** 2006 Oct 10
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** Implementation of the "simple" full-text-search tokenizer.
*/
/*
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts3_tokenizer.h"
typedef struct simple_tokenizer {
sqlite3_tokenizer base;
char delim[128]; /* flag ASCII delimiters */
} simple_tokenizer;
typedef struct simple_tokenizer_cursor {
sqlite3_tokenizer_cursor base;
const char *pInput; /* input we are tokenizing */
int nBytes; /* size of the input */
int iOffset; /* current position in pInput */
int iToken; /* index of next token to be returned */
char *pToken; /* storage for current token */
int nTokenAllocated; /* space allocated to zToken buffer */
} simple_tokenizer_cursor;
/* Forward declaration */
static const sqlite3_tokenizer_module simpleTokenizerModule;
static int simpleDelim(simple_tokenizer *t, unsigned char c){
return c<0x80 && t->delim[c];
}
/*
** Create a new tokenizer instance.
*/
static int simpleCreate(
int argc, const char * const *argv,
sqlite3_tokenizer **ppTokenizer
){
simple_tokenizer *t;
t = (simple_tokenizer *) sqlite3_malloc(sizeof(*t));
if( t==NULL ) return SQLITE_NOMEM;
memset(t, 0, sizeof(*t));
/* TODO(shess) Delimiters need to remain the same from run to run,
** else we need to reindex. One solution would be a meta-table to
** track such information in the database, then we'd only want this
** information on the initial create.
*/
if( argc>1 ){
int i, n = strlen(argv[1]);
for(i=0; i<n; i++){
unsigned char ch = argv[1][i];
/* We explicitly don't support UTF-8 delimiters for now. */
if( ch>=0x80 ){
sqlite3_free(t);
return SQLITE_ERROR;
}
t->delim[ch] = 1;
}
} else {
/* Mark non-alphanumeric ASCII characters as delimiters */
int i;
for(i=1; i<0x80; i++){
t->delim[i] = !isalnum(i);
}
}
*ppTokenizer = &t->base;
return SQLITE_OK;
}
/*
** Destroy a tokenizer
*/
static int simpleDestroy(sqlite3_tokenizer *pTokenizer){
sqlite3_free(pTokenizer);
return SQLITE_OK;
}
/*
** Prepare to begin tokenizing a particular string. The input
** string to be tokenized is pInput[0..nBytes-1]. A cursor
** used to incrementally tokenize this string is returned in
** *ppCursor.
*/
static int simpleOpen(
sqlite3_tokenizer *pTokenizer, /* The tokenizer */
const char *pInput, int nBytes, /* String to be tokenized */
sqlite3_tokenizer_cursor **ppCursor /* OUT: Tokenization cursor */
){
simple_tokenizer_cursor *c;
c = (simple_tokenizer_cursor *) sqlite3_malloc(sizeof(*c));
if( c==NULL ) return SQLITE_NOMEM;
c->pInput = pInput;
if( pInput==0 ){
c->nBytes = 0;
}else if( nBytes<0 ){
c->nBytes = (int)strlen(pInput);
}else{
c->nBytes = nBytes;
}
c->iOffset = 0; /* start tokenizing at the beginning */
c->iToken = 0;
c->pToken = NULL; /* no space allocated, yet. */
c->nTokenAllocated = 0;
*ppCursor = &c->base;
return SQLITE_OK;
}
/*
** Close a tokenization cursor previously opened by a call to
** simpleOpen() above.
*/
static int simpleClose(sqlite3_tokenizer_cursor *pCursor){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
sqlite3_free(c->pToken);
sqlite3_free(c);
return SQLITE_OK;
}
/*
** Extract the next token from a tokenization cursor. The cursor must
** have been opened by a prior call to simpleOpen().
*/
static int simpleNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by simpleOpen */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
){
simple_tokenizer_cursor *c = (simple_tokenizer_cursor *) pCursor;
simple_tokenizer *t = (simple_tokenizer *) pCursor->pTokenizer;
unsigned char *p = (unsigned char *)c->pInput;
while( c->iOffset<c->nBytes ){
int iStartOffset;
/* Scan past delimiter characters */
while( c->iOffset<c->nBytes && simpleDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
/* Count non-delimiter characters. */
iStartOffset = c->iOffset;
while( c->iOffset<c->nBytes && !simpleDelim(t, p[c->iOffset]) ){
c->iOffset++;
}
if( c->iOffset>iStartOffset ){
int i, n = c->iOffset-iStartOffset;
if( n>c->nTokenAllocated ){
c->nTokenAllocated = n+20;
c->pToken = sqlite3_realloc(c->pToken, c->nTokenAllocated);
if( c->pToken==NULL ) return SQLITE_NOMEM;
}
for(i=0; i<n; i++){
/* TODO(shess) This needs expansion to handle UTF-8
** case-insensitivity.
*/
unsigned char ch = p[iStartOffset+i];
c->pToken[i] = ch<0x80 ? tolower(ch) : ch;
}
*ppToken = c->pToken;
*pnBytes = n;
*piStartOffset = iStartOffset;
*piEndOffset = c->iOffset;
*piPosition = c->iToken++;
return SQLITE_OK;
}
}
return SQLITE_DONE;
}
/*
** The set of routines that implement the simple tokenizer
*/
static const sqlite3_tokenizer_module simpleTokenizerModule = {
0,
simpleCreate,
simpleDestroy,
simpleOpen,
simpleClose,
simpleNext,
};
/*
** Allocate a new simple tokenizer. Return a pointer to the new
** tokenizer in *ppModule
*/
void sqlite3Fts3SimpleTokenizerModule(
sqlite3_tokenizer_module const**ppModule
){
*ppModule = &simpleTokenizerModule;
}
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-115
View File
@@ -1,115 +0,0 @@
#!/usr/bin/tclsh
#
# This script builds a single C code file holding all of FTS3 code.
# The name of the output file is fts3amal.c. To build this file,
# first do:
#
# make target_source
#
# The make target above moves all of the source code files into
# a subdirectory named "tsrc". (This script expects to find the files
# there and will not work if they are not found.)
#
# After the "tsrc" directory has been created and populated, run
# this script:
#
# tclsh mkfts3amal.tcl
#
# The amalgamated FTS3 code will be written into fts3amal.c
#
# Open the output file and write a header comment at the beginning
# of the file.
#
set out [open fts3amal.c w]
set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1]
puts $out [subst \
{/******************************************************************************
** This file is an amalgamation of separate C source files from the SQLite
** Full Text Search extension 2 (fts3). By combining all the individual C
** code files into this single large file, the entire code can be compiled
** as a one translation unit. This allows many compilers to do optimizations
** that would not be possible if the files were compiled separately. It also
** makes the code easier to import into other projects.
**
** This amalgamation was generated on $today.
*/}]
# These are the header files used by FTS3. The first time any of these
# files are seen in a #include statement in the C code, include the complete
# text of the file in-line. The file only needs to be included once.
#
foreach hdr {
fts3.h
fts3_hash.h
fts3_tokenizer.h
sqlite3.h
sqlite3ext.h
} {
set available_hdr($hdr) 1
}
# 78 stars used for comment formatting.
set s78 \
{*****************************************************************************}
# Insert a comment into the code
#
proc section_comment {text} {
global out s78
set n [string length $text]
set nstar [expr {60 - $n}]
set stars [string range $s78 0 $nstar]
puts $out "/************** $text $stars/"
}
# Read the source file named $filename and write it into the
# sqlite3.c output file. If any #include statements are seen,
# process them approprately.
#
proc copy_file {filename} {
global seen_hdr available_hdr out
set tail [file tail $filename]
section_comment "Begin file $tail"
set in [open $filename r]
while {![eof $in]} {
set line [gets $in]
if {[regexp {^#\s*include\s+["<]([^">]+)[">]} $line all hdr]} {
if {[info exists available_hdr($hdr)]} {
if {$available_hdr($hdr)} {
section_comment "Include $hdr in the middle of $tail"
copy_file tsrc/$hdr
section_comment "Continuing where we left off in $tail"
}
} elseif {![info exists seen_hdr($hdr)]} {
set seen_hdr($hdr) 1
puts $out $line
}
} elseif {[regexp {^#ifdef __cplusplus} $line]} {
puts $out "#if 0"
} elseif {[regexp {^#line} $line]} {
# Skip #line directives.
} else {
puts $out $line
}
}
close $in
section_comment "End of $tail"
}
# Process the source files. Process files containing commonly
# used subroutines first in order to help the compiler find
# inlining opportunities.
#
foreach file {
fts3.c
fts3_hash.c
fts3_porter.c
fts3_tokenizer.c
fts3_tokenizer1.c
} {
copy_file tsrc/$file
}
close $out
-170
View File
@@ -1,170 +0,0 @@
This directory contains source code for the SQLite "ICU" extension, an
integration of the "International Components for Unicode" library with
SQLite. Documentation follows.
1. Features
1.1 SQL Scalars upper() and lower()
1.2 Unicode Aware LIKE Operator
1.3 ICU Collation Sequences
1.4 SQL REGEXP Operator
2. Compilation and Usage
3. Bugs, Problems and Security Issues
3.1 The "case_sensitive_like" Pragma
3.2 The SQLITE_MAX_LIKE_PATTERN_LENGTH Macro
3.3 Collation Sequence Security Issue
1. FEATURES
1.1 SQL Scalars upper() and lower()
SQLite's built-in implementations of these two functions only
provide case mapping for the 26 letters used in the English
language. The ICU based functions provided by this extension
provide case mapping, where defined, for the full range of
unicode characters.
ICU provides two types of case mapping, "general" case mapping and
"language specific". Refer to ICU documentation for the differences
between the two. Specifically:
http://www.icu-project.org/userguide/caseMappings.html
http://www.icu-project.org/userguide/posix.html#case_mappings
To utilise "general" case mapping, the upper() or lower() scalar
functions are invoked with one argument:
upper('ABC') -> 'abc'
lower('abc') -> 'ABC'
To access ICU "language specific" case mapping, upper() or lower()
should be invoked with two arguments. The second argument is the name
of the locale to use. Passing an empty string ("") or SQL NULL value
as the second argument is the same as invoking the 1 argument version
of upper() or lower():
lower('I', 'en_us') -> 'i'
lower('I', 'tr_tr') -> 'ı' (small dotless i)
1.2 Unicode Aware LIKE Operator
Similarly to the upper() and lower() functions, the built-in SQLite LIKE
operator understands case equivalence for the 26 letters of the English
language alphabet. The implementation of LIKE included in this
extension uses the ICU function u_foldCase() to provide case
independent comparisons for the full range of unicode characters.
The U_FOLD_CASE_DEFAULT flag is passed to u_foldCase(), meaning the
dotless 'I' character used in the Turkish language is considered
to be in the same equivalence class as the dotted 'I' character
used by many languages (including English).
1.3 ICU Collation Sequences
A special SQL scalar function, icu_load_collation() is provided that
may be used to register ICU collation sequences with SQLite. It
is always called with exactly two arguments, the ICU locale
identifying the collation sequence to ICU, and the name of the
SQLite collation sequence to create. For example, to create an
SQLite collation sequence named "turkish" using Turkish language
sorting rules, the SQL statement:
SELECT icu_load_collation('tr_TR', 'turkish');
Or, for Australian English:
SELECT icu_load_collation('en_AU', 'australian');
The identifiers "turkish" and "australian" may then be used
as collation sequence identifiers in SQL statements:
CREATE TABLE aust_turkish_penpals(
australian_penpal_name TEXT COLLATE australian,
turkish_penpal_name TEXT COLLATE turkish
);
1.4 SQL REGEXP Operator
This extension provides an implementation of the SQL binary
comparision operator "REGEXP", based on the regular expression functions
provided by the ICU library. The syntax of the operator is as described
in SQLite documentation:
<string> REGEXP <re-pattern>
This extension uses the ICU defaults for regular expression matching
behaviour. Specifically, this means that:
* Matching is case-sensitive,
* Regular expression comments are not allowed within patterns, and
* The '^' and '$' characters match the beginning and end of the
<string> argument, not the beginning and end of lines within
the <string> argument.
Even more specifically, the value passed to the "flags" parameter
of ICU C function uregex_open() is 0.
2 COMPILATION AND USAGE
The easiest way to compile and use the ICU extension is to build
and use it as a dynamically loadable SQLite extension. To do this
using gcc on *nix:
gcc -shared icu.c `icu-config --ldflags` -o libSqliteIcu.so
You may need to add "-I" flags so that gcc can find sqlite3ext.h
and sqlite3.h. The resulting shared lib, libSqliteIcu.so, may be
loaded into sqlite in the same way as any other dynamically loadable
extension.
3 BUGS, PROBLEMS AND SECURITY ISSUES
3.1 The "case_sensitive_like" Pragma
This extension does not work well with the "case_sensitive_like"
pragma. If this pragma is used before the ICU extension is loaded,
then the pragma has no effect. If the pragma is used after the ICU
extension is loaded, then SQLite ignores the ICU implementation and
always uses the built-in LIKE operator.
The ICU extension LIKE operator is always case insensitive.
3.2 The SQLITE_MAX_LIKE_PATTERN_LENGTH Macro
Passing very long patterns to the built-in SQLite LIKE operator can
cause a stack overflow. To curb this problem, SQLite defines the
SQLITE_MAX_LIKE_PATTERN_LENGTH macro as the maximum length of a
pattern in bytes (irrespective of encoding). The default value is
defined in internal header file "limits.h".
The ICU extension LIKE implementation suffers from the same
problem and uses the same solution. However, since the ICU extension
code does not include the SQLite file "limits.h", modifying
the default value therein does not affect the ICU extension.
The default value of SQLITE_MAX_LIKE_PATTERN_LENGTH used by
the ICU extension LIKE operator is 50000, defined in source
file "icu.c".
3.3 Collation Sequence Security Issue
Internally, SQLite assumes that indices stored in database files
are sorted according to the collation sequence indicated by the
SQL schema. Changing the definition of a collation sequence after
an index has been built is therefore equivalent to database
corruption. The SQLite library is not very well tested under
these conditions, and may contain potential buffer overruns
or other programming errors that could be exploited by a malicious
programmer.
If the ICU extension is used in an environment where potentially
malicious users may execute arbitrary SQL (i.e. gears), they
should be prevented from invoking the icu_load_collation() function,
possibly using the authorisation callback.
-499
View File
@@ -1,499 +0,0 @@
/*
** 2007 May 6
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: icu.c,v 1.7 2007/12/13 21:54:11 drh Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
** for handling unicode data) and SQLite. The integration uses
** ICU to provide the following to SQLite:
**
** * An implementation of the SQL regexp() function (and hence REGEXP
** operator) using the ICU uregex_XX() APIs.
**
** * Implementations of the SQL scalar upper() and lower() functions
** for case mapping.
**
** * Integration of ICU and SQLite collation seqences.
**
** * An implementation of the LIKE operator that uses ICU to
** provide case-independent matching.
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_ICU)
/* Include ICU headers */
#include <unicode/utypes.h>
#include <unicode/uregex.h>
#include <unicode/ustring.h>
#include <unicode/ucol.h>
#include <assert.h>
#ifndef SQLITE_CORE
#include "sqlite3ext.h"
SQLITE_EXTENSION_INIT1
#else
#include "sqlite3.h"
#endif
/*
** Maximum length (in bytes) of the pattern in a LIKE or GLOB
** operator.
*/
#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
#endif
/*
** Version of sqlite3_free() that is always a function, never a macro.
*/
static void xFree(void *p){
sqlite3_free(p);
}
/*
** Compare two UTF-8 strings for equality where the first string is
** a "LIKE" expression. Return true (1) if they are the same and
** false (0) if they are different.
*/
static int icuLikeCompare(
const uint8_t *zPattern, /* LIKE pattern */
const uint8_t *zString, /* The UTF-8 string to compare against */
const UChar32 uEsc /* The escape character */
){
static const int MATCH_ONE = (UChar32)'_';
static const int MATCH_ALL = (UChar32)'%';
int iPattern = 0; /* Current byte index in zPattern */
int iString = 0; /* Current byte index in zString */
int prevEscape = 0; /* True if the previous character was uEsc */
while( zPattern[iPattern]!=0 ){
/* Read (and consume) the next character from the input pattern. */
UChar32 uPattern;
U8_NEXT_UNSAFE(zPattern, iPattern, uPattern);
assert(uPattern!=0);
/* There are now 4 possibilities:
**
** 1. uPattern is an unescaped match-all character "%",
** 2. uPattern is an unescaped match-one character "_",
** 3. uPattern is an unescaped escape character, or
** 4. uPattern is to be handled as an ordinary character
*/
if( !prevEscape && uPattern==MATCH_ALL ){
/* Case 1. */
uint8_t c;
/* Skip any MATCH_ALL or MATCH_ONE characters that follow a
** MATCH_ALL. For each MATCH_ONE, skip one character in the
** test string.
*/
while( (c=zPattern[iPattern]) == MATCH_ALL || c == MATCH_ONE ){
if( c==MATCH_ONE ){
if( zString[iString]==0 ) return 0;
U8_FWD_1_UNSAFE(zString, iString);
}
iPattern++;
}
if( zPattern[iPattern]==0 ) return 1;
while( zString[iString] ){
if( icuLikeCompare(&zPattern[iPattern], &zString[iString], uEsc) ){
return 1;
}
U8_FWD_1_UNSAFE(zString, iString);
}
return 0;
}else if( !prevEscape && uPattern==MATCH_ONE ){
/* Case 2. */
if( zString[iString]==0 ) return 0;
U8_FWD_1_UNSAFE(zString, iString);
}else if( !prevEscape && uPattern==uEsc){
/* Case 3. */
prevEscape = 1;
}else{
/* Case 4. */
UChar32 uString;
U8_NEXT_UNSAFE(zString, iString, uString);
uString = u_foldCase(uString, U_FOLD_CASE_DEFAULT);
uPattern = u_foldCase(uPattern, U_FOLD_CASE_DEFAULT);
if( uString!=uPattern ){
return 0;
}
prevEscape = 0;
}
}
return zString[iString]==0;
}
/*
** Implementation of the like() SQL function. This function implements
** the build-in LIKE operator. The first argument to the function is the
** pattern and the second argument is the string. So, the SQL statements:
**
** A LIKE B
**
** is implemented as like(B, A). If there is an escape character E,
**
** A LIKE B ESCAPE E
**
** is mapped to like(B, A, E).
*/
static void icuLikeFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
const unsigned char *zA = sqlite3_value_text(argv[0]);
const unsigned char *zB = sqlite3_value_text(argv[1]);
UChar32 uEsc = 0;
/* Limit the length of the LIKE or GLOB pattern to avoid problems
** of deep recursion and N*N behavior in patternCompare().
*/
if( sqlite3_value_bytes(argv[0])>SQLITE_MAX_LIKE_PATTERN_LENGTH ){
sqlite3_result_error(context, "LIKE or GLOB pattern too complex", -1);
return;
}
if( argc==3 ){
/* The escape character string must consist of a single UTF-8 character.
** Otherwise, return an error.
*/
int nE= sqlite3_value_bytes(argv[2]);
const unsigned char *zE = sqlite3_value_text(argv[2]);
int i = 0;
if( zE==0 ) return;
U8_NEXT(zE, i, nE, uEsc);
if( i!=nE){
sqlite3_result_error(context,
"ESCAPE expression must be a single character", -1);
return;
}
}
if( zA && zB ){
sqlite3_result_int(context, icuLikeCompare(zA, zB, uEsc));
}
}
/*
** This function is called when an ICU function called from within
** the implementation of an SQL scalar function returns an error.
**
** The scalar function context passed as the first argument is
** loaded with an error message based on the following two args.
*/
static void icuFunctionError(
sqlite3_context *pCtx, /* SQLite scalar function context */
const char *zName, /* Name of ICU function that failed */
UErrorCode e /* Error code returned by ICU function */
){
char zBuf[128];
sqlite3_snprintf(128, zBuf, "ICU error: %s(): %s", zName, u_errorName(e));
zBuf[127] = '\0';
sqlite3_result_error(pCtx, zBuf, -1);
}
/*
** Function to delete compiled regexp objects. Registered as
** a destructor function with sqlite3_set_auxdata().
*/
static void icuRegexpDelete(void *p){
URegularExpression *pExpr = (URegularExpression *)p;
uregex_close(pExpr);
}
/*
** Implementation of SQLite REGEXP operator. This scalar function takes
** two arguments. The first is a regular expression pattern to compile
** the second is a string to match against that pattern. If either
** argument is an SQL NULL, then NULL Is returned. Otherwise, the result
** is 1 if the string matches the pattern, or 0 otherwise.
**
** SQLite maps the regexp() function to the regexp() operator such
** that the following two are equivalent:
**
** zString REGEXP zPattern
** regexp(zPattern, zString)
**
** Uses the following ICU regexp APIs:
**
** uregex_open()
** uregex_matches()
** uregex_close()
*/
static void icuRegexpFunc(sqlite3_context *p, int nArg, sqlite3_value **apArg){
UErrorCode status = U_ZERO_ERROR;
URegularExpression *pExpr;
UBool res;
const UChar *zString = sqlite3_value_text16(apArg[1]);
/* If the left hand side of the regexp operator is NULL,
** then the result is also NULL.
*/
if( !zString ){
return;
}
pExpr = sqlite3_get_auxdata(p, 0);
if( !pExpr ){
const UChar *zPattern = sqlite3_value_text16(apArg[0]);
if( !zPattern ){
return;
}
pExpr = uregex_open(zPattern, -1, 0, 0, &status);
if( U_SUCCESS(status) ){
sqlite3_set_auxdata(p, 0, pExpr, icuRegexpDelete);
}else{
assert(!pExpr);
icuFunctionError(p, "uregex_open", status);
return;
}
}
/* Configure the text that the regular expression operates on. */
uregex_setText(pExpr, zString, -1, &status);
if( !U_SUCCESS(status) ){
icuFunctionError(p, "uregex_setText", status);
return;
}
/* Attempt the match */
res = uregex_matches(pExpr, 0, &status);
if( !U_SUCCESS(status) ){
icuFunctionError(p, "uregex_matches", status);
return;
}
/* Set the text that the regular expression operates on to a NULL
** pointer. This is not really necessary, but it is tidier than
** leaving the regular expression object configured with an invalid
** pointer after this function returns.
*/
uregex_setText(pExpr, 0, 0, &status);
/* Return 1 or 0. */
sqlite3_result_int(p, res ? 1 : 0);
}
/*
** Implementations of scalar functions for case mapping - upper() and
** lower(). Function upper() converts its input to upper-case (ABC).
** Function lower() converts to lower-case (abc).
**
** ICU provides two types of case mapping, "general" case mapping and
** "language specific". Refer to ICU documentation for the differences
** between the two.
**
** To utilise "general" case mapping, the upper() or lower() scalar
** functions are invoked with one argument:
**
** upper('ABC') -> 'abc'
** lower('abc') -> 'ABC'
**
** To access ICU "language specific" case mapping, upper() or lower()
** should be invoked with two arguments. The second argument is the name
** of the locale to use. Passing an empty string ("") or SQL NULL value
** as the second argument is the same as invoking the 1 argument version
** of upper() or lower().
**
** lower('I', 'en_us') -> 'i'
** lower('I', 'tr_tr') -> 'ı' (small dotless i)
**
** http://www.icu-project.org/userguide/posix.html#case_mappings
*/
static void icuCaseFunc16(sqlite3_context *p, int nArg, sqlite3_value **apArg){
const UChar *zInput;
UChar *zOutput;
int nInput;
int nOutput;
UErrorCode status = U_ZERO_ERROR;
const char *zLocale = 0;
assert(nArg==1 || nArg==2);
if( nArg==2 ){
zLocale = (const char *)sqlite3_value_text(apArg[1]);
}
zInput = sqlite3_value_text16(apArg[0]);
if( !zInput ){
return;
}
nInput = sqlite3_value_bytes16(apArg[0]);
nOutput = nInput * 2 + 2;
zOutput = sqlite3_malloc(nOutput);
if( !zOutput ){
return;
}
if( sqlite3_user_data(p) ){
u_strToUpper(zOutput, nOutput/2, zInput, nInput/2, zLocale, &status);
}else{
u_strToLower(zOutput, nOutput/2, zInput, nInput/2, zLocale, &status);
}
if( !U_SUCCESS(status) ){
icuFunctionError(p, "u_strToLower()/u_strToUpper", status);
return;
}
sqlite3_result_text16(p, zOutput, -1, xFree);
}
/*
** Collation sequence destructor function. The pCtx argument points to
** a UCollator structure previously allocated using ucol_open().
*/
static void icuCollationDel(void *pCtx){
UCollator *p = (UCollator *)pCtx;
ucol_close(p);
}
/*
** Collation sequence comparison function. The pCtx argument points to
** a UCollator structure previously allocated using ucol_open().
*/
static int icuCollationColl(
void *pCtx,
int nLeft,
const void *zLeft,
int nRight,
const void *zRight
){
UCollationResult res;
UCollator *p = (UCollator *)pCtx;
res = ucol_strcoll(p, (UChar *)zLeft, nLeft/2, (UChar *)zRight, nRight/2);
switch( res ){
case UCOL_LESS: return -1;
case UCOL_GREATER: return +1;
case UCOL_EQUAL: return 0;
}
assert(!"Unexpected return value from ucol_strcoll()");
return 0;
}
/*
** Implementation of the scalar function icu_load_collation().
**
** This scalar function is used to add ICU collation based collation
** types to an SQLite database connection. It is intended to be called
** as follows:
**
** SELECT icu_load_collation(<locale>, <collation-name>);
**
** Where <locale> is a string containing an ICU locale identifier (i.e.
** "en_AU", "tr_TR" etc.) and <collation-name> is the name of the
** collation sequence to create.
*/
static void icuLoadCollation(
sqlite3_context *p,
int nArg,
sqlite3_value **apArg
){
sqlite3 *db = (sqlite3 *)sqlite3_user_data(p);
UErrorCode status = U_ZERO_ERROR;
const char *zLocale; /* Locale identifier - (eg. "jp_JP") */
const char *zName; /* SQL Collation sequence name (eg. "japanese") */
UCollator *pUCollator; /* ICU library collation object */
int rc; /* Return code from sqlite3_create_collation_x() */
assert(nArg==2);
zLocale = (const char *)sqlite3_value_text(apArg[0]);
zName = (const char *)sqlite3_value_text(apArg[1]);
if( !zLocale || !zName ){
return;
}
pUCollator = ucol_open(zLocale, &status);
if( !U_SUCCESS(status) ){
icuFunctionError(p, "ucol_open", status);
return;
}
assert(p);
rc = sqlite3_create_collation_v2(db, zName, SQLITE_UTF16, (void *)pUCollator,
icuCollationColl, icuCollationDel
);
if( rc!=SQLITE_OK ){
ucol_close(pUCollator);
sqlite3_result_error(p, "Error registering collation function", -1);
}
}
/*
** Register the ICU extension functions with database db.
*/
int sqlite3IcuInit(sqlite3 *db){
struct IcuScalar {
const char *zName; /* Function name */
int nArg; /* Number of arguments */
int enc; /* Optimal text encoding */
void *pContext; /* sqlite3_user_data() context */
void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
} scalars[] = {
{"regexp",-1, SQLITE_ANY, 0, icuRegexpFunc},
{"lower", 1, SQLITE_UTF16, 0, icuCaseFunc16},
{"lower", 2, SQLITE_UTF16, 0, icuCaseFunc16},
{"upper", 1, SQLITE_UTF16, (void*)1, icuCaseFunc16},
{"upper", 2, SQLITE_UTF16, (void*)1, icuCaseFunc16},
{"lower", 1, SQLITE_UTF8, 0, icuCaseFunc16},
{"lower", 2, SQLITE_UTF8, 0, icuCaseFunc16},
{"upper", 1, SQLITE_UTF8, (void*)1, icuCaseFunc16},
{"upper", 2, SQLITE_UTF8, (void*)1, icuCaseFunc16},
{"like", 2, SQLITE_UTF8, 0, icuLikeFunc},
{"like", 3, SQLITE_UTF8, 0, icuLikeFunc},
{"icu_load_collation", 2, SQLITE_UTF8, (void*)db, icuLoadCollation},
};
int rc = SQLITE_OK;
int i;
for(i=0; rc==SQLITE_OK && i<(sizeof(scalars)/sizeof(struct IcuScalar)); i++){
struct IcuScalar *p = &scalars[i];
rc = sqlite3_create_function(
db, p->zName, p->nArg, p->enc, p->pContext, p->xFunc, 0, 0
);
}
return rc;
}
#if !SQLITE_CORE
int sqlite3_extension_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
SQLITE_EXTENSION_INIT2(pApi)
return sqlite3IcuInit(db);
}
#endif
#endif
-27
View File
@@ -1,27 +0,0 @@
/*
** 2008 May 26
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This header file is used by programs that want to link against the
** ICU extension. All it does is declare the sqlite3IcuInit() interface.
*/
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3IcuInit(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-120
View File
@@ -1,120 +0,0 @@
This directory contains an SQLite extension that implements a virtual
table type that allows users to create, query and manipulate r-tree[1]
data structures inside of SQLite databases. Users create, populate
and query r-tree structures using ordinary SQL statements.
1. SQL Interface
1.1 Table Creation
1.2 Data Manipulation
1.3 Data Querying
1.4 Introspection and Analysis
2. Compilation and Deployment
3. References
1. SQL INTERFACE
1.1 Table Creation.
All r-tree virtual tables have an odd number of columns between
3 and 11. Unlike regular SQLite tables, r-tree tables are strongly
typed.
The leftmost column is always the pimary key and contains 64-bit
integer values. Each subsequent column contains a 32-bit real
value. For each pair of real values, the first (leftmost) must be
less than or equal to the second. R-tree tables may be
constructed using the following syntax:
CREATE VIRTUAL TABLE <name> USING rtree(<column-names>)
For example:
CREATE VIRTUAL TABLE boxes USING rtree(boxno, xmin, xmax, ymin, ymax);
INSERT INTO boxes VALUES(1, 1.0, 3.0, 2.0, 4.0);
Constructing a virtual r-tree table <name> creates the following three
real tables in the database to store the data structure:
<name>_node
<name>_rowid
<name>_parent
Dropping or modifying the contents of these tables directly will
corrupt the r-tree structure. To delete an r-tree from a database,
use a regular DROP TABLE statement:
DROP TABLE <name>;
Dropping the main r-tree table automatically drops the automatically
created tables.
1.2 Data Manipulation (INSERT, UPDATE, DELETE).
The usual INSERT, UPDATE or DELETE syntax is used to manipulate data
stored in an r-tree table. Please note the following:
* Inserting a NULL value into the primary key column has the
same effect as inserting a NULL into an INTEGER PRIMARY KEY
column of a regular table. The system automatically assigns
an unused integer key value to the new record. Usually, this
is one greater than the largest primary key value currently
present in the table.
* Attempting to insert a duplicate primary key value fails with
an SQLITE_CONSTRAINT error.
* Attempting to insert or modify a record such that the value
stored in the (N*2)th column is greater than that stored in
the (N*2+1)th column fails with an SQLITE_CONSTRAINT error.
* When a record is inserted, values are always converted to
the required type (64-bit integer or 32-bit real) as if they
were part of an SQL CAST expression. Non-numeric strings are
converted to zero.
1.3 Queries.
R-tree tables may be queried using all of the same SQL syntax supported
by regular tables. However, some query patterns are more efficient
than others.
R-trees support fast lookup by primary key value (O(logN), like
regular tables).
Any combination of equality and range (<, <=, >, >=) constraints
on spatial data columns may be used to optimize other queries. This
is the key advantage to using r-tree tables instead of creating
indices on regular tables.
1.4 Introspection and Analysis.
TODO: Describe rtreenode() and rtreedepth() functions.
2. COMPILATION AND USAGE
The easiest way to compile and use the RTREE extension is to build
and use it as a dynamically loadable SQLite extension. To do this
using gcc on *nix:
gcc -shared rtree.c -o libSqliteRtree.so
You may need to add "-I" flags so that gcc can find sqlite3ext.h
and sqlite3.h. The resulting shared lib, libSqliteRtree.so, may be
loaded into sqlite in the same way as any other dynamicly loadable
extension.
3. REFERENCES
[1] Atonin Guttman, "R-trees - A Dynamic Index Structure For Spatial
Searching", University of California Berkeley, 1984.
[2] Norbert Beckmann, Hans-Peter Kriegel, Ralf Schneider, Bernhard Seeger,
"The R*-tree: An Efficient and Robust Access Method for Points and
Rectangles", Universitaet Bremen, 1990.
-2864
View File
File diff suppressed because it is too large Load Diff
-26
View File
@@ -1,26 +0,0 @@
/*
** 2008 May 26
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
******************************************************************************
**
** This header file is used by programs that want to link against the
** RTREE library. All it does is declare the sqlite3RtreeInit() interface.
*/
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3RtreeInit(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
-404
View File
@@ -1,404 +0,0 @@
# 2008 Feb 19
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# The focus of this file is testing the r-tree extension.
#
# $Id: rtree1.test,v 1.7 2009/07/17 16:54:48 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source [file join [file dirname [info script]] rtree_util.tcl]
source $testdir/tester.tcl
# Test plan:
#
# rtree-1.*: Creating/destroying r-tree tables.
# rtree-2.*: Test the implicit constraints - unique rowid and
# (coord[N]<=coord[N+1]) for even values of N. Also
# automatic assigning of rowid values.
# rtree-3.*: Linear scans of r-tree data.
# rtree-4.*: Test INSERT
# rtree-5.*: Test DELETE
# rtree-6.*: Test UPDATE
# rtree-7.*: Test renaming an r-tree table.
# rtree-8.*: Test constrained scans of r-tree data.
#
ifcapable !rtree {
finish_test
return
}
#----------------------------------------------------------------------------
# Test cases rtree-1.* test CREATE and DROP table statements.
#
# Test creating and dropping an rtree table.
#
do_test rtree-1.1.1 {
execsql { CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2) }
} {}
do_test rtree-1.1.2 {
execsql { SELECT name FROM sqlite_master ORDER BY name }
} {t1 t1_node t1_parent t1_rowid}
do_test rtree-1.1.3 {
execsql {
DROP TABLE t1;
SELECT name FROM sqlite_master ORDER BY name;
}
} {}
# Test creating and dropping an rtree table with an odd name in
# an attached database.
#
do_test rtree-1.2.1 {
file delete -force test2.db
execsql {
ATTACH 'test2.db' AS aux;
CREATE VIRTUAL TABLE aux.'a" "b' USING rtree(ii, x1, x2, y1, y2);
}
} {}
do_test rtree-1.2.2 {
execsql { SELECT name FROM sqlite_master ORDER BY name }
} {}
do_test rtree-1.2.3 {
execsql { SELECT name FROM aux.sqlite_master ORDER BY name }
} {{a" "b} {a" "b_node} {a" "b_parent} {a" "b_rowid}}
do_test rtree-1.2.4 {
execsql {
DROP TABLE aux.'a" "b';
SELECT name FROM aux.sqlite_master ORDER BY name;
}
} {}
# Test that the logic for checking the number of columns specified
# for an rtree table. Acceptable values are odd numbers between 3 and
# 11, inclusive.
#
set cols [list i1 i2 i3 i4 i5 i6 i7 i8 i9 iA iB iC iD iE iF iG iH iI iJ iK]
for {set nCol 1} {$nCol<[llength $cols]} {incr nCol} {
set columns [join [lrange $cols 0 [expr {$nCol-1}]] ,]
set X {0 {}}
if {$nCol%2 == 0} { set X {1 {Wrong number of columns for an rtree table}} }
if {$nCol < 3} { set X {1 {Too few columns for an rtree table}} }
if {$nCol > 11} { set X {1 {Too many columns for an rtree table}} }
do_test rtree-1.3.$nCol {
catchsql "
CREATE VIRTUAL TABLE t1 USING rtree($columns);
"
} $X
catchsql { DROP TABLE t1 }
}
# Test that it is possible to open an existing database that contains
# r-tree tables.
#
do_test rtree-1.4.1 {
execsql {
CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2);
INSERT INTO t1 VALUES(1, 5.0, 10.0);
INSERT INTO t1 VALUES(2, 15.0, 20.0);
}
} {}
do_test rtree-1.4.2 {
db close
sqlite3 db test.db
execsql { SELECT * FROM t1 ORDER BY ii }
} {1 5.0 10.0 2 15.0 20.0}
do_test rtree-1.4.3 {
execsql { DROP TABLE t1 }
} {}
# Test that it is possible to create an r-tree table with ridiculous
# column names.
#
do_test rtree-1.5.1 {
execsql {
CREATE VIRTUAL TABLE t1 USING rtree("the key", "x dim.", "x2'dim");
INSERT INTO t1 VALUES(1, 2, 3);
SELECT "the key", "x dim.", "x2'dim" FROM t1;
}
} {1 2.0 3.0}
do_test rtree-1.5.1 {
execsql { DROP TABLE t1 }
} {}
# Force the r-tree constructor to fail.
#
do_test rtree-1.6.1 {
execsql { CREATE TABLE t1_rowid(a); }
catchsql {
CREATE VIRTUAL TABLE t1 USING rtree("the key", "x dim.", "x2'dim");
}
} {1 {table "t1_rowid" already exists}}
do_test rtree-1.6.1 {
execsql { DROP TABLE t1_rowid }
} {}
#----------------------------------------------------------------------------
# Test cases rtree-2.*
#
do_test rtree-2.1.1 {
execsql {
CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2);
SELECT * FROM t1;
}
} {}
do_test rtree-2.1.2 {
execsql { INSERT INTO t1 VALUES(NULL, 1, 3, 2, 4) }
execsql { SELECT * FROM t1 }
} {1 1.0 3.0 2.0 4.0}
do_test rtree-2.1.3 {
execsql { INSERT INTO t1 VALUES(NULL, 1, 3, 2, 4) }
execsql { SELECT rowid FROM t1 ORDER BY rowid }
} {1 2}
do_test rtree-2.1.3 {
execsql { INSERT INTO t1 VALUES(NULL, 1, 3, 2, 4) }
execsql { SELECT ii FROM t1 ORDER BY ii }
} {1 2 3}
do_test rtree-2.2.1 {
catchsql { INSERT INTO t1 VALUES(2, 1, 3, 2, 4) }
} {1 {constraint failed}}
do_test rtree-2.2.2 {
catchsql { INSERT INTO t1 VALUES(4, 1, 3, 4, 2) }
} {1 {constraint failed}}
do_test rtree-2.2.3 {
catchsql { INSERT INTO t1 VALUES(4, 3, 1, 2, 4) }
} {1 {constraint failed}}
do_test rtree-2.2.4 {
execsql { SELECT ii FROM t1 ORDER BY ii }
} {1 2 3}
do_test rtree-2.X {
execsql { DROP TABLE t1 }
} {}
#----------------------------------------------------------------------------
# Test cases rtree-3.* test linear scans of r-tree table data. To test
# this we have to insert some data into an r-tree, but that is not the
# focus of these tests.
#
do_test rtree-3.1.1 {
execsql {
CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2);
SELECT * FROM t1;
}
} {}
do_test rtree-3.1.2 {
execsql {
INSERT INTO t1 VALUES(5, 1, 3, 2, 4);
SELECT * FROM t1;
}
} {5 1.0 3.0 2.0 4.0}
do_test rtree-3.1.3 {
execsql {
INSERT INTO t1 VALUES(6, 2, 6, 4, 8);
SELECT * FROM t1;
}
} {5 1.0 3.0 2.0 4.0 6 2.0 6.0 4.0 8.0}
# Test the constraint on the coordinates (c[i]<=c[i+1] where (i%2==0)):
do_test rtree-3.2.1 {
catchsql { INSERT INTO t1 VALUES(7, 2, 6, 4, 3) }
} {1 {constraint failed}}
do_test rtree-3.2.2 {
catchsql { INSERT INTO t1 VALUES(8, 2, 6, 3, 3) }
} {0 {}}
#----------------------------------------------------------------------------
# Test cases rtree-5.* test DELETE operations.
#
do_test rtree-5.1.1 {
execsql { CREATE VIRTUAL TABLE t2 USING rtree(ii, x1, x2) }
} {}
do_test rtree-5.1.2 {
execsql {
INSERT INTO t2 VALUES(1, 10, 20);
INSERT INTO t2 VALUES(2, 30, 40);
INSERT INTO t2 VALUES(3, 50, 60);
SELECT * FROM t2 ORDER BY ii;
}
} {1 10.0 20.0 2 30.0 40.0 3 50.0 60.0}
do_test rtree-5.1.3 {
execsql {
DELETE FROM t2 WHERE ii=2;
SELECT * FROM t2 ORDER BY ii;
}
} {1 10.0 20.0 3 50.0 60.0}
do_test rtree-5.1.4 {
execsql {
DELETE FROM t2 WHERE ii=1;
SELECT * FROM t2 ORDER BY ii;
}
} {3 50.0 60.0}
do_test rtree-5.1.5 {
execsql {
DELETE FROM t2 WHERE ii=3;
SELECT * FROM t2 ORDER BY ii;
}
} {}
do_test rtree-5.1.6 {
execsql { SELECT * FROM t2_rowid }
} {}
#----------------------------------------------------------------------------
# Test cases rtree-5.* test UPDATE operations.
#
do_test rtree-6.1.1 {
execsql { CREATE VIRTUAL TABLE t3 USING rtree(ii, x1, x2, y1, y2) }
} {}
do_test rtree-6.1.2 {
execsql {
INSERT INTO t3 VALUES(1, 2, 3, 4, 5);
UPDATE t3 SET x2=5;
SELECT * FROM t3;
}
} {1 2.0 5.0 4.0 5.0}
do_test rtree-6.1.3 {
execsql { UPDATE t3 SET ii = 2 }
execsql { SELECT * FROM t3 }
} {2 2.0 5.0 4.0 5.0}
#----------------------------------------------------------------------------
# Test cases rtree-7.* test rename operations.
#
do_test rtree-7.1.1 {
execsql {
CREATE VIRTUAL TABLE t4 USING rtree(ii, x1, x2, y1, y2, z1, z2);
INSERT INTO t4 VALUES(1, 2, 3, 4, 5, 6, 7);
}
} {}
do_test rtree-7.1.2 {
execsql { ALTER TABLE t4 RENAME TO t5 }
execsql { SELECT * FROM t5 }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.1.3 {
db close
sqlite3 db test.db
execsql { SELECT * FROM t5 }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.1.4 {
execsql { ALTER TABLE t5 RENAME TO 'raisara "one"'''}
execsql { SELECT * FROM "raisara ""one""'" }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.1.5 {
execsql { SELECT * FROM 'raisara "one"''' }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.1.6 {
execsql { ALTER TABLE "raisara ""one""'" RENAME TO "abc 123" }
execsql { SELECT * FROM "abc 123" }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.1.7 {
db close
sqlite3 db test.db
execsql { SELECT * FROM "abc 123" }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
# An error midway through a rename operation.
do_test rtree-7.2.1 {
execsql {
CREATE TABLE t4_node(a);
}
catchsql { ALTER TABLE "abc 123" RENAME TO t4 }
} {1 {SQL logic error or missing database}}
do_test rtree-7.2.2 {
execsql { SELECT * FROM "abc 123" }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.2.3 {
execsql {
DROP TABLE t4_node;
CREATE TABLE t4_rowid(a);
}
catchsql { ALTER TABLE "abc 123" RENAME TO t4 }
} {1 {SQL logic error or missing database}}
do_test rtree-7.2.4 {
db close
sqlite3 db test.db
execsql { SELECT * FROM "abc 123" }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
do_test rtree-7.2.5 {
execsql { DROP TABLE t4_rowid }
execsql { ALTER TABLE "abc 123" RENAME TO t4 }
execsql { SELECT * FROM t4 }
} {1 2.0 3.0 4.0 5.0 6.0 7.0}
#----------------------------------------------------------------------------
# Test cases rtree-8.*
#
# Test that the function to determine if a leaf cell is part of the
# result set works.
do_test rtree-8.1.1 {
execsql {
CREATE VIRTUAL TABLE t6 USING rtree(ii, x1, x2);
INSERT INTO t6 VALUES(1, 3, 7);
INSERT INTO t6 VALUES(2, 4, 6);
}
} {}
do_test rtree-8.1.2 { execsql { SELECT ii FROM t6 WHERE x1>2 } } {1 2}
do_test rtree-8.1.3 { execsql { SELECT ii FROM t6 WHERE x1>3 } } {2}
do_test rtree-8.1.4 { execsql { SELECT ii FROM t6 WHERE x1>4 } } {}
do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } } {}
do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1<3 } } {}
do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1<4 } } {1}
do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1<5 } } {1 2}
#----------------------------------------------------------------------------
# Test cases rtree-9.*
#
# Test that ticket #3549 is fixed.
do_test rtree-9.1 {
execsql {
CREATE TABLE foo (id INTEGER PRIMARY KEY);
CREATE VIRTUAL TABLE bar USING rtree (id, minX, maxX, minY, maxY);
INSERT INTO foo VALUES (null);
INSERT INTO foo SELECT null FROM foo;
INSERT INTO foo SELECT null FROM foo;
INSERT INTO foo SELECT null FROM foo;
INSERT INTO foo SELECT null FROM foo;
INSERT INTO foo SELECT null FROM foo;
INSERT INTO foo SELECT null FROM foo;
DELETE FROM foo WHERE id > 40;
INSERT INTO bar SELECT NULL, 0, 0, 0, 0 FROM foo;
}
} {}
# This used to crash.
do_test rtree-9.2 {
execsql {
SELECT count(*) FROM bar b1, bar b2, foo s1 WHERE s1.id = b1.id;
}
} {1600}
do_test rtree-9.3 {
execsql {
SELECT count(*) FROM bar b1, bar b2, foo s1
WHERE b1.minX <= b2.maxX AND s1.id = b1.id;
}
} {1600}
#-------------------------------------------------------------------------
# Ticket #3970: Check that the error message is meaningful when a
# keyword is used as a column name.
#
do_test rtree-10.1 {
catchsql { CREATE VIRTUAL TABLE t7 USING rtree(index, x1, y1, x2, y2) }
} {1 {near "index": syntax error}}
finish_test
-152
View File
@@ -1,152 +0,0 @@
# 2008 Feb 19
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# The focus of this file is testing the r-tree extension.
#
# $Id: rtree2.test,v 1.4 2008/07/14 15:37:01 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source [file join [file dirname [info script]] rtree_util.tcl]
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
set ::NROW 1000
set ::NDEL 10
set ::NSELECT 100
if {[info exists ISQUICK] && $ISQUICK} {
set ::NROW 100
set ::NSELECT 10
}
foreach module {rtree_i32 rtree} {
for {set nDim 1} {$nDim <= 5} {incr nDim} {
do_test rtree2-$module.$nDim.1 {
set cols [list]
foreach c [list c0 c1 c2 c3 c4 c5 c6 c7 c8 c9] {
lappend cols "$c REAL"
}
set cols [join [lrange $cols 0 [expr {$nDim*2-1}]] ", "]
execsql "
CREATE VIRTUAL TABLE t1 USING ${module}(ii, $cols);
CREATE TABLE t2 (ii, $cols);
"
} {}
do_test rtree2-$module.$nDim.2 {
db transaction {
for {set ii 0} {$ii < $::NROW} {incr ii} {
#puts "Row $ii"
set values [list]
for {set jj 0} {$jj<$nDim*2} {incr jj} {
lappend values [expr int(rand()*1000)]
}
set values [join $values ,]
#puts [rtree_treedump db t1]
#puts "INSERT INTO t2 VALUES($ii, $values)"
set rc [catch {db eval "INSERT INTO t1 VALUES($ii, $values)"}]
if {$rc} {
incr ii -1
} else {
db eval "INSERT INTO t2 VALUES($ii, $values)"
}
#if {[rtree_check db t1]} {
#puts [rtree_treedump db t1]
#exit
#}
}
}
set t1 [execsql {SELECT * FROM t1 ORDER BY ii}]
set t2 [execsql {SELECT * FROM t2 ORDER BY ii}]
set rc [expr {$t1 eq $t2}]
if {$rc != 1} {
puts $t1
puts $t2
}
set rc
} {1}
do_test rtree2-$module.$nDim.3 {
rtree_check db t1
} 0
set OPS [list < > <= >= =]
for {set ii 0} {$ii < $::NSELECT} {incr ii} {
do_test rtree2-$module.$nDim.4.$ii.1 {
set where [list]
foreach look_three_dots! {. . .} {
set colidx [expr int(rand()*($nDim*2+1))-1]
if {$colidx<0} {
set col ii
} else {
set col "c$colidx"
}
set op [lindex $OPS [expr int(rand()*[llength $OPS])]]
set val [expr int(rand()*1000)]
lappend where "$col $op $val"
}
set where [join $where " AND "]
set t1 [execsql "SELECT * FROM t1 WHERE $where ORDER BY ii"]
set t2 [execsql "SELECT * FROM t2 WHERE $where ORDER BY ii"]
set rc [expr {$t1 eq $t2}]
if {$rc != 1} {
#puts $where
puts $t1
puts $t2
#puts [rtree_treedump db t1]
#breakpoint
#set t1 [execsql "SELECT * FROM t1 WHERE $where ORDER BY ii"]
#exit
}
set rc
} {1}
}
for {set ii 0} {$ii < $::NROW} {incr ii $::NDEL} {
#puts [rtree_treedump db t1]
do_test rtree2-$module.$nDim.5.$ii.1 {
execsql "DELETE FROM t2 WHERE ii <= $::ii"
execsql "DELETE FROM t1 WHERE ii <= $::ii"
set t1 [execsql {SELECT * FROM t1 ORDER BY ii}]
set t2 [execsql {SELECT * FROM t2 ORDER BY ii}]
set rc [expr {$t1 eq $t2}]
if {$rc != 1} {
puts $t1
puts $t2
}
set rc
} {1}
do_test rtree2-$module.$nDim.5.$ii.2 {
rtree_check db t1
} {0}
}
do_test rtree2-$module.$nDim.6 {
execsql {
DROP TABLE t1;
DROP TABLE t2;
}
} {}
}
}
finish_test
-74
View File
@@ -1,74 +0,0 @@
# 2008 Feb 19
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# The focus of this file is testing that the r-tree correctly handles
# out-of-memory conditions.
#
# $Id: rtree3.test,v 1.2 2008/06/23 15:55:52 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
# Only run these tests if memory debugging is turned on.
#
source $testdir/malloc_common.tcl
if {!$MEMDEBUG} {
puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG..."
finish_test
return
}
do_malloc_test rtree3-1 -sqlbody {
BEGIN TRANSACTION;
CREATE VIRTUAL TABLE rt USING rtree(ii, x1, x2, y1, y2);
INSERT INTO rt VALUES(NULL, 3, 5, 7, 9);
INSERT INTO rt VALUES(NULL, 13, 15, 17, 19);
DELETE FROM rt WHERE ii = 1;
SELECT * FROM rt;
SELECT ii FROM rt WHERE ii = 2;
COMMIT;
}
do_malloc_test rtree3-2 -sqlprep {
CREATE VIRTUAL TABLE rt USING rtree(ii, x1, x2, y1, y2);
INSERT INTO rt VALUES(NULL, 3, 5, 7, 9);
} -sqlbody {
DROP TABLE rt;
}
do_malloc_test rtree3-3 -sqlprep {
CREATE VIRTUAL TABLE rt USING rtree(ii, x1, x2, y1, y2);
INSERT INTO rt VALUES(NULL, 3, 5, 7, 9);
} -tclbody {
db eval BEGIN
for {set ii 0} {$ii < 100} {incr ii} {
set f [expr rand()]
db eval {INSERT INTO rt VALUES(NULL, $f*10.0, $f*10.0, $f*15.0, $f*15.0)}
}
db eval COMMIT
db eval BEGIN
for {set ii 0} {$ii < 100} {incr ii} {
set f [expr rand()]
db eval { DELETE FROM rt WHERE x1<($f*10.0) AND x1>($f*10.5) }
}
db eval COMMIT
}
finish_test
-236
View File
@@ -1,236 +0,0 @@
# 2008 May 23
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# Randomized test cases for the rtree extension.
#
# $Id: rtree4.test,v 1.3 2008/06/23 15:55:52 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
set ::NROW 2500
if {[info exists ISQUICK] && $ISQUICK} {
set ::NROW 250
}
# Return a floating point number between -X and X.
#
proc rand {X} {
return [expr {int((rand()-0.5)*1024.0*$X)/512.0}]
}
# Return a positive floating point number less than or equal to X
#
proc randincr {X} {
while 1 {
set r [expr {int(rand()*$X*32.0)/32.0}]
if {$r>0.0} {return $r}
}
}
# Scramble the $inlist into a random order.
#
proc scramble {inlist} {
set y {}
foreach x $inlist {
lappend y [list [expr {rand()}] $x]
}
set y [lsort $y]
set outlist {}
foreach x $y {
lappend outlist [lindex $x 1]
}
return $outlist
}
# Always use the same random seed so that the sequence of tests
# is repeatable.
#
expr {srand(1234)}
# Run these tests for all number of dimensions between 1 and 5.
#
for {set nDim 1} {$nDim<=5} {incr nDim} {
# Construct an rtree virtual table and an ordinary btree table
# to mirror it. The ordinary table should be much slower (since
# it has to do a full table scan) but should give the exact same
# answers.
#
do_test rtree4-$nDim.1 {
set clist {}
set cklist {}
for {set i 0} {$i<$nDim} {incr i} {
lappend clist mn$i mx$i
lappend cklist "mn$i<mx$i"
}
db eval "DROP TABLE IF EXISTS rx"
db eval "DROP TABLE IF EXISTS bx"
db eval "CREATE VIRTUAL TABLE rx USING rtree(id, [join $clist ,])"
db eval "CREATE TABLE bx(id INTEGER PRIMARY KEY,\
[join $clist ,], CHECK( [join $cklist { AND }] ))"
} {}
# Do many insertions of small objects. Do both overlapping and
# contained-within queries after each insert to verify that all
# is well.
#
unset -nocomplain where
for {set i 1} {$i<$::NROW} {incr i} {
# Do a random insert
#
do_test rtree-$nDim.2.$i.1 {
set vlist {}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 50]}]
lappend vlist $mn $mx
}
db eval "INSERT INTO rx VALUES(NULL, [join $vlist ,])"
db eval "INSERT INTO bx VALUES(NULL, [join $vlist ,])"
} {}
# Do a contained-in query on all dimensions
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mn$j>=$mn mx$j<=$mx
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.2 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do an overlaps query on all dimensions
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mx$j>=$mn mn$j<=$mx
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.3 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do a contained-in query with surplus contraints at the beginning.
# This should force a full-table scan on the rtree.
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
lappend where mn$j>-10000 mx$j<10000
}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mn$j>=$mn mx$j<=$mx
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.3 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do an overlaps query with surplus contraints at the beginning.
# This should force a full-table scan on the rtree.
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
lappend where mn$j>=-10000 mx$j<=10000
}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mx$j>$mn mn$j<$mx
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.4 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do a contained-in query with surplus contraints at the end
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mn$j>=$mn mx$j<$mx
}
for {set j [expr {$nDim-1}]} {$j>=0} {incr j -1} {
lappend where mn$j>=-10000 mx$j<10000
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.5 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do an overlaps query with surplus contraints at the end
#
set where {}
for {set j [expr {$nDim-1}]} {$j>=0} {incr j -1} {
set mn [rand 10000]
set mx [expr {$mn+[randincr 500]}]
lappend where mx$j>$mn mn$j<=$mx
}
for {set j 0} {$j<$nDim} {incr j} {
lappend where mx$j>-10000 mn$j<=10000
}
set where "WHERE [join $where { AND }]"
do_test rtree-$nDim.2.$i.6 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do a contained-in query with surplus contraints where the
# constraints appear in a random order.
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
set mn1 [rand 10000]
set mn2 [expr {$mn1+[randincr 100]}]
set mx1 [expr {$mn2+[randincr 400]}]
set mx2 [expr {$mx1+[randincr 100]}]
lappend where mn$j>=$mn1 mn$j>$mn2 mx$j<$mx1 mx$j<=$mx2
}
set where "WHERE [join [scramble $where] { AND }]"
do_test rtree-$nDim.2.$i.7 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
# Do an overlaps query with surplus contraints where the
# constraints appear in a random order.
#
set where {}
for {set j 0} {$j<$nDim} {incr j} {
set mn1 [rand 10000]
set mn2 [expr {$mn1+[randincr 100]}]
set mx1 [expr {$mn2+[randincr 400]}]
set mx2 [expr {$mx1+[randincr 100]}]
lappend where mx$j>=$mn1 mx$j>$mn2 mn$j<$mx1 mn$j<=$mx2
}
set where "WHERE [join [scramble $where] { AND }]"
do_test rtree-$nDim.2.$i.8 {
list $where [db eval "SELECT id FROM rx $where ORDER BY id"]
} [list $where [db eval "SELECT id FROM bx $where ORDER BY id"]]
}
}
finish_test
-80
View File
@@ -1,80 +0,0 @@
# 2008 Jul 14
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# The focus of this file is testing the r-tree extension when it is
# configured to store values as 32 bit integers.
#
# $Id: rtree5.test,v 1.1 2008/07/14 15:37:01 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
do_test rtree5-1.0 {
execsql { CREATE VIRTUAL TABLE t1 USING rtree_i32(id, x1, x2, y1, y2) }
} {}
do_test rtree5-1.1 {
execsql { INSERT INTO t1 VALUES(1, 5, 10, 4, 11.2) }
} {}
do_test rtree5-1.2 {
execsql { SELECT * FROM t1 }
} {1 5 10 4 11}
do_test rtree5-1.3 {
execsql { SELECT typeof(x1) FROM t1 }
} {integer}
do_test rtree5-1.4 {
execsql { SELECT x1==5 FROM t1 }
} {1}
do_test rtree5-1.5 {
execsql { SELECT x1==5.2 FROM t1 }
} {0}
do_test rtree5-1.6 {
execsql { SELECT x1==5.0 FROM t1 }
} {1}
do_test rtree5-1.7 {
execsql { SELECT count(*) FROM t1 WHERE x1==5 }
} {1}
do_test rtree5-1.8 {
execsql { SELECT count(*) FROM t1 WHERE x1==5.2 }
} {0}
do_test rtree5-1.9 {
execsql { SELECT count(*) FROM t1 WHERE x1==5.0 }
} {1}
do_test rtree5-1.10 {
execsql { SELECT (1<<31)-5, (1<<31)-1, -1*(1<<31), -1*(1<<31)+5 }
} {2147483643 2147483647 -2147483648 -2147483643}
do_test rtree5-1.10 {
execsql {
INSERT INTO t1 VALUES(2, (1<<31)-5, (1<<31)-1, -1*(1<<31), -1*(1<<31)+5)
}
} {}
do_test rtree5-1.12 {
execsql { SELECT * FROM t1 WHERE id=2 }
} {2 2147483643 2147483647 -2147483648 -2147483643}
do_test rtree5-1.13 {
execsql {
SELECT * FROM t1 WHERE
x1=2147483643 AND x2=2147483647 AND
y1=-2147483648 AND y2=-2147483643
}
} {2 2147483643 2147483647 -2147483648 -2147483643}
finish_test
-111
View File
@@ -1,111 +0,0 @@
# 2008 Sep 1
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# $Id: rtree6.test,v 1.1 2008/09/01 12:47:00 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
# Operator Byte Value
# ----------------------
# = 0x41 ('A')
# <= 0x42 ('B')
# < 0x43 ('C')
# >= 0x44 ('D')
# > 0x45 ('E')
# ----------------------
proc rtree_strategy {sql} {
set ret [list]
db eval "explain $sql" a {
if {$a(opcode) eq "VFilter"} {
lappend ret $a(p4)
}
}
set ret
}
proc query_plan {sql} {
set ret [list]
db eval "explain query plan $sql" a {
lappend ret $a(detail)
}
set ret
}
do_test rtree6-1.1 {
execsql {
CREATE TABLE t2(k INTEGER PRIMARY KEY, v);
CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2);
}
} {}
do_test rtree6-1.2 {
rtree_strategy {SELECT * FROM t1 WHERE x1>10}
} {Ea}
do_test rtree6-1.3 {
rtree_strategy {SELECT * FROM t1 WHERE x1<10}
} {Ca}
do_test rtree6-1.4 {
rtree_strategy {SELECT * FROM t1,t2 WHERE k=ii AND x1<10}
} {Ca}
do_test rtree6-1.5 {
rtree_strategy {SELECT * FROM t1,t2 WHERE k=+ii AND x1<10}
} {Ca}
do_test rtree6.2.1 {
query_plan {SELECT * FROM t1,t2 WHERE k=+ii AND x1<10}
} [list \
{TABLE t1 VIRTUAL TABLE INDEX 2:Ca} \
{TABLE t2 USING PRIMARY KEY} \
]
do_test rtree6.2.2 {
query_plan {SELECT * FROM t1,t2 WHERE k=ii AND x1<10}
} [list \
{TABLE t1 VIRTUAL TABLE INDEX 2:Ca} \
{TABLE t2 USING PRIMARY KEY} \
]
do_test rtree6.2.3 {
query_plan {SELECT * FROM t1,t2 WHERE k=ii}
} [list \
{TABLE t2} \
{TABLE t1 VIRTUAL TABLE INDEX 1:} \
]
do_test rtree6.2.4 {
query_plan {SELECT * FROM t1,t2 WHERE v=10 and x1<10 and x2>10}
} [list \
{TABLE t1 VIRTUAL TABLE INDEX 2:CaEb} \
{TABLE t2} \
]
do_test rtree6.2.5 {
query_plan {SELECT * FROM t1,t2 WHERE k=ii AND x1<v}
} [list \
{TABLE t2} \
{TABLE t1 VIRTUAL TABLE INDEX 1:} \
]
finish_test
-76
View File
@@ -1,76 +0,0 @@
set testdir [file join [file dirname $argv0] .. .. test]
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
set NROW 10000
set NQUERY 500
puts "Generating $NROW rows of data..."
set data [list]
for {set ii 0} {$ii < $NROW} {incr ii} {
set x1 [expr {rand()*1000}]
set x2 [expr {$x1+rand()*50}]
set y1 [expr {rand()*1000}]
set y2 [expr {$y1+rand()*50}]
lappend data $x1 $x2 $y1 $y2
}
puts "Finished generating data"
set sql1 {CREATE TABLE btree(ii INTEGER PRIMARY KEY, x1, x2, y1, y2)}
set sql2 {CREATE VIRTUAL TABLE rtree USING rtree(ii, x1, x2, y1, y2)}
puts "Creating tables:"
puts " $sql1"
puts " $sql2"
db eval $sql1
db eval $sql2
db eval "pragma cache_size=100"
puts -nonewline "Inserting into btree... "
flush stdout
set btree_time [time {db transaction {
set ii 1
foreach {x1 x2 y1 y2} $data {
db eval {INSERT INTO btree VALUES($ii, $x1, $x2, $y1, $y2)}
incr ii
}
}}]
puts "$btree_time"
puts -nonewline "Inserting into rtree... "
flush stdout
set rtree_time [time {db transaction {
set ii 1
foreach {x1 x2 y1 y2} $data {
incr ii
db eval {INSERT INTO rtree VALUES($ii, $x1, $x2, $y1, $y2)}
}
}}]
puts "$rtree_time"
puts -nonewline "Selecting from btree... "
flush stdout
set btree_select_time [time {
foreach {x1 x2 y1 y2} [lrange $data 0 [expr $NQUERY*4-1]] {
db eval {SELECT * FROM btree WHERE x1<$x1 AND x2>$x2 AND y1<$y1 AND y2>$y2}
}
}]
puts "$btree_select_time"
puts -nonewline "Selecting from rtree... "
flush stdout
set rtree_select_time [time {
foreach {x1 x2 y1 y2} [lrange $data 0 [expr $NQUERY*4-1]] {
db eval {SELECT * FROM rtree WHERE x1<$x1 AND x2>$x2 AND y1<$y1 AND y2>$y2}
}
}]
puts "$rtree_select_time"
-195
View File
@@ -1,195 +0,0 @@
# 2008 Feb 19
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# This file contains Tcl code that may be useful for testing or
# analyzing r-tree structures created with this module. It is
# used by both test procedures and the r-tree viewer application.
#
# $Id: rtree_util.tcl,v 1.1 2008/05/26 18:41:54 danielk1977 Exp $
#
#--------------------------------------------------------------------------
# PUBLIC API:
#
# rtree_depth
# rtree_ndim
# rtree_node
# rtree_mincells
# rtree_check
# rtree_dump
# rtree_treedump
#
proc rtree_depth {db zTab} {
$db one "SELECT rtreedepth(data) FROM ${zTab}_node WHERE nodeno=1"
}
proc rtree_nodedepth {db zTab iNode} {
set iDepth [rtree_depth $db $zTab]
set ii $iNode
while {$ii != 1} {
set sql "SELECT parentnode FROM ${zTab}_parent WHERE nodeno = $ii"
set ii [db one $sql]
incr iDepth -1
}
return $iDepth
}
# Return the number of dimensions of the rtree.
#
proc rtree_ndim {db zTab} {
set nDim [expr {(([llength [$db eval "pragma table_info($zTab)"]]/6)-1)/2}]
}
# Return the contents of rtree node $iNode.
#
proc rtree_node {db zTab iNode {iPrec 6}} {
set nDim [rtree_ndim $db $zTab]
set sql "
SELECT rtreenode($nDim, data) FROM ${zTab}_node WHERE nodeno = $iNode
"
set node [db one $sql]
set nCell [llength $node]
set nCoord [expr $nDim*2]
for {set ii 0} {$ii < $nCell} {incr ii} {
for {set jj 1} {$jj <= $nCoord} {incr jj} {
set newval [format "%.${iPrec}f" [lindex $node $ii $jj]]
lset node $ii $jj $newval
}
}
set node
}
proc rtree_mincells {db zTab} {
set n [$db one "select length(data) FROM ${zTab}_node LIMIT 1"]
set nMax [expr {int(($n-4)/(8+[rtree_ndim $db $zTab]*2*4))}]
return [expr {int($nMax/3)}]
}
# An integrity check for the rtree $zTab accessible via database
# connection $db.
#
proc rtree_check {db zTab} {
array unset ::checked
# Check each r-tree node.
set rc [catch {
rtree_node_check $db $zTab 1 [rtree_depth $db $zTab]
} msg]
if {$rc && $msg ne ""} { error $msg }
# Check that the _rowid and _parent tables have the right
# number of entries.
set nNode [$db one "SELECT count(*) FROM ${zTab}_node"]
set nRow [$db one "SELECT count(*) FROM ${zTab}"]
set nRowid [$db one "SELECT count(*) FROM ${zTab}_rowid"]
set nParent [$db one "SELECT count(*) FROM ${zTab}_parent"]
if {$nNode != ($nParent+1)} {
error "Wrong number of entries in ${zTab}_parent"
}
if {$nRow != $nRowid} {
error "Wrong number of entries in ${zTab}_rowid"
}
return $rc
}
proc rtree_node_check {db zTab iNode iDepth} {
if {[info exists ::checked($iNode)]} { error "Second ref to $iNode" }
set ::checked($iNode) 1
set node [rtree_node $db $zTab $iNode]
if {$iNode!=1 && [llength $node]==0} { error "No such node: $iNode" }
if {$iNode != 1 && [llength $node]<[rtree_mincells $db $zTab]} {
puts "Node $iNode: Has only [llength $node] cells"
error ""
}
if {$iNode == 1 && [llength $node]==1 && [rtree_depth $db $zTab]>0} {
set depth [rtree_depth $db $zTab]
puts "Node $iNode: Has only 1 child (tree depth is $depth)"
error ""
}
set nDim [expr {([llength [lindex $node 0]]-1)/2}]
if {$iDepth > 0} {
set d [expr $iDepth-1]
foreach cell $node {
set shouldbe [rtree_node_check $db $zTab [lindex $cell 0] $d]
if {$cell ne $shouldbe} {
puts "Node $iNode: Cell is: {$cell}, should be {$shouldbe}"
error ""
}
}
}
set mapping_table "${zTab}_parent"
set mapping_sql "SELECT parentnode FROM $mapping_table WHERE rowid = \$rowid"
if {$iDepth==0} {
set mapping_table "${zTab}_rowid"
set mapping_sql "SELECT nodeno FROM $mapping_table WHERE rowid = \$rowid"
}
foreach cell $node {
set rowid [lindex $cell 0]
set mapping [db one $mapping_sql]
if {$mapping != $iNode} {
puts "Node $iNode: $mapping_table entry for cell $rowid is $mapping"
error ""
}
}
set ret [list $iNode]
for {set ii 1} {$ii <= $nDim*2} {incr ii} {
set f [lindex $node 0 $ii]
foreach cell $node {
set f2 [lindex $cell $ii]
if {($ii%2)==1 && $f2<$f} {set f $f2}
if {($ii%2)==0 && $f2>$f} {set f $f2}
}
lappend ret $f
}
return $ret
}
proc rtree_dump {db zTab} {
set zRet ""
set nDim [expr {(([llength [$db eval "pragma table_info($zTab)"]]/6)-1)/2}]
set sql "SELECT nodeno, rtreenode($nDim, data) AS node FROM ${zTab}_node"
$db eval $sql {
append zRet [format "% -10s %s\n" $nodeno $node]
}
set zRet
}
proc rtree_nodetreedump {db zTab zIndent iDepth iNode} {
set ret ""
set node [rtree_node $db $zTab $iNode 1]
append ret [format "%-3d %s%s\n" $iNode $zIndent $node]
if {$iDepth>0} {
foreach cell $node {
set i [lindex $cell 0]
append ret [rtree_nodetreedump $db $zTab "$zIndent " [expr $iDepth-1] $i]
}
}
set ret
}
proc rtree_treedump {db zTab} {
set d [rtree_depth $db $zTab]
rtree_nodetreedump $db $zTab "" $d 1
}
-54
View File
@@ -1,54 +0,0 @@
# 2008 Sep 08
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
# The focus of this file is testing that ticket #3363 is fixed.
#
# $Id: tkt3363.test,v 1.1 2008/09/08 11:07:03 danielk1977 Exp $
#
if {![info exists testdir]} {
set testdir [file join [file dirname $argv0] .. .. test]
}
source [file join [file dirname [info script]] rtree_util.tcl]
source $testdir/tester.tcl
ifcapable !rtree {
finish_test
return
}
do_test tkt3363.1.1 {
execsql { CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2) }
} {}
do_test tkt3363.1.2 {
for {set ii 1} {$ii < 50} {incr ii} {
set x 1000000
set y [expr 4000000 + $ii*10]
execsql { INSERT INTO t1 VALUES($ii, $x, $x, $y, $y) }
}
} {}
do_test tkt3363.1.3 {
execsql {
SELECT count(*) FROM t1 WHERE +y2>4000425.0;
}
} {7}
do_test tkt3363.1.4 {
execsql {
SELECT count(*) FROM t1 WHERE y2>4000425.0;
}
} {7}
finish_test
-189
View File
@@ -1,189 +0,0 @@
load ./libsqlite3.dylib
#package require sqlite3
source [file join [file dirname $argv0] rtree_util.tcl]
wm title . "SQLite r-tree viewer"
if {[llength $argv]!=1} {
puts stderr "Usage: $argv0 <database-file>"
puts stderr ""
exit
}
sqlite3 db [lindex $argv 0]
canvas .c -background white -width 400 -height 300 -highlightthickness 0
button .b -text "Parent Node" -command {
set sql "SELECT parentnode FROM $::O(zTab)_parent WHERE nodeno = $::O(iNode)"
set ::O(iNode) [db one $sql]
if {$::O(iNode) eq ""} {set ::O(iNode) 1}
view_node
}
set O(iNode) 1
set O(zTab) ""
set O(listbox_captions) [list]
set O(listbox_itemmap) [list]
set O(listbox_highlight) -1
listbox .l -listvariable ::O(listbox_captions) -yscrollcommand {.ls set}
scrollbar .ls -command {.l yview}
label .status -font courier -anchor w
label .title -anchor w -text "Node 1:" -background white -borderwidth 0
set rtree_tables [list]
db eval {
SELECT name
FROM sqlite_master
WHERE type='table' AND sql LIKE '%virtual%table%using%rtree%'
} {
set nCol [expr [llength [db eval "pragma table_info($name)"]]/6]
if {$nCol != 5} {
puts stderr "Not viewing $name - is not 2-dimensional"
} else {
lappend rtree_tables [list Table $name]
}
}
if {$rtree_tables eq ""} {
puts stderr "Cannot find an r-tree table in database [lindex $argv 0]"
puts stderr ""
exit
}
eval tk_optionMenu .select option_var $rtree_tables
trace add variable option_var write set_option_var
proc set_option_var {args} {
set ::O(zTab) [lindex $::option_var 1]
set ::O(iNode) 1
view_node
}
set ::O(zTab) [lindex $::rtree_tables 0 1]
bind .l <1> {listbox_click [.l nearest %y]}
bind .l <Motion> {listbox_mouseover [.l nearest %y]}
bind .l <Leave> {listbox_mouseover -1}
proc listbox_click {sel} {
if {$sel ne ""} {
set ::O(iNode) [lindex $::O(listbox_captions) $sel 1]
view_node
}
}
proc listbox_mouseover {i} {
set oldid [lindex $::O(listbox_itemmap) $::O(listbox_highlight)]
.c itemconfigure $oldid -fill ""
.l selection clear 0 end
.status configure -text ""
if {$i>=0} {
set id [lindex $::O(listbox_itemmap) $i]
.c itemconfigure $id -fill grey
.c lower $id
set ::O(listbox_highlight) $i
.l selection set $i
.status configure -text [cell_report db $::O(zTab) $::O(iNode) $i]
}
}
grid configure .select -row 0 -column 0 -columnspan 2 -sticky nsew
grid configure .b -row 1 -column 0 -columnspan 2 -sticky nsew
grid configure .l -row 2 -column 0 -sticky nsew
grid configure .status -row 3 -column 0 -columnspan 3 -sticky nsew
grid configure .title -row 0 -column 2 -sticky nsew
grid configure .c -row 1 -column 2 -rowspan 2 -sticky nsew
grid configure .ls -row 2 -column 1 -sticky nsew
grid columnconfigure . 2 -weight 1
grid rowconfigure . 2 -weight 1
proc node_bbox {data} {
set xmin 0
set xmax 0
set ymin 0
set ymax 0
foreach {rowid xmin xmax ymin ymax} [lindex $data 0] break
foreach cell [lrange $data 1 end] {
foreach {rowid x1 x2 y1 y2} $cell break
if {$x1 < $xmin} {set xmin $x1}
if {$x2 > $xmax} {set xmax $x2}
if {$y1 < $ymin} {set ymin $y1}
if {$y2 > $ymax} {set ymax $y2}
}
list $xmin $xmax $ymin $ymax
}
proc view_node {} {
set iNode $::O(iNode)
set zTab $::O(zTab)
set data [rtree_node db $zTab $iNode 12]
set depth [rtree_nodedepth db $zTab $iNode]
.c delete all
set ::O(listbox_captions) [list]
set ::O(listbox_itemmap) [list]
set $::O(listbox_highlight) -1
.b configure -state normal
if {$iNode == 1} {.b configure -state disabled}
.title configure -text "Node $iNode: [cell_report db $zTab $iNode -1]"
foreach {xmin xmax ymin ymax} [node_bbox $data] break
set total_area 0.0
set xscale [expr {double([winfo width .c]-20)/($xmax-$xmin)}]
set yscale [expr {double([winfo height .c]-20)/($ymax-$ymin)}]
set xoff [expr {10.0 - $xmin*$xscale}]
set yoff [expr {10.0 - $ymin*$yscale}]
foreach cell $data {
foreach {rowid x1 x2 y1 y2} $cell break
set total_area [expr {$total_area + ($x2-$x1)*($y2-$y1)}]
set x1 [expr {$x1*$xscale + $xoff}]
set x2 [expr {$x2*$xscale + $xoff}]
set y1 [expr {$y1*$yscale + $yoff}]
set y2 [expr {$y2*$yscale + $yoff}]
set id [.c create rectangle $x1 $y1 $x2 $y2]
if {$depth>0} {
lappend ::O(listbox_captions) "Node $rowid"
lappend ::O(listbox_itemmap) $id
}
}
}
proc cell_report {db zTab iParent iCell} {
set data [rtree_node db $zTab $iParent 12]
set cell [lindex $data $iCell]
foreach {xmin xmax ymin ymax} [node_bbox $data] break
set total_area [expr ($xmax-$xmin)*($ymax-$ymin)]
if {$cell eq ""} {
set cell_area 0.0
foreach cell $data {
foreach {rowid x1 x2 y1 y2} $cell break
set cell_area [expr $cell_area+($x2-$x1)*($y2-$y1)]
}
set cell_area [expr $cell_area/[llength $data]]
set zReport [format "Size = %.1f x %.1f Average child area = %.1f%%" \
[expr $xmax-$xmin] [expr $ymax-$ymin] [expr 100.0*$cell_area/$total_area]\
]
append zReport " Sub-tree height: [rtree_nodedepth db $zTab $iParent]"
} else {
foreach {rowid x1 x2 y1 y2} $cell break
set cell_area [expr ($x2-$x1)*($y2-$y1)]
set zReport [format "Size = %.1f x %.1f Area = %.1f%%" \
[expr $x2-$x1] [expr $y2-$y1] [expr 100.0*$cell_area/$total_area]
]
}
return $zReport
}
view_node
bind .c <Configure> view_node
+3328 -5390
View File
File diff suppressed because it is too large Load Diff
+357 -319
View File
@@ -9,6 +9,13 @@
# BCC C Compiler and options for use in building executables that
# will run on the platform that is doing the build.
#
# USLEEP If the target operating system supports the "usleep()" system
# call, then define the HAVE_USLEEP macro for all C modules.
#
# THREADSAFE If you want the SQLite library to be safe for use within a
# multi-threaded program, then define the following macro
# appropriately:
#
# THREADLIB Specify any extra linker options needed to make the library
# thread safe
#
@@ -35,8 +42,7 @@
# LIBREADLINE Linker options needed by programs using readline() must
# link against.
#
# NAWK Nawk compatible awk program. Older (obsolete?) solaris
# systems need this to avoid using the original AT&T AWK.
# ENCODING "UTF8" or "ISO8859"
#
# Once the macros above are defined, the rest of this make script will
# build the SQLite library and testing tools.
@@ -44,31 +50,19 @@
# This is how we compile
#
TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
TCCX += -I$(TOP)/ext/async
TCCX = $(TCC) $(OPTS) $(THREADSAFE) $(USLEEP) -I. -I$(TOP)/src
# Object files for the SQLite library.
#
LIBOBJ+= alter.o analyze.o attach.o auth.o \
backup.o bitvec.o btmutex.o btree.o build.o \
callback.o complete.o date.o delete.o expr.o fault.o fkey.o \
fts3.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
fts3_tokenizer.o fts3_tokenizer1.o \
func.o global.o hash.o \
icu.o insert.o journal.o legacy.o loadext.o \
main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
memjournal.o \
mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \
pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
random.o resolve.o rowset.o rtree.o select.o status.o \
table.o tokenize.o trigger.o \
LIBOBJ+= alter.o analyze.o attach.o auth.o btree.o build.o \
callback.o complete.o date.o delete.o \
expr.o func.o hash.o insert.o \
main.o opcodes.o os_unix.o os_win.o \
pager.o parse.o pragma.o prepare.o printf.o random.o \
select.o table.o tclsqlite.o tokenize.o trigger.o \
update.o util.o vacuum.o \
vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o \
walker.o where.o utf.o vtab.o
vdbe.o vdbeapi.o vdbeaux.o vdbefifo.o vdbemem.o \
where.o utf.o legacy.o
# All of the source code files.
#
@@ -77,69 +71,33 @@ SRC = \
$(TOP)/src/analyze.c \
$(TOP)/src/attach.c \
$(TOP)/src/auth.c \
$(TOP)/src/backup.c \
$(TOP)/src/bitvec.c \
$(TOP)/src/btmutex.c \
$(TOP)/src/btree.c \
$(TOP)/src/btree.h \
$(TOP)/src/btreeInt.h \
$(TOP)/src/build.c \
$(TOP)/src/callback.c \
$(TOP)/src/complete.c \
$(TOP)/src/date.c \
$(TOP)/src/delete.c \
$(TOP)/src/expr.c \
$(TOP)/src/fault.c \
$(TOP)/src/fkey.c \
$(TOP)/src/func.c \
$(TOP)/src/global.c \
$(TOP)/src/hash.c \
$(TOP)/src/hash.h \
$(TOP)/src/hwtime.h \
$(TOP)/src/insert.c \
$(TOP)/src/journal.c \
$(TOP)/src/legacy.c \
$(TOP)/src/loadext.c \
$(TOP)/src/main.c \
$(TOP)/src/malloc.c \
$(TOP)/src/mem0.c \
$(TOP)/src/mem1.c \
$(TOP)/src/mem2.c \
$(TOP)/src/mem3.c \
$(TOP)/src/mem5.c \
$(TOP)/src/memjournal.c \
$(TOP)/src/mutex.c \
$(TOP)/src/mutex.h \
$(TOP)/src/mutex_noop.c \
$(TOP)/src/mutex_os2.c \
$(TOP)/src/mutex_unix.c \
$(TOP)/src/mutex_w32.c \
$(TOP)/src/notify.c \
$(TOP)/src/os.c \
$(TOP)/src/os.h \
$(TOP)/src/os_common.h \
$(TOP)/src/os_os2.c \
$(TOP)/src/os_unix.c \
$(TOP)/src/os_win.c \
$(TOP)/src/pager.c \
$(TOP)/src/pager.h \
$(TOP)/src/parse.y \
$(TOP)/src/pcache.c \
$(TOP)/src/pcache.h \
$(TOP)/src/pcache1.c \
$(TOP)/src/pragma.c \
$(TOP)/src/prepare.c \
$(TOP)/src/printf.c \
$(TOP)/src/random.c \
$(TOP)/src/resolve.c \
$(TOP)/src/rowset.c \
$(TOP)/src/select.c \
$(TOP)/src/status.c \
$(TOP)/src/shell.c \
$(TOP)/src/sqlite.h.in \
$(TOP)/src/sqlite3ext.h \
$(TOP)/src/sqliteInt.h \
$(TOP)/src/sqliteLimit.h \
$(TOP)/src/table.c \
$(TOP)/src/tclsqlite.c \
$(TOP)/src/tokenize.c \
@@ -152,170 +110,73 @@ SRC = \
$(TOP)/src/vdbe.h \
$(TOP)/src/vdbeapi.c \
$(TOP)/src/vdbeaux.c \
$(TOP)/src/vdbeblob.c \
$(TOP)/src/vdbefifo.c \
$(TOP)/src/vdbemem.c \
$(TOP)/src/vdbeInt.h \
$(TOP)/src/vtab.c \
$(TOP)/src/walker.c \
$(TOP)/src/where.c
# Source code for extensions
#
SRC += \
$(TOP)/ext/fts1/fts1.c \
$(TOP)/ext/fts1/fts1.h \
$(TOP)/ext/fts1/fts1_hash.c \
$(TOP)/ext/fts1/fts1_hash.h \
$(TOP)/ext/fts1/fts1_porter.c \
$(TOP)/ext/fts1/fts1_tokenizer.h \
$(TOP)/ext/fts1/fts1_tokenizer1.c
SRC += \
$(TOP)/ext/fts2/fts2.c \
$(TOP)/ext/fts2/fts2.h \
$(TOP)/ext/fts2/fts2_hash.c \
$(TOP)/ext/fts2/fts2_hash.h \
$(TOP)/ext/fts2/fts2_icu.c \
$(TOP)/ext/fts2/fts2_porter.c \
$(TOP)/ext/fts2/fts2_tokenizer.h \
$(TOP)/ext/fts2/fts2_tokenizer.c \
$(TOP)/ext/fts2/fts2_tokenizer1.c
SRC += \
$(TOP)/ext/fts3/fts3.c \
$(TOP)/ext/fts3/fts3.h \
$(TOP)/ext/fts3/fts3_expr.c \
$(TOP)/ext/fts3/fts3_expr.h \
$(TOP)/ext/fts3/fts3_hash.c \
$(TOP)/ext/fts3/fts3_hash.h \
$(TOP)/ext/fts3/fts3_icu.c \
$(TOP)/ext/fts3/fts3_porter.c \
$(TOP)/ext/fts3/fts3_tokenizer.h \
$(TOP)/ext/fts3/fts3_tokenizer.c \
$(TOP)/ext/fts3/fts3_tokenizer1.c
SRC += \
$(TOP)/ext/icu/sqliteicu.h \
$(TOP)/ext/icu/icu.c
SRC += \
$(TOP)/ext/rtree/rtree.h \
$(TOP)/ext/rtree/rtree.c
# Generated source code files
#
SRC += \
keywordhash.h \
opcodes.c \
opcodes.h \
parse.c \
parse.h \
sqlite3.h
# Source code to the test files.
#
TESTSRC = \
$(TOP)/src/btree.c \
$(TOP)/src/date.c \
$(TOP)/src/func.c \
$(TOP)/src/os_unix.c \
$(TOP)/src/os_win.c \
$(TOP)/src/pager.c \
$(TOP)/src/pragma.c \
$(TOP)/src/printf.c \
$(TOP)/src/test1.c \
$(TOP)/src/test2.c \
$(TOP)/src/test3.c \
$(TOP)/src/test4.c \
$(TOP)/src/test5.c \
$(TOP)/src/test6.c \
$(TOP)/src/test7.c \
$(TOP)/src/test8.c \
$(TOP)/src/test9.c \
$(TOP)/src/test_autoext.c \
$(TOP)/src/test_async.c \
$(TOP)/src/test_backup.c \
$(TOP)/src/test_btree.c \
$(TOP)/src/test_config.c \
$(TOP)/src/test_devsym.c \
$(TOP)/src/test_func.c \
$(TOP)/src/test_hexio.c \
$(TOP)/src/test_init.c \
$(TOP)/src/test_journal.c \
$(TOP)/src/test_malloc.c \
$(TOP)/src/test_mutex.c \
$(TOP)/src/test_onefile.c \
$(TOP)/src/test_osinst.c \
$(TOP)/src/test_pcache.c \
$(TOP)/src/test_schema.c \
$(TOP)/src/test_server.c \
$(TOP)/src/test_tclvar.c \
$(TOP)/src/test_thread.c \
$(TOP)/src/test_wsd.c
#TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
#TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c
TESTSRC2 = \
$(TOP)/src/attach.c $(TOP)/src/backup.c $(TOP)/src/btree.c \
$(TOP)/src/build.c $(TOP)/src/date.c \
$(TOP)/src/expr.c $(TOP)/src/func.c $(TOP)/src/insert.c $(TOP)/src/mem5.c \
$(TOP)/src/os.c \
$(TOP)/src/os_os2.c $(TOP)/src/os_unix.c $(TOP)/src/os_win.c \
$(TOP)/src/pager.c $(TOP)/src/pragma.c $(TOP)/src/prepare.c \
$(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c \
$(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c \
$(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
$(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c \
$(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c \
$(TOP)/ext/fts3/fts3_tokenizer.c \
$(TOP)/ext/async/sqlite3async.c
$(TOP)/src/utf.c \
$(TOP)/src/util.c \
$(TOP)/src/vdbe.c \
$(TOP)/src/md5.c \
$(TOP)/src/where.c
# Header files used by all library source files.
#
HDR = \
sqlite3.h \
$(TOP)/src/btree.h \
$(TOP)/src/btreeInt.h \
$(TOP)/src/hash.h \
$(TOP)/src/hwtime.h \
keywordhash.h \
$(TOP)/src/mutex.h \
opcodes.h \
$(TOP)/src/os.h \
$(TOP)/src/os_common.h \
$(TOP)/src/pager.h \
$(TOP)/src/pcache.h \
parse.h \
sqlite3.h \
$(TOP)/src/sqlite3ext.h \
$(TOP)/src/os_unix.h \
$(TOP)/src/os_win.h \
$(TOP)/src/sqliteInt.h \
$(TOP)/src/sqliteLimit.h \
$(TOP)/src/vdbe.h \
$(TOP)/src/vdbeInt.h
parse.h
# Header files used by extensions
# Header files used by the VDBE submodule
#
EXTHDR += \
$(TOP)/ext/fts1/fts1.h \
$(TOP)/ext/fts1/fts1_hash.h \
$(TOP)/ext/fts1/fts1_tokenizer.h
EXTHDR += \
$(TOP)/ext/fts2/fts2.h \
$(TOP)/ext/fts2/fts2_hash.h \
$(TOP)/ext/fts2/fts2_tokenizer.h
EXTHDR += \
$(TOP)/ext/fts3/fts3.h \
$(TOP)/ext/fts3/fts3_expr.h \
$(TOP)/ext/fts3/fts3_hash.h \
$(TOP)/ext/fts3/fts3_tokenizer.h
EXTHDR += \
$(TOP)/ext/rtree/rtree.h
EXTHDR += \
$(TOP)/ext/icu/sqliteicu.h
VDBEHDR = \
$(HDR) \
$(TOP)/src/vdbeInt.h
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
all: sqlite3.h libsqlite3.a sqlite3$(EXE)
# Generate the file "last_change" which contains the date of change
# of the most recently modified source code file
#
last_change: $(SRC)
cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
| awk '{print $$5,$$6}' >last_change
libsqlite3.a: $(LIBOBJ)
$(AR) libsqlite3.a $(LIBOBJ)
$(RANLIB) libsqlite3.a
sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) \
$(TOP)/src/shell.c \
libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(TOP)/src/shell.c \
libsqlite3.a $(LIBREADLINE) $(THREADLIB)
objects: $(LIBOBJ_ORIG)
@@ -325,127 +186,162 @@ objects: $(LIBOBJ_ORIG)
# files are automatically generated. This target takes care of
# all that automatic generation.
#
target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl
target_source: $(SRC) $(VDBEHDR) opcodes.c keywordhash.h
rm -rf tsrc
mkdir tsrc
cp -f $(SRC) tsrc
cp $(SRC) $(VDBEHDR) tsrc
rm tsrc/sqlite.h.in tsrc/parse.y
tclsh $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
mv vdbe.new tsrc/vdbe.c
touch target_source
sqlite3.c: target_source $(TOP)/tool/mksqlite3c.tcl
tclsh $(TOP)/tool/mksqlite3c.tcl
cp sqlite3.c tclsqlite3.c
cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
fts2amal.c: target_source $(TOP)/ext/fts2/mkfts2amal.tcl
tclsh $(TOP)/ext/fts2/mkfts2amal.tcl
fts3amal.c: target_source $(TOP)/ext/fts3/mkfts3amal.tcl
tclsh $(TOP)/ext/fts3/mkfts3amal.tcl
cp parse.c opcodes.c keywordhash.h tsrc
cp $(TOP)/sqlite3.def tsrc
# Rules to build the LEMON compiler generator
#
lemon: $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
$(BCC) -o lemon $(TOP)/tool/lemon.c
cp $(TOP)/src/lempar.c .
cp $(TOP)/tool/lempar.c .
# Rules to build individual *.o files from generated *.c files. This
# applies to:
# Rules to build individual files
#
# parse.o
# opcodes.o
#
%.o: %.c $(HDR)
$(TCCX) -c $<
alter.o: $(TOP)/src/alter.c $(HDR)
$(TCCX) -c $(TOP)/src/alter.c
# Rules to build individual *.o files from files in the src directory.
#
%.o: $(TOP)/src/%.c $(HDR)
$(TCCX) -c $<
analyze.o: $(TOP)/src/analyze.c $(HDR)
$(TCCX) -c $(TOP)/src/analyze.c
attach.o: $(TOP)/src/attach.c $(HDR)
$(TCCX) -c $(TOP)/src/attach.c
auth.o: $(TOP)/src/auth.c $(HDR)
$(TCCX) -c $(TOP)/src/auth.c
btree.o: $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h
$(TCCX) -c $(TOP)/src/btree.c
build.o: $(TOP)/src/build.c $(HDR)
$(TCCX) -c $(TOP)/src/build.c
callback.o: $(TOP)/src/callback.c $(HDR)
$(TCCX) -c $(TOP)/src/callback.c
complete.o: $(TOP)/src/complete.c $(HDR)
$(TCCX) -c $(TOP)/src/complete.c
date.o: $(TOP)/src/date.c $(HDR)
$(TCCX) -c $(TOP)/src/date.c
delete.o: $(TOP)/src/delete.c $(HDR)
$(TCCX) -c $(TOP)/src/delete.c
expr.o: $(TOP)/src/expr.c $(HDR)
$(TCCX) -c $(TOP)/src/expr.c
func.o: $(TOP)/src/func.c $(HDR)
$(TCCX) -c $(TOP)/src/func.c
hash.o: $(TOP)/src/hash.c $(HDR)
$(TCCX) -c $(TOP)/src/hash.c
insert.o: $(TOP)/src/insert.c $(HDR)
$(TCCX) -c $(TOP)/src/insert.c
legacy.o: $(TOP)/src/legacy.c $(HDR)
$(TCCX) -c $(TOP)/src/legacy.c
main.o: $(TOP)/src/main.c $(HDR)
$(TCCX) -c $(TOP)/src/main.c
pager.o: $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
$(TCCX) -c $(TOP)/src/pager.c
opcodes.o: opcodes.c
$(TCCX) -c opcodes.c
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
sort -n -b +2 opcodes.h | awk -f $(TOP)/mkopcodec.awk >opcodes.c
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
cat parse.h $(TOP)/src/vdbe.c | awk -f $(TOP)/mkopcodeh.awk >opcodes.h
os_unix.o: $(TOP)/src/os_unix.c $(HDR)
$(TCCX) -c $(TOP)/src/os_unix.c
os_win.o: $(TOP)/src/os_win.c $(HDR)
$(TCCX) -c $(TOP)/src/os_win.c
parse.o: parse.c $(HDR)
$(TCCX) -c parse.c
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon
cp $(TOP)/src/parse.y .
./lemon $(OPTS) parse.y
pragma.o: $(TOP)/src/pragma.c $(HDR)
$(TCCX) $(TCL_FLAGS) -c $(TOP)/src/pragma.c
prepare.o: $(TOP)/src/prepare.c $(HDR)
$(TCCX) $(TCL_FLAGS) -c $(TOP)/src/prepare.c
printf.o: $(TOP)/src/printf.c $(HDR)
$(TCCX) $(TCL_FLAGS) -c $(TOP)/src/printf.c
random.o: $(TOP)/src/random.c $(HDR)
$(TCCX) -c $(TOP)/src/random.c
select.o: $(TOP)/src/select.c $(HDR)
$(TCCX) -c $(TOP)/src/select.c
sqlite3.h: $(TOP)/src/sqlite.h.in
sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
-e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | awk '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
$(TOP)/src/sqlite.h.in >sqlite3.h
table.o: $(TOP)/src/table.c $(HDR)
$(TCCX) -c $(TOP)/src/table.c
tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR)
$(TCCX) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
sort -n -b -k 3 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
cat parse.h $(TOP)/src/vdbe.c | \
$(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
# Rules to build parse.c and parse.h - the outputs of lemon.
#
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon $(TOP)/addopcodes.awk
cp $(TOP)/src/parse.y .
rm -f parse.h
./lemon $(OPTS) parse.y
mv parse.h parse.h.temp
awk -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
tokenize.o: $(TOP)/src/tokenize.c keywordhash.h $(HDR)
$(TCCX) -c $(TOP)/src/tokenize.c
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
./mkkeywordhash >keywordhash.h
trigger.o: $(TOP)/src/trigger.c $(HDR)
$(TCCX) -c $(TOP)/src/trigger.c
update.o: $(TOP)/src/update.c $(HDR)
$(TCCX) -c $(TOP)/src/update.c
# Rules to build the extension objects.
#
icu.o: $(TOP)/ext/icu/icu.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/icu/icu.c
utf.o: $(TOP)/src/utf.c $(HDR)
$(TCCX) -c $(TOP)/src/utf.c
fts2.o: $(TOP)/ext/fts2/fts2.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2.c
util.o: $(TOP)/src/util.c $(HDR)
$(TCCX) -c $(TOP)/src/util.c
fts2_hash.o: $(TOP)/ext/fts2/fts2_hash.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_hash.c
vacuum.o: $(TOP)/src/vacuum.c $(HDR)
$(TCCX) -c $(TOP)/src/vacuum.c
fts2_icu.o: $(TOP)/ext/fts2/fts2_icu.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_icu.c
vdbe.o: $(TOP)/src/vdbe.c $(VDBEHDR)
$(TCCX) -c $(TOP)/src/vdbe.c
fts2_porter.o: $(TOP)/ext/fts2/fts2_porter.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_porter.c
vdbeapi.o: $(TOP)/src/vdbeapi.c $(VDBEHDR)
$(TCCX) -c $(TOP)/src/vdbeapi.c
fts2_tokenizer.o: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer.c
vdbeaux.o: $(TOP)/src/vdbeaux.c $(VDBEHDR)
$(TCCX) -c $(TOP)/src/vdbeaux.c
fts2_tokenizer1.o: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer1.c
vdbefifo.o: $(TOP)/src/vdbefifo.c $(VDBEHDR)
$(TCCX) -c $(TOP)/src/vdbefifo.c
fts3.o: $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
fts3_expr.o: $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_expr.c
fts3_hash.o: $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_hash.c
fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c
fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c
fts3_tokenizer.o: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c
fts3_tokenizer1.o: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer1.c
rtree.o: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
vdbemem.o: $(TOP)/src/vdbemem.c $(VDBEHDR)
$(TCCX) -c $(TOP)/src/vdbemem.c
where.o: $(TOP)/src/where.c $(HDR)
$(TCCX) -c $(TOP)/src/where.c
# Rules for building test programs and for running tests
#
@@ -453,38 +349,24 @@ tclsqlite3: $(TOP)/src/tclsqlite.c libsqlite3.a
$(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
$(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL) $(THREADLIB)
testfixture$(EXE): $(TOP)/src/tclsqlite.c libsqlite3.a $(TESTSRC)
$(TCCX) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1 -o testfixture$(EXE) \
$(TESTSRC) $(TOP)/src/tclsqlite.c \
libsqlite3.a $(LIBTCL) $(THREADLIB)
# Rules to build the 'testfixture' application.
#
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
crashtest: $(TOP)/src/tclsqlite.c libsqlite3.a $(TESTSRC) $(TOP)/src/os_test.c
$(TCCX) $(TCL_FLAGS) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \
-o crashtest \
$(TESTSRC) $(TOP)/src/os_test.c $(TOP)/src/tclsqlite.c \
libsqlite3.a $(LIBTCL) $(THREADLIB)
testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB) libsqlite3.a
amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
-DSQLITE_ENABLE_FTS3=1 \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c \
-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
fulltest: testfixture$(EXE) sqlite3$(EXE)
fulltest: testfixture$(EXE) sqlite3$(EXE) crashtest
./testfixture$(EXE) $(TOP)/test/all.test
soaktest: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/all.test -soak 1
test: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/veryquick.test
./testfixture$(EXE) $(TOP)/test/quick.test
sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite3.a $(TESTSRC) \
$(TOP)/tool/spaceanal.tcl
sed \
-e '/^#/d' \
@@ -493,19 +375,177 @@ sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
-e 's,^,",' \
-e 's,$$,\\n",' \
$(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
-DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_DEBUG=1 -DSQLITE_PRIVATE="" \
$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
-o sqlite3_analyzer$(EXE) \
$(LIBTCL) $(THREADLIB)
$(TCCX) $(TCL_FLAGS) -DTCLSH=2 -DSQLITE_TEST=1 -o \
sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
libsqlite3.a $(LIBTCL) $(THREADLIB)
TEST_EXTENSION = $(SHPREFIX)testloadext.$(SO)
$(TEST_EXTENSION): $(TOP)/src/test_loadext.c
$(MKSHLIB) $(TOP)/src/test_loadext.c -o $(TEST_EXTENSION)
# Rules used to build documentation
#
arch.html: $(TOP)/www/arch.tcl
tclsh $(TOP)/www/arch.tcl >arch.html
extensiontest: testfixture$(EXE) $(TEST_EXTENSION)
./testfixture$(EXE) $(TOP)/test/loadext.test
autoinc.html: $(TOP)/www/autoinc.tcl
tclsh $(TOP)/www/autoinc.tcl >autoinc.html
c_interface.html: $(TOP)/www/c_interface.tcl
tclsh $(TOP)/www/c_interface.tcl >c_interface.html
capi3.html: $(TOP)/www/capi3.tcl
tclsh $(TOP)/www/capi3.tcl >capi3.html
capi3ref.html: $(TOP)/www/capi3ref.tcl
tclsh $(TOP)/www/capi3ref.tcl >capi3ref.html
changes.html: $(TOP)/www/changes.tcl
tclsh $(TOP)/www/changes.tcl >changes.html
compile.html: $(TOP)/www/compile.tcl
tclsh $(TOP)/www/compile.tcl >compile.html
copyright.html: $(TOP)/www/copyright.tcl
tclsh $(TOP)/www/copyright.tcl >copyright.html
copyright-release.html: $(TOP)/www/copyright-release.html
cp $(TOP)/www/copyright-release.html .
copyright-release.pdf: $(TOP)/www/copyright-release.pdf
cp $(TOP)/www/copyright-release.pdf .
common.tcl: $(TOP)/www/common.tcl
cp $(TOP)/www/common.tcl .
conflict.html: $(TOP)/www/conflict.tcl
tclsh $(TOP)/www/conflict.tcl >conflict.html
datatypes.html: $(TOP)/www/datatypes.tcl
tclsh $(TOP)/www/datatypes.tcl >datatypes.html
datatype3.html: $(TOP)/www/datatype3.tcl
tclsh $(TOP)/www/datatype3.tcl >datatype3.html
different.html: $(TOP)/www/different.tcl
tclsh $(TOP)/www/different.tcl >different.html
docs.html: $(TOP)/www/docs.tcl
tclsh $(TOP)/www/docs.tcl >docs.html
download.html: $(TOP)/www/download.tcl
mkdir -p doc
tclsh $(TOP)/www/download.tcl >download.html
faq.html: $(TOP)/www/faq.tcl
tclsh $(TOP)/www/faq.tcl >faq.html
fileformat.html: $(TOP)/www/fileformat.tcl
tclsh $(TOP)/www/fileformat.tcl >fileformat.html
formatchng.html: $(TOP)/www/formatchng.tcl
tclsh $(TOP)/www/formatchng.tcl >formatchng.html
index.html: $(TOP)/www/index.tcl last_change
tclsh $(TOP)/www/index.tcl >index.html
lang.html: $(TOP)/www/lang.tcl
tclsh $(TOP)/www/lang.tcl doc >lang.html
pragma.html: $(TOP)/www/pragma.tcl
tclsh $(TOP)/www/pragma.tcl >pragma.html
lockingv3.html: $(TOP)/www/lockingv3.tcl
tclsh $(TOP)/www/lockingv3.tcl >lockingv3.html
mingw.html: $(TOP)/www/mingw.tcl
tclsh $(TOP)/www/mingw.tcl >mingw.html
nulls.html: $(TOP)/www/nulls.tcl
tclsh $(TOP)/www/nulls.tcl >nulls.html
oldnews.html: $(TOP)/www/oldnews.tcl
tclsh $(TOP)/www/oldnews.tcl >oldnews.html
omitted.html: $(TOP)/www/omitted.tcl
tclsh $(TOP)/www/omitted.tcl >omitted.html
opcode.html: $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c
tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
optimizer.html: $(TOP)/www/optimizer.tcl
tclsh $(TOP)/www/optimizer.tcl >optimizer.html
optoverview.html: $(TOP)/www/optoverview.tcl
tclsh $(TOP)/www/optoverview.tcl >optoverview.html
quickstart.html: $(TOP)/www/quickstart.tcl
tclsh $(TOP)/www/quickstart.tcl >quickstart.html
speed.html: $(TOP)/www/speed.tcl
tclsh $(TOP)/www/speed.tcl >speed.html
sqlite.html: $(TOP)/www/sqlite.tcl
tclsh $(TOP)/www/sqlite.tcl >sqlite.html
support.html: $(TOP)/www/support.tcl
tclsh $(TOP)/www/support.tcl >support.html
tclsqlite.html: $(TOP)/www/tclsqlite.tcl
tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html
vdbe.html: $(TOP)/www/vdbe.tcl
tclsh $(TOP)/www/vdbe.tcl >vdbe.html
version3.html: $(TOP)/www/version3.tcl
tclsh $(TOP)/www/version3.tcl >version3.html
whentouse.html: $(TOP)/www/whentouse.tcl
tclsh $(TOP)/www/whentouse.tcl >whentouse.html
# Files to be published on the website.
#
DOC = \
arch.html \
autoinc.html \
c_interface.html \
capi3.html \
capi3ref.html \
changes.html \
compile.html \
copyright.html \
copyright-release.html \
copyright-release.pdf \
conflict.html \
datatypes.html \
datatype3.html \
different.html \
docs.html \
download.html \
faq.html \
fileformat.html \
formatchng.html \
index.html \
lang.html \
lockingv3.html \
mingw.html \
nulls.html \
oldnews.html \
omitted.html \
opcode.html \
optimizer.html \
optoverview.html \
pragma.html \
quickstart.html \
speed.html \
sqlite.html \
support.html \
tclsqlite.html \
vdbe.html \
version3.html \
whentouse.html
doc: common.tcl $(DOC)
mkdir -p doc
mv $(DOC) doc
cp $(TOP)/www/*.gif $(TOP)/art/*.gif doc
# Standard install and cleanup targets
#
@@ -515,10 +555,8 @@ install: sqlite3 libsqlite3.a sqlite3.h
mv sqlite3.h /usr/include
clean:
rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.*
rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.* crashtest
rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
rm -f $(PUBLISH)
rm -f *.da *.bb *.bbg gmon.out
rm -rf tsrc target_source
rm -f testloadext.dll libtestloadext.so
rm -f sqlite3.c fts?amal.c tclsqlite3.c
rm -rf tsrc
+289 -751
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
bd443f39a947ae84d39437ff97c12a62754b5e42
e61382aed45a83ad688a0461948f9cd052a527fa
+20 -25
View File
@@ -6,44 +6,39 @@
# library. "tclsqlite3.dll" contains the TCL bindings and is the
# library that is loaded into TCL in order to run SQLite.
#
make sqlite3.c
make target_source
cd tsrc
PATH=$PATH:/opt/mingw/bin
TCLDIR=/home/drh/tcltk/846/win/846win
TCLSTUBLIB=$TCLDIR/libtcl84stub.a
OPTS='-DUSE_TCL_STUBS=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
OPTS="$OPTS -DSQLITE_THREADSAFE=1"
OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
OPTS="$OPTS -DSQLITE_ENABLE_RTREE=1"
OPTS="$OPTS -DSQLITE_ENABLE_COLUMN_METADATA=1"
CC="i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR"
NM="i386-mingw32msvc-nm"
CMD="$CC -c sqlite3.c"
echo $CMD
$CMD
CMD="$CC -c tclsqlite3.c"
echo $CMD
$CMD
OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1 -DTHREADSAFE=1'
CC="i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR"
rm shell.c
for i in *.c; do
CMD="$CC -c $i"
echo $CMD
$CMD
done
echo 'EXPORTS' >tclsqlite3.def
$NM tclsqlite3.o | grep ' T ' >temp1
grep '_Init$' temp1 >temp2
grep '_SafeInit$' temp1 >>temp2
grep ' T _sqlite3_' temp1 >>temp2
echo 'EXPORTS' >tclsqlite3.def
sed 's/^.* T _//' temp2 | sort | uniq >>tclsqlite3.def
echo 'Tclsqlite3_Init' >>tclsqlite3.def
echo 'Tclsqlite_Init' >>tclsqlite3.def
echo 'Sqlite3_Init' >>tclsqlite3.def
echo 'Sqlite_Init' >>tclsqlite3.def
i386-mingw32msvc-dllwrap \
--def tclsqlite3.def -v --export-all \
--driver-name i386-mingw32msvc-gcc \
--dlltool-name i386-mingw32msvc-dlltool \
--as i386-mingw32msvc-as \
--target i386-mingw32 \
-dllname tclsqlite3.dll -lmsvcrt tclsqlite3.o $TCLSTUBLIB
$NM sqlite3.o | grep ' T ' >temp1
echo 'EXPORTS' >sqlite3.def
grep ' _sqlite3_' temp1 | sed 's/^.* _//' >>sqlite3.def
-dllname tclsqlite3.dll -lmsvcrt *.o $TCLSTUBLIB
i386-mingw32msvc-strip tclsqlite3.dll
rm tclsqlite.o
i386-mingw32msvc-dllwrap \
--def sqlite3.def -v --export-all \
--driver-name i386-mingw32msvc-gcc \
--dlltool-name i386-mingw32msvc-dlltool \
--as i386-mingw32msvc-as \
--target i386-mingw32 \
-dllname sqlite3.dll -lmsvcrt sqlite3.o
-dllname sqlite3.dll -lmsvcrt *.o
i386-mingw32msvc-strip sqlite3.dll
cd ..
-13
View File
@@ -1,13 +0,0 @@
#!/bin/sh
#
# This script is used to compile SQLite into a shared library on Linux.
#
# Two separate shared libraries are generated. "sqlite3.so" is the core
# library. "tclsqlite3.so" contains the TCL bindings and is the
# library that is loaded into TCL in order to run SQLite.
#
CFLAGS=-O2 -Wall
make fts2amal.c
echo gcc $CFLAGS -shared fts2amal.c -o fts2.so
gcc $CFLAGS -shared fts2amal.c -o fts2.so
strip fts2.so
-22
View File
@@ -1,22 +0,0 @@
#!/bin/sh
#
# This script is used to compile SQLite extensions into DLLs.
#
make fts2amal.c
PATH=$PATH:/opt/mingw/bin
OPTS='-DTHREADSAFE=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
CC="i386-mingw32msvc-gcc -O2 $OPTS -Itsrc"
NM="i386-mingw32msvc-nm"
CMD="$CC -c fts2amal.c"
echo $CMD
$CMD
echo 'EXPORTS' >fts2.def
echo 'sqlite3_extension_init' >>fts2.def
i386-mingw32msvc-dllwrap \
--def fts2.def -v --export-all \
--driver-name i386-mingw32msvc-gcc \
--dlltool-name i386-mingw32msvc-dlltool \
--as i386-mingw32msvc-as \
--target i386-mingw32 \
-dllname fts2.dll -lmsvcrt fts2amal.o
zip fts2dll.zip fts2.dll fts2.def
+3 -6
View File
@@ -15,17 +15,14 @@ BEGIN {
printf " || !defined(NDEBUG)"
printf " || defined(VDBE_PROFILE)"
print " || defined(SQLITE_DEBUG)"
print "const char *sqlite3OpcodeName(int i){"
print " static const char *const azName[] = { \"?\","
print "const char *const sqlite3OpcodeNames[] = { \"?\","
}
/define OP_/ {
sub("OP_","",$2)
i++
printf " /* %3d */ \"%s\",\n", $3, $2
printf " /* %3d */ \"%s\",\n", $3, $2
}
END {
print " };"
print " return azName[i];"
print "}"
print "};"
print "#endif"
}
+30 -76
View File
@@ -14,28 +14,20 @@
# the OP_ is the same as the TK_ value. If missing, the OP_ value is assigned
# a small integer that is different from every other OP_ value.
#
# We go to the trouble of making some OP_ values the same as TK_ values
# We go to the trouble of making some OP_ value the same as TK_ values
# as an optimization. During parsing, things like expression operators
# are coded with TK_ values such as TK_ADD, TK_DIVIDE, and so forth. Later
# during code generation, we need to generate corresponding opcodes like
# OP_Add and OP_Divide. By making TK_ADD==OP_Add and TK_DIVIDE==OP_Divide,
# code to translate from one to the other is avoided. This makes the
# code to translation from one to the other is avoided. This makes the
# code generator run (infinitesimally) faster and more importantly it makes
# the library footprint smaller.
#
# This script also scans for lines of the form:
#
# case OP_aaaa: /* jump, in1, in2, in3, out2-prerelease, out3 */
#
# When such comments are found on an opcode, it means that certain
# properties apply to that opcode. Set corresponding flags using the
# OPFLG_INITIALIZER macro.
# the total library smaller.
#
# Remember the TK_ values from the parse.h file
/^#define TK_/ {
tk[$2] = 0+$3
tk[$2] = $3
}
# Scan for "case OP_aaaa:" lines in the vdbe.c file
@@ -44,12 +36,6 @@
sub(/:/,"",name)
sub("\r","",name)
op[name] = -1
jump[name] = 0
out2_prerelease[name] = 0
in1[name] = 0
in2[name] = 0
in3[name] = 0
out3[name] = 0
for(i=3; i<NF; i++){
if($i=="same" && $(i+1)=="as"){
sym = $(i+2)
@@ -58,23 +44,10 @@
used[op[name]] = 1
sameas[op[name]] = sym
}
x = $i
sub(",","",x)
if(x=="jump"){
jump[name] = 1
}else if(x=="out2-prerelease"){
out2_prerelease[name] = 1
}else if(x=="in1"){
in1[name] = 1
}else if(x=="in2"){
in2[name] = 1
}else if(x=="in3"){
in3[name] = 1
}else if(x=="out3"){
out3[name] = 1
if($i=="no-push"){
nopush[name] = 1
}
}
order[n_op++] = name;
}
# Assign numbers to all opcodes and output the result.
@@ -83,12 +56,7 @@ END {
max = 0
print "/* Automatically generated. Do not edit */"
print "/* See the mkopcodeh.awk script for details */"
op["OP_Noop"] = -1;
order[n_op++] = "OP_Noop";
op["OP_Explain"] = -1;
order[n_op++] = "OP_Explain";
for(i=0; i<n_op; i++){
name = order[i];
for(name in op){
if( op[name]<0 ){
cnt++
while( used[cnt] ) cnt++
@@ -114,43 +82,29 @@ END {
}
}
# Generate the bitvectors:
#
# bit 0: jump
# bit 1: pushes a result onto stack
# bit 2: output to p1. release p1 before opcode runs
#
for(i=0; i<=max; i++) bv[i] = 0;
for(i=0; i<n_op; i++){
name = order[i];
x = op[name]
a0 = a1 = a2 = a3 = a4 = a5 = a6 = a7 = 0
# a8 = a9 = a10 = a11 = a12 = a13 = a14 = a15 = 0
if( jump[name] ) a0 = 1;
if( out2_prerelease[name] ) a1 = 2;
if( in1[name] ) a2 = 4;
if( in2[name] ) a3 = 8;
if( in3[name] ) a4 = 16;
if( out3[name] ) a5 = 32;
# bv[x] = a0+a1+a2+a3+a4+a5+a6+a7+a8+a9+a10+a11+a12+a13+a14+a15;
bv[x] = a0+a1+a2+a3+a4+a5+a6+a7;
# Generate the 10 16-bit bitmasks used by function opcodeUsesStack()
# in vdbeaux.c. See comments in that function for details.
#
nopush[0] = 0 # 0..15
nopush[1] = 0 # 16..31
nopush[2] = 0 # 32..47
nopush[3] = 0 # 48..63
nopush[4] = 0 # 64..79
nopush[5] = 0 # 80..95
nopush[6] = 0 # 96..111
nopush[7] = 0 # 112..127
nopush[8] = 0 # 128..143
nopush[9] = 0 # 144..159
for(name in op){
if( nopush[name] ){
n = op[name]
j = n%16
i = ((n - j)/16)
nopush[i] = nopush[i] + (2^j)
}
}
print "\n"
print "/* Properties such as \"out2\" or \"jump\" that are specified in"
print "** comments following the \"case\" for each opcode in the vdbe.c"
print "** are encoded into bitvectors as follows:"
print "*/"
print "#define OPFLG_JUMP 0x0001 /* jump: P2 holds jmp target */"
print "#define OPFLG_OUT2_PRERELEASE 0x0002 /* out2-prerelease: */"
print "#define OPFLG_IN1 0x0004 /* in1: P1 is an input */"
print "#define OPFLG_IN2 0x0008 /* in2: P2 is an input */"
print "#define OPFLG_IN3 0x0010 /* in3: P3 is an input */"
print "#define OPFLG_OUT3 0x0020 /* out3: P3 is an output */"
print "#define OPFLG_INITIALIZER {\\"
for(i=0; i<=max; i++){
if( i%8==0 ) printf("/* %3d */",i)
printf " 0x%02x,", bv[i]
if( i%8==7 ) printf("\\\n");
printf "\n"
for(i=0; i<10; i++){
printf "#define NOPUSH_MASK_%d %d\n", i, nopush[i]
}
print "}"
}
+1 -4
View File
@@ -11,10 +11,7 @@ cd tsrc
rm shell.c
TCLDIR=/home/drh/tcltk/846/linux/846linux
TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1 -DHAVE_DLOPEN=1'
OPTS="$OPTS -DSQLITE_THREADSAFE=1"
OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
OPTS="$OPTS -DSQLITE_ENABLE_COLUMN_METADATA=1"
OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1'
for i in *.c; do
if test $i != 'keywordhash.c'; then
CMD="cc -fPIC $OPTS -O2 -I. -I$TCLDIR -c $i"
+25 -47
View File
@@ -1,7 +1,9 @@
#!/bin/sh
#
# This script is used to compile SQLite and package everything up
# so that it is ready to move to the SQLite website.
# This script is used to compile SQLite and all its documentation and
# ship everything up to the SQLite website. This script will only work
# on the system "zadok" at the Hwaci offices. But others might find
# the script useful as an example.
#
# Set srcdir to the name of the directory that contains the publish.sh
@@ -18,85 +20,63 @@ chmod +x $srcdir/install-sh
#
VERS=`cat $srcdir/VERSION`
VERSW=`sed 's/\./_/g' $srcdir/VERSION`
echo "VERSIONS: $VERS $VERSW"
# Start by building an sqlite shell for linux.
#
make clean
make sqlite3.c
CFLAGS="-Os -DSQLITE_ENABLE_FTS3=0 -DSQLITE_ENABLE_RTREE=0"
CFLAGS="$CFLAGS -DSQLITE_THREADSAFE=0"
echo '***** '"COMPILING sqlite3-$VERS.bin..."
gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl
make sqlite3
strip sqlite3
mv sqlite3 sqlite3-$VERS.bin
gzip sqlite3-$VERS.bin
chmod 644 sqlite3-$VERS.bin.gz
mv sqlite3-$VERS.bin.gz doc
# Build a source archive useful for windows.
#
make target_source
cd tsrc
echo '***** BUILDING preprocessed source archives'
rm fts[12]* icu*
rm -f ../doc/sqlite-source-$VERSW.zip
zip ../doc/sqlite-source-$VERSW.zip *
cd ..
cp tsrc/sqlite3.h tsrc/sqlite3ext.h .
pwd
zip doc/sqlite-amalgamation-$VERSW.zip sqlite3.c sqlite3.h sqlite3ext.h
# Build the sqlite.so and tclsqlite.so shared libraries
# under Linux
#
TCLDIR=/home/drh/tcltk/846/linux/846linux
TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
CFLAGS="-Os -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1"
CFLAGS="$CFLAGS -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1"
CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
echo '***** BUILDING shared libraries for linux'
gcc $CFLAGS -shared tclsqlite3.c $TCLSTUBLIB -o tclsqlite3.so -lpthread
strip tclsqlite3.so
chmod 644 tclsqlite3.so
. $srcdir/mkso.sh
cd tsrc
mv tclsqlite3.so tclsqlite-$VERS.so
gzip tclsqlite-$VERS.so
mv tclsqlite-$VERS.so.gz doc
gcc $CFLAGS -shared sqlite3.c -o sqlite3.so -lpthread
strip sqlite3.so
chmod 644 sqlite3.so
mv tclsqlite-$VERS.so.gz ../doc
mv sqlite3.so sqlite-$VERS.so
gzip sqlite-$VERS.so
mv sqlite-$VERS.so.gz doc
mv sqlite-$VERS.so.gz ../doc
cd ..
# Build the tclsqlite3.dll and sqlite3.dll shared libraries.
#
. $srcdir/mkdll.sh
echo '***** PACKAGING shared libraries for windows'
echo zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll
zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll
echo zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
cd tsrc
echo zip ../doc/tclsqlite-$VERSW.zip tclsqlite3.dll
zip ../doc/tclsqlite-$VERSW.zip tclsqlite3.dll
echo zip ../doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
zip ../doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
cd ..
# Build the sqlite.exe executable for windows.
#
OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1 -DSQLITE_THREADSAFE=0'
OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_RTREE=1"
i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR sqlite3.c tsrc/shell.c \
-o sqlite3.exe
zip doc/sqlite-$VERSW.zip sqlite3.exe
make target_source
cd tsrc
rm tclsqlite.c
OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1'
i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR *.c -o sqlite3.exe
zip ../doc/sqlite-$VERSW.zip sqlite3.exe
cd ..
# Construct a tarball of the source tree
#
echo '***** BUILDING source archive'
ORIGIN=`pwd`
cd $srcdir
chmod +x configure
cd ..
mv sqlite sqlite-$VERS
EXCLUDE=`find sqlite-$VERS -print | egrep '(www/|art/|doc/|contrib/|_FOSSIL_)' | sed 's,^, --exclude ,'`
echo "tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite-$VERS"
EXCLUDE=`find sqlite-$VERS -print | grep CVS | sed 's,^, --exclude ,'`
tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite-$VERS
mv sqlite-$VERS sqlite
cd $ORIGIN
@@ -132,6 +112,4 @@ mv $HOME/rpm/SRPMS/sqlite-$vers*.rpm doc
# Build the website
#
#cp $srcdir/../historical/* doc
#make doc
#cd doc
#chmod 644 *.gz
make doc
-35
View File
@@ -1,35 +0,0 @@
#!/bin/sh
#
# This script is used to compile SQLite and package everything up
# so that it is ready to move to the SQLite website.
#
# Set srcdir to the name of the directory that contains the publish.sh
# script.
#
srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
# Get the makefile.
#
cp $srcdir/Makefile.linux-gcc ./Makefile
chmod +x $srcdir/install-sh
# Get the current version number - needed to help build filenames
#
VERS=`cat $srcdir/VERSION`
VERSW=`sed 's/\./_/g' $srcdir/VERSION`
echo "VERSIONS: $VERS $VERSW"
# Start by building an sqlite shell for linux.
#
make clean
make sqlite3.c
CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0"
NAME=sqlite3-$VERS-osx-x86.bin
echo '***** '"COMPILING $NAME..."
gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o $NAME -ldl
strip $NAME
chmod 644 $NAME
gzip $NAME
mkdir -p doc
mv $NAME.gz doc
+3 -8
View File
@@ -8,13 +8,12 @@ Version: %{version}
Release: %{release}
Source: %{name}-%{version}.tar.gz
Group: System/Libraries
URL: http://www.sqlite.org/
URL: http://www.hwaci.com/sw/sqlite/
License: Public Domain
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
SQLite is a software library that implements a self-contained, serverless,
zero-configuration, transactional SQL database engine.
SQLite is a C library that implements an embeddable SQL database engine.
Programs that link with the SQLite library can have SQL database access
without running a separate RDBMS process. The distribution comes with a
standalone command-line access program (sqlite) that can be used to
@@ -28,7 +27,7 @@ Requires: %{name} = %{version}-%{release}
%description -n %{name}-devel
The sqlite-devel package contains the header files and libraries needed
to develop programs that use the SQLite database library.
to develop programs that use the sqlite database library.
%prep
%setup -q -n %{name}
@@ -46,10 +45,6 @@ install -d $RPM_BUILD_ROOT/%{_prefix}/include
install -d $RPM_BUILD_ROOT/%{_prefix}/lib
make install prefix=$RPM_BUILD_ROOT/%{_prefix}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -fr $RPM_BUILD_ROOT
+1 -2
View File
@@ -7,7 +7,6 @@ includedir=@includedir@
Name: SQLite
Description: SQL database engine
Version: @RELEASE@
Version: @VERSION@
Libs: -L${libdir} -lsqlite
Libs.private: @LIBS@
Cflags: -I${includedir}
+97
View File
@@ -0,0 +1,97 @@
EXPORTS
sqlite3_aggregate_context
sqlite3_aggregate_count
sqlite3_bind_blob
sqlite3_bind_double
sqlite3_bind_int
sqlite3_bind_int64
sqlite3_bind_null
sqlite3_bind_parameter_count
sqlite3_bind_parameter_index
sqlite3_bind_parameter_name
sqlite3_bind_text
sqlite3_bind_text16
sqlite3_busy_handler
sqlite3_busy_timeout
sqlite3_changes
sqlite3_close
sqlite3_collation_needed
sqlite3_collation_needed16
sqlite3_column_blob
sqlite3_column_bytes
sqlite3_column_bytes16
sqlite3_column_count
sqlite3_column_decltype
sqlite3_column_decltype16
sqlite3_column_double
sqlite3_column_int
sqlite3_column_int64
sqlite3_column_name
sqlite3_column_name16
sqlite3_column_text
sqlite3_column_text16
sqlite3_column_type
sqlite3_commit_hook
sqlite3_complete
sqlite3_complete16
sqlite3_create_collation
sqlite3_create_collation16
sqlite3_create_function
sqlite3_create_function16
sqlite3_data_count
sqlite3_db_handle
sqlite3_errcode
sqlite3_errmsg
sqlite3_errmsg16
sqlite3_exec
sqlite3_expired
sqlite3_finalize
sqlite3_free
sqlite3_free_table
sqlite3_get_autocommit
sqlite3_get_auxdata
sqlite3_get_table
sqlite3_global_recover
sqlite3_interrupt
sqlite3_last_insert_rowid
sqlite3_libversion
sqlite3_libversion_number
sqlite3_mprintf
sqlite3_open
sqlite3_open16
sqlite3_prepare
sqlite3_prepare16
sqlite3_progress_handler
sqlite3_reset
sqlite3_result_blob
sqlite3_result_double
sqlite3_result_error
sqlite3_result_error16
sqlite3_result_int
sqlite3_result_int64
sqlite3_result_null
sqlite3_result_text
sqlite3_result_text16
sqlite3_result_text16be
sqlite3_result_text16le
sqlite3_result_value
sqlite3_set_authorizer
sqlite3_set_auxdata
sqlite3_snprintf
sqlite3_step
sqlite3_total_changes
sqlite3_trace
sqlite3_transfer_bindings
sqlite3_user_data
sqlite3_value_blob
sqlite3_value_bytes
sqlite3_value_bytes16
sqlite3_value_double
sqlite3_value_int
sqlite3_value_int64
sqlite3_value_text
sqlite3_value_text16
sqlite3_value_text16be
sqlite3_value_text16le
sqlite3_value_type
sqlite3_vmprintf
+12 -13
View File
@@ -1,13 +1,12 @@
# Package Information for pkg-config
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: SQLite
Description: SQL database engine
Version: @RELEASE@
Libs: -L${libdir} -lsqlite3
Libs.private: @LIBS@
Cflags: -I${includedir}
# Package Information for pkg-config
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: SQLite
Description: SQL database engine
Version: @VERSION@
Libs: -L${libdir} -lsqlite3
Cflags: -I${includedir}
+106 -344
View File
@@ -12,9 +12,10 @@
** This file contains C code routines that used to generate VDBE code
** that implements the ALTER TABLE command.
**
** $Id: alter.c,v 1.62 2009/07/24 17:58:53 danielk1977 Exp $
** $Id: alter.c,v 1.8 2005/08/19 19:14:13 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
/*
** The code in this file only exists if we are not omitting the
@@ -27,7 +28,7 @@
** This function is used by SQL generated to implement the
** ALTER TABLE command. The first argument is the text of a CREATE TABLE or
** CREATE INDEX command. The second is a table name. The table name in
** the CREATE TABLE or CREATE INDEX statement is replaced with the third
** the CREATE TABLE or CREATE INDEX statement is replaced with the second
** argument and the result returned. Examples:
**
** sqlite_rename_table('CREATE TABLE abc(a, b, c)', 'def')
@@ -38,7 +39,7 @@
*/
static void renameTableFunc(
sqlite3_context *context,
int NotUsed,
int argc,
sqlite3_value **argv
){
unsigned char const *zSql = sqlite3_value_text(argv[0]);
@@ -46,119 +47,47 @@ static void renameTableFunc(
int token;
Token tname;
unsigned char const *zCsr = zSql;
char const *zCsr = zSql;
int len = 0;
char *zRet;
sqlite3 *db = sqlite3_context_db_handle(context);
UNUSED_PARAMETER(NotUsed);
/* The principle used to locate the table name in the CREATE TABLE
** statement is that the table name is the first non-space token that
** is immediately followed by a TK_LP or TK_USING token.
** statement is that the table name is the first token that is immediatedly
** followed by a left parenthesis - TK_LP.
*/
if( zSql ){
do {
if( !*zCsr ){
/* Ran out of input before finding an opening bracket. Return NULL. */
return;
}
/* Store the token that zCsr points to in tname. */
tname.z = (char*)zCsr;
tname.z = zCsr;
tname.n = len;
/* Advance zCsr to the next token. Store that token type in 'token',
** and its length in 'len' (to be used next iteration of this loop).
** and it's length in 'len' (to be used next iteration of this loop).
*/
do {
zCsr += len;
len = sqlite3GetToken(zCsr, &token);
} while( token==TK_SPACE );
assert( len>0 );
} while( token!=TK_LP && token!=TK_USING );
} while( token!=TK_LP );
zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql,
zRet = sqlite3MPrintf("%.*s%Q%s", tname.z - zSql, zSql,
zTableName, tname.z+tname.n);
sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
sqlite3_result_text(context, zRet, -1, sqlite3FreeX);
}
}
/*
** This C function implements an SQL user function that is used by SQL code
** generated by the ALTER TABLE ... RENAME command to modify the definition
** of any foreign key constraints that use the table being renamed as the
** parent table. It is passed three arguments:
**
** 1) The complete text of the CREATE TABLE statement being modified,
** 2) The old name of the table being renamed, and
** 3) The new name of the table being renamed.
**
** It returns the new CREATE TABLE statement. For example:
**
** sqlite_rename_parent('CREATE TABLE t1(a REFERENCES t2)', 't2', 't3')
** -> 'CREATE TABLE t1(a REFERENCES t3)'
*/
#ifndef SQLITE_OMIT_FOREIGN_KEY
static void renameParentFunc(
sqlite3_context *context,
int NotUsed,
sqlite3_value **argv
){
sqlite3 *db = sqlite3_context_db_handle(context);
char *zOutput = 0;
char *zResult;
unsigned char const *zInput = sqlite3_value_text(argv[0]);
unsigned char const *zOld = sqlite3_value_text(argv[1]);
unsigned char const *zNew = sqlite3_value_text(argv[2]);
unsigned const char *z; /* Pointer to token */
int n; /* Length of token z */
int token; /* Type of token */
UNUSED_PARAMETER(NotUsed);
for(z=zInput; *z; z=z+n){
n = sqlite3GetToken(z, &token);
if( token==TK_REFERENCES ){
char *zParent;
do {
z += n;
n = sqlite3GetToken(z, &token);
}while( token==TK_SPACE );
zParent = sqlite3DbStrNDup(db, (const char *)z, n);
if( zParent==0 ) break;
sqlite3Dequote(zParent);
if( 0==sqlite3StrICmp((const char *)zOld, zParent) ){
char *zOut = sqlite3MPrintf(db, "%s%.*s\"%w\"",
(zOutput?zOutput:""), z-zInput, zInput, (const char *)zNew
);
sqlite3DbFree(db, zOutput);
zOutput = zOut;
zInput = &z[n];
}
sqlite3DbFree(db, zParent);
}
}
zResult = sqlite3MPrintf(db, "%s%s", (zOutput?zOutput:""), zInput),
sqlite3_result_text(context, zResult, -1, SQLITE_DYNAMIC);
sqlite3DbFree(db, zOutput);
}
#endif
#ifndef SQLITE_OMIT_TRIGGER
/* This function is used by SQL generated to implement the
/* This function is used by SQL generated to implement the ALTER TABLE
** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER
** statement. The second is a table name. The table name in the CREATE
** TRIGGER statement is replaced with the third argument and the result
** TRIGGER statement is replaced with the second argument and the result
** returned. This is analagous to renameTableFunc() above, except for CREATE
** TRIGGER, not CREATE INDEX and CREATE TABLE.
*/
static void renameTriggerFunc(
sqlite3_context *context,
int NotUsed,
int argc,
sqlite3_value **argv
){
unsigned char const *zSql = sqlite3_value_text(argv[0]);
@@ -167,12 +96,9 @@ static void renameTriggerFunc(
int token;
Token tname;
int dist = 3;
unsigned char const *zCsr = zSql;
char const *zCsr = zSql;
int len = 0;
char *zRet;
sqlite3 *db = sqlite3_context_db_handle(context);
UNUSED_PARAMETER(NotUsed);
/* The principle used to locate the table name in the CREATE TRIGGER
** statement is that the table name is the first token that is immediatedly
@@ -181,18 +107,12 @@ static void renameTriggerFunc(
*/
if( zSql ){
do {
if( !*zCsr ){
/* Ran out of input before finding the table name. Return NULL. */
return;
}
/* Store the token that zCsr points to in tname. */
tname.z = (char*)zCsr;
tname.z = zCsr;
tname.n = len;
/* Advance zCsr to the next token. Store that token type in 'token',
** and its length in 'len' (to be used next iteration of this loop).
** and it's length in 'len' (to be used next iteration of this loop).
*/
do {
zCsr += len;
@@ -218,9 +138,9 @@ static void renameTriggerFunc(
/* Variable tname now contains the token that is the old table-name
** in the CREATE TRIGGER statement.
*/
zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql,
zRet = sqlite3MPrintf("%.*s%Q%s", tname.z - zSql, zSql,
zTableName, tname.z+tname.n);
sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
sqlite3_result_text(context, zRet, -1, sqlite3FreeX);
}
}
#endif /* !SQLITE_OMIT_TRIGGER */
@@ -229,62 +149,24 @@ static void renameTriggerFunc(
** Register built-in functions used to help implement ALTER TABLE
*/
void sqlite3AlterFunctions(sqlite3 *db){
sqlite3CreateFunc(db, "sqlite_rename_table", 2, SQLITE_UTF8, 0,
renameTableFunc, 0, 0);
static const struct {
char *zName;
signed char nArg;
void (*xFunc)(sqlite3_context*,int,sqlite3_value **);
} aFuncs[] = {
{ "sqlite_rename_table", 2, renameTableFunc},
#ifndef SQLITE_OMIT_TRIGGER
sqlite3CreateFunc(db, "sqlite_rename_trigger", 2, SQLITE_UTF8, 0,
renameTriggerFunc, 0, 0);
{ "sqlite_rename_trigger", 2, renameTriggerFunc},
#endif
#ifndef SQLITE_OMIT_FOREIGN_KEY
sqlite3CreateFunc(db, "sqlite_rename_parent", 3, SQLITE_UTF8, 0,
renameParentFunc, 0, 0);
#endif
}
};
int i;
/*
** This function is used to create the text of expressions of the form:
**
** name=<constant1> OR name=<constant2> OR ...
**
** If argument zWhere is NULL, then a pointer string containing the text
** "name=<constant>" is returned, where <constant> is the quoted version
** of the string passed as argument zConstant. The returned buffer is
** allocated using sqlite3DbMalloc(). It is the responsibility of the
** caller to ensure that it is eventually freed.
**
** If argument zWhere is not NULL, then the string returned is
** "<where> OR name=<constant>", where <where> is the contents of zWhere.
** In this case zWhere is passed to sqlite3DbFree() before returning.
**
*/
static char *whereOrName(sqlite3 *db, char *zWhere, char *zConstant){
char *zNew;
if( !zWhere ){
zNew = sqlite3MPrintf(db, "name=%Q", zConstant);
}else{
zNew = sqlite3MPrintf(db, "%s OR name=%Q", zWhere, zConstant);
sqlite3DbFree(db, zWhere);
for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
sqlite3_create_function(db, aFuncs[i].zName, aFuncs[i].nArg,
SQLITE_UTF8, 0, aFuncs[i].xFunc, 0, 0);
}
return zNew;
}
#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
/*
** Generate the text of a WHERE expression which can be used to select all
** tables that have foreign key constraints that refer to table pTab (i.e.
** constraints for which pTab is the parent table) from the sqlite_master
** table.
*/
static char *whereForeignKeys(Parse *pParse, Table *pTab){
FKey *p;
char *zWhere = 0;
for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
zWhere = whereOrName(pParse->db, zWhere, p->pFrom->zName);
}
return zWhere;
}
#endif
/*
** Generate the text of a WHERE expression which can be used to select all
** temporary triggers on table pTab from the sqlite_temp_master table. If
@@ -294,18 +176,17 @@ static char *whereForeignKeys(Parse *pParse, Table *pTab){
static char *whereTempTriggers(Parse *pParse, Table *pTab){
Trigger *pTrig;
char *zWhere = 0;
const Schema *pTempSchema = pParse->db->aDb[1].pSchema; /* Temp db schema */
/* If the table is not located in the temp-db (in which case NULL is
** returned, loop through the tables list of triggers. For each trigger
** that is not part of the temp-db schema, add a clause to the WHERE
** expression being built up in zWhere.
*/
if( pTab->pSchema!=pTempSchema ){
sqlite3 *db = pParse->db;
for(pTrig=sqlite3TriggerList(pParse, pTab); pTrig; pTrig=pTrig->pNext){
if( pTrig->pSchema==pTempSchema ){
zWhere = whereOrName(db, zWhere, pTrig->zName);
char *tmp = 0;
if( pTab->iDb!=1 ){
for( pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext ){
if( pTrig->iDb==1 ){
if( !zWhere ){
zWhere = sqlite3MPrintf("name=%Q", pTrig->name);
}else{
tmp = zWhere;
zWhere = sqlite3MPrintf("%s OR name=%Q", zWhere, pTrig->name);
sqliteFree(tmp);
}
}
}
}
@@ -323,40 +204,37 @@ static char *whereTempTriggers(Parse *pParse, Table *pTab){
static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){
Vdbe *v;
char *zWhere;
int iDb; /* Index of database containing pTab */
int iDb;
#ifndef SQLITE_OMIT_TRIGGER
Trigger *pTrig;
#endif
v = sqlite3GetVdbe(pParse);
if( NEVER(v==0) ) return;
assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
assert( iDb>=0 );
if( !v ) return;
iDb = pTab->iDb;
#ifndef SQLITE_OMIT_TRIGGER
/* Drop any table triggers from the internal schema. */
for(pTrig=sqlite3TriggerList(pParse, pTab); pTrig; pTrig=pTrig->pNext){
int iTrigDb = sqlite3SchemaToIndex(pParse->db, pTrig->pSchema);
assert( iTrigDb==iDb || iTrigDb==1 );
sqlite3VdbeAddOp4(v, OP_DropTrigger, iTrigDb, 0, 0, pTrig->zName, 0);
for(pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext){
assert( pTrig->iDb==iDb || pTrig->iDb==1 );
sqlite3VdbeOp3(v, OP_DropTrigger, pTrig->iDb, 0, pTrig->name, 0);
}
#endif
/* Drop the table and index from the internal schema. */
sqlite3VdbeAddOp4(v, OP_DropTable, iDb, 0, 0, pTab->zName, 0);
/* Drop the table and index from the internal schema */
sqlite3VdbeOp3(v, OP_DropTable, iDb, 0, pTab->zName, 0);
/* Reload the table, index and permanent trigger schemas. */
zWhere = sqlite3MPrintf(pParse->db, "tbl_name=%Q", zName);
zWhere = sqlite3MPrintf("tbl_name=%Q", zName);
if( !zWhere ) return;
sqlite3VdbeAddOp4(v, OP_ParseSchema, iDb, 0, 0, zWhere, P4_DYNAMIC);
sqlite3VdbeOp3(v, OP_ParseSchema, iDb, 0, zWhere, P3_DYNAMIC);
#ifndef SQLITE_OMIT_TRIGGER
/* Now, if the table is not stored in the temp database, reload any temp
** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined.
*/
if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
sqlite3VdbeAddOp4(v, OP_ParseSchema, 1, 0, 0, zWhere, P4_DYNAMIC);
if( (zWhere=whereTempTriggers(pParse, pTab)) ){
sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zWhere, P3_DYNAMIC);
}
#endif
}
@@ -375,25 +253,21 @@ void sqlite3AlterRenameTable(
Table *pTab; /* Table being renamed */
char *zName = 0; /* NULL-terminated version of pName */
sqlite3 *db = pParse->db; /* Database connection */
int nTabName; /* Number of UTF-8 characters in zTabName */
const char *zTabName; /* Original name of the table */
Vdbe *v;
#ifndef SQLITE_OMIT_TRIGGER
char *zWhere = 0; /* Where clause to locate temp triggers */
#endif
VTable *pVTab = 0; /* Non-zero if this is a v-tab with an xRename() */
if( NEVER(db->mallocFailed) ) goto exit_rename_table;
if( sqlite3_malloc_failed ) goto exit_rename_table;
assert( pSrc->nSrc==1 );
assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
pTab = sqlite3LocateTable(pParse, 0, pSrc->a[0].zName, pSrc->a[0].zDatabase);
pTab = sqlite3LocateTable(pParse, pSrc->a[0].zName, pSrc->a[0].zDatabase);
if( !pTab ) goto exit_rename_table;
iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
iDb = pTab->iDb;
zDb = db->aDb[iDb].zName;
/* Get a NULL terminated version of the new table name. */
zName = sqlite3NameFromToken(db, pName);
zName = sqlite3NameFromToken(pName);
if( !zName ) goto exit_rename_table;
/* Check that a table or index named 'zName' does not already exist
@@ -408,9 +282,7 @@ void sqlite3AlterRenameTable(
/* Make sure it is not a system table being altered, or a reserved name
** that the table is being renamed to.
*/
if( sqlite3Strlen30(pTab->zName)>6
&& 0==sqlite3StrNICmp(pTab->zName, "sqlite_", 7)
){
if( strlen(pTab->zName)>6 && 0==sqlite3StrNICmp(pTab->zName, "sqlite_", 7) ){
sqlite3ErrorMsg(pParse, "table %s may not be altered", pTab->zName);
goto exit_rename_table;
}
@@ -418,13 +290,6 @@ void sqlite3AlterRenameTable(
goto exit_rename_table;
}
#ifndef SQLITE_OMIT_VIEW
if( pTab->pSelect ){
sqlite3ErrorMsg(pParse, "view %s may not be altered", pTab->zName);
goto exit_rename_table;
}
#endif
#ifndef SQLITE_OMIT_AUTHORIZATION
/* Invoke the authorization callback. */
if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){
@@ -432,62 +297,16 @@ void sqlite3AlterRenameTable(
}
#endif
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( sqlite3ViewGetColumnNames(pParse, pTab) ){
goto exit_rename_table;
}
if( IsVirtual(pTab) ){
pVTab = sqlite3GetVTable(db, pTab);
if( pVTab->pVtab->pModule->xRename==0 ){
pVTab = 0;
}
}
#endif
/* Begin a transaction and code the VerifyCookie for database iDb.
** Then modify the schema cookie (since the ALTER TABLE modifies the
** schema). Open a statement transaction if the table is a virtual
** table.
** schema).
*/
v = sqlite3GetVdbe(pParse);
if( v==0 ){
goto exit_rename_table;
}
sqlite3BeginWriteOperation(pParse, pVTab!=0, iDb);
sqlite3ChangeCookie(pParse, iDb);
/* If this is a virtual table, invoke the xRename() function if
** one is defined. The xRename() callback will modify the names
** of any resources used by the v-table implementation (including other
** SQLite tables) that are identified by the name of the virtual table.
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( pVTab ){
int i = ++pParse->nMem;
sqlite3VdbeAddOp4(v, OP_String8, 0, i, 0, zName, 0);
sqlite3VdbeAddOp4(v, OP_VRename, i, 0, 0,(const char*)pVTab, P4_VTAB);
sqlite3MayAbort(pParse);
}
#endif
/* figure out how many UTF-8 characters are in zName */
zTabName = pTab->zName;
nTabName = sqlite3Utf8CharLen(zTabName, -1);
#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
if( db->flags&SQLITE_ForeignKeys ){
/* If foreign-key support is enabled, rewrite the CREATE TABLE
** statements corresponding to all child tables of foreign key constraints
** for which the renamed table is the parent table. */
if( (zWhere=whereForeignKeys(pParse, pTab))!=0 ){
sqlite3NestedParse(pParse,
"UPDATE sqlite_master SET "
"sql = sqlite_rename_parent(sql, %Q, %Q) "
"WHERE %s;", zTabName, zName, zWhere);
sqlite3DbFree(db, zWhere);
}
}
#endif
sqlite3BeginWriteOperation(pParse, 0, iDb);
sqlite3ChangeCookie(db, v, iDb);
/* Modify the sqlite_master table to use the new table name. */
sqlite3NestedParse(pParse,
@@ -503,7 +322,7 @@ void sqlite3AlterRenameTable(
"name = CASE "
"WHEN type='table' THEN %Q "
"WHEN name LIKE 'sqlite_autoindex%%' AND type='index' THEN "
"'sqlite_autoindex_' || %Q || substr(name,%d+18) "
"'sqlite_autoindex_' || %Q || substr(name, %d+18,10) "
"ELSE name END "
"WHERE tbl_name=%Q AND "
"(type='table' OR type='index' OR type='trigger');",
@@ -511,7 +330,7 @@ void sqlite3AlterRenameTable(
#ifndef SQLITE_OMIT_TRIGGER
zName,
#endif
zName, nTabName, zTabName
zName, strlen(pTab->zName), pTab->zName
);
#ifndef SQLITE_OMIT_AUTOINCREMENT
@@ -520,7 +339,7 @@ void sqlite3AlterRenameTable(
*/
if( sqlite3FindTable(db, "sqlite_sequence", zDb) ){
sqlite3NestedParse(pParse,
"UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q",
"UPDATE %Q.sqlite_sequence set name = %Q WHERE name = %Q",
zDb, zName, pTab->zName);
}
#endif
@@ -530,25 +349,13 @@ void sqlite3AlterRenameTable(
** table. Don't do this if the table being ALTERed is itself located in
** the temp database.
*/
if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
if( (zWhere=whereTempTriggers(pParse, pTab)) ){
sqlite3NestedParse(pParse,
"UPDATE sqlite_temp_master SET "
"sql = sqlite_rename_trigger(sql, %Q), "
"tbl_name = %Q "
"WHERE %s;", zName, zName, zWhere);
sqlite3DbFree(db, zWhere);
}
#endif
#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
if( db->flags&SQLITE_ForeignKeys ){
FKey *p;
for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
Table *pFrom = p->pFrom;
if( pFrom!=pTab ){
reloadTableSchema(pParse, p->pFrom, pFrom->zName);
}
}
sqliteFree(zWhere);
}
#endif
@@ -556,36 +363,11 @@ void sqlite3AlterRenameTable(
reloadTableSchema(pParse, pTab, zName);
exit_rename_table:
sqlite3SrcListDelete(db, pSrc);
sqlite3DbFree(db, zName);
sqlite3SrcListDelete(pSrc);
sqliteFree(zName);
}
/*
** Generate code to make sure the file format number is at least minFormat.
** The generated code will increase the file format number if necessary.
*/
void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){
Vdbe *v;
v = sqlite3GetVdbe(pParse);
/* The VDBE should have been allocated before this routine is called.
** If that allocation failed, we would have quit before reaching this
** point */
if( ALWAYS(v) ){
int r1 = sqlite3GetTempReg(pParse);
int r2 = sqlite3GetTempReg(pParse);
int j1;
sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, BTREE_FILE_FORMAT);
sqlite3VdbeUsesBtree(v, iDb);
sqlite3VdbeAddOp2(v, OP_Integer, minFormat, r2);
j1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1);
sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, r2);
sqlite3VdbeJumpHere(v, j1);
sqlite3ReleaseTempReg(pParse, r1);
sqlite3ReleaseTempReg(pParse, r2);
}
}
/*
** This function is called after an "ALTER TABLE ... ADD" statement
** has been parsed. Argument pColDef contains the text of the new
@@ -603,29 +385,20 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
char *zCol; /* Null-terminated column definition */
Column *pCol; /* The new column */
Expr *pDflt; /* Default value for the new column */
sqlite3 *db; /* The database connection; */
Vdbe *v;
db = pParse->db;
if( pParse->nErr || db->mallocFailed ) return;
if( pParse->nErr ) return;
pNew = pParse->pNewTable;
assert( pNew );
assert( sqlite3BtreeHoldsAllMutexes(db) );
iDb = sqlite3SchemaToIndex(db, pNew->pSchema);
zDb = db->aDb[iDb].zName;
zTab = &pNew->zName[16]; /* Skip the "sqlite_altertab_" prefix on the name */
iDb = pNew->iDb;
zDb = pParse->db->aDb[iDb].zName;
zTab = pNew->zName;
pCol = &pNew->aCol[pNew->nCol-1];
pDflt = pCol->pDflt;
pTab = sqlite3FindTable(db, zTab, zDb);
pTab = sqlite3FindTable(pParse->db, zTab, zDb);
assert( pTab );
#ifndef SQLITE_OMIT_AUTHORIZATION
/* Invoke the authorization callback. */
if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){
return;
}
#endif
/* If the default value for the new column was specified with a
** literal NULL, then set pDflt to 0. This simplifies checking
** for an SQL NULL default below.
@@ -646,11 +419,6 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column");
return;
}
if( (db->flags&SQLITE_ForeignKeys) && pNew->pFKey && pDflt ){
sqlite3ErrorMsg(pParse,
"Cannot add a REFERENCES column with non-NULL default value");
return;
}
if( pCol->notNull && !pDflt ){
sqlite3ErrorMsg(pParse,
"Cannot add a NOT NULL column with default value NULL");
@@ -662,8 +430,8 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
*/
if( pDflt ){
sqlite3_value *pVal;
if( sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
db->mallocFailed = 1;
if( sqlite3ValueFromExpr(pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
/* malloc() has failed */
return;
}
if( !pVal ){
@@ -674,32 +442,42 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
}
/* Modify the CREATE TABLE statement. */
zCol = sqlite3DbStrNDup(db, (char*)pColDef->z, pColDef->n);
zCol = sqliteStrNDup(pColDef->z, pColDef->n);
if( zCol ){
char *zEnd = &zCol[pColDef->n-1];
while( zEnd>zCol && (*zEnd==';' || sqlite3Isspace(*zEnd)) ){
while( (zEnd>zCol && *zEnd==';') || isspace(*(unsigned char *)zEnd) ){
*zEnd-- = '\0';
}
sqlite3NestedParse(pParse,
"UPDATE \"%w\".%s SET "
"sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d) "
"UPDATE %Q.%s SET "
"sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d,length(sql)) "
"WHERE type = 'table' AND name = %Q",
zDb, SCHEMA_TABLE(iDb), pNew->addColOffset, zCol, pNew->addColOffset+1,
zTab
);
sqlite3DbFree(db, zCol);
sqliteFree(zCol);
}
/* If the default value of the new column is NULL, then set the file
** format to 2. If the default value of the new column is not NULL,
** the file format becomes 3.
*/
sqlite3MinimumFileFormat(pParse, iDb, pDflt ? 3 : 2);
if( (v=sqlite3GetVdbe(pParse)) ){
int f = (pDflt?3:2);
/* Only set the file format to $f if it is currently less than $f. */
sqlite3VdbeAddOp(v, OP_ReadCookie, iDb, 1);
sqlite3VdbeAddOp(v, OP_Integer, f, 0);
sqlite3VdbeAddOp(v, OP_Ge, 0, sqlite3VdbeCurrentAddr(v)+3);
sqlite3VdbeAddOp(v, OP_Integer, f, 0);
sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 1);
}
/* Reload the schema of the modified table. */
reloadTableSchema(pParse, pTab, pTab->zName);
}
/*
** This function is called by the parser after the table-name in
** an "ALTER TABLE <table-name> ADD" statement is parsed. Argument
@@ -722,22 +500,14 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
int iDb;
int i;
int nAlloc;
sqlite3 *db = pParse->db;
/* Look up the table being altered. */
assert( pParse->pNewTable==0 );
assert( sqlite3BtreeHoldsAllMutexes(db) );
if( db->mallocFailed ) goto exit_begin_add_column;
pTab = sqlite3LocateTable(pParse, 0, pSrc->a[0].zName, pSrc->a[0].zDatabase);
if( sqlite3_malloc_failed ) goto exit_begin_add_column;
pTab = sqlite3LocateTable(pParse, pSrc->a[0].zName, pSrc->a[0].zDatabase);
if( !pTab ) goto exit_begin_add_column;
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( IsVirtual(pTab) ){
sqlite3ErrorMsg(pParse, "virtual tables may not be altered");
goto exit_begin_add_column;
}
#endif
/* Make sure this is not an attempt to ALTER a view. */
if( pTab->pSelect ){
sqlite3ErrorMsg(pParse, "Cannot add a column to a view");
@@ -745,40 +515,32 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
}
assert( pTab->addColOffset>0 );
iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
iDb = pTab->iDb;
/* Put a copy of the Table struct in Parse.pNewTable for the
** sqlite3AddColumn() function and friends to modify. But modify
** the name by adding an "sqlite_altertab_" prefix. By adding this
** prefix, we insure that the name will not collide with an existing
** table because user table are not allowed to have the "sqlite_"
** prefix on their name.
** sqlite3AddColumn() function and friends to modify.
*/
pNew = (Table*)sqlite3DbMallocZero(db, sizeof(Table));
pNew = (Table *)sqliteMalloc(sizeof(Table));
if( !pNew ) goto exit_begin_add_column;
pParse->pNewTable = pNew;
pNew->nRef = 1;
pNew->dbMem = pTab->dbMem;
pNew->nCol = pTab->nCol;
assert( pNew->nCol>0 );
nAlloc = (((pNew->nCol-1)/8)*8)+8;
assert( nAlloc>=pNew->nCol && nAlloc%8==0 && nAlloc-pNew->nCol<8 );
pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc);
pNew->zName = sqlite3MPrintf(db, "sqlite_altertab_%s", pTab->zName);
pNew->aCol = (Column *)sqliteMalloc(sizeof(Column)*nAlloc);
pNew->zName = sqliteStrDup(pTab->zName);
if( !pNew->aCol || !pNew->zName ){
db->mallocFailed = 1;
goto exit_begin_add_column;
}
memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol);
for(i=0; i<pNew->nCol; i++){
Column *pCol = &pNew->aCol[i];
pCol->zName = sqlite3DbStrDup(db, pCol->zName);
pCol->zColl = 0;
pCol->zName = sqliteStrDup(pCol->zName);
pCol->zType = 0;
pCol->pDflt = 0;
pCol->zDflt = 0;
}
pNew->pSchema = db->aDb[iDb].pSchema;
pNew->iDb = iDb;
pNew->addColOffset = pTab->addColOffset;
pNew->nRef = 1;
@@ -786,10 +548,10 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
sqlite3BeginWriteOperation(pParse, 0, iDb);
v = sqlite3GetVdbe(pParse);
if( !v ) goto exit_begin_add_column;
sqlite3ChangeCookie(pParse, iDb);
sqlite3ChangeCookie(pParse->db, v, iDb);
exit_begin_add_column:
sqlite3SrcListDelete(db, pSrc);
sqlite3SrcListDelete(pSrc);
return;
}
#endif /* SQLITE_ALTER_TABLE */
+138 -405
View File
@@ -11,26 +11,18 @@
*************************************************************************
** This file contains code associated with the ANALYZE command.
**
** @(#) $Id: analyze.c,v 1.52 2009/04/16 17:45:48 drh Exp $
** @(#) $Id: analyze.c,v 1.9 2005/09/20 17:42:23 drh Exp $
*/
#ifndef SQLITE_OMIT_ANALYZE
#include "sqliteInt.h"
/*
** This routine generates code that opens the sqlite_stat1 table for
** writing with cursor iStatCur. If the library was built with the
** SQLITE_ENABLE_STAT2 macro defined, then the sqlite_stat2 table is
** opened for writing using cursor (iStatCur+1)
** This routine generates code that opens the sqlite_stat1 table on cursor
** iStatCur.
**
** If the sqlite_stat1 tables does not previously exist, it is created.
** Similarly, if the sqlite_stat2 table does not exist and the library
** is compiled with SQLITE_ENABLE_STAT2 defined, it is created.
**
** Argument zWhere may be a pointer to a buffer containing a table name,
** or it may be a NULL pointer. If it is not NULL, then all entries in
** the sqlite_stat1 and (if applicable) sqlite_stat2 tables associated
** with the named table are deleted. If zWhere==0, then code is generated
** to delete all stat table entries.
** If it does previously exist, all entires associated with table zWhere
** are removed. If zWhere==0 then all entries are removed.
*/
static void openStatTable(
Parse *pParse, /* Parsing context */
@@ -38,64 +30,42 @@ static void openStatTable(
int iStatCur, /* Open the sqlite_stat1 table on this cursor */
const char *zWhere /* Delete entries associated with this table */
){
static struct {
const char *zName;
const char *zCols;
} aTable[] = {
{ "sqlite_stat1", "tbl,idx,stat" },
#ifdef SQLITE_ENABLE_STAT2
{ "sqlite_stat2", "tbl,idx,sampleno,sample" },
#endif
};
int aRoot[] = {0, 0};
u8 aCreateTbl[] = {0, 0};
int i;
sqlite3 *db = pParse->db;
Db *pDb;
int iRootPage;
Table *pStat;
Vdbe *v = sqlite3GetVdbe(pParse);
if( v==0 ) return;
assert( sqlite3BtreeHoldsAllMutexes(db) );
assert( sqlite3VdbeDb(v)==db );
pDb = &db->aDb[iDb];
for(i=0; i<ArraySize(aTable); i++){
const char *zTab = aTable[i].zName;
Table *pStat;
if( (pStat = sqlite3FindTable(db, zTab, pDb->zName))==0 ){
/* The sqlite_stat[12] table does not exist. Create it. Note that a
** side-effect of the CREATE TABLE statement is to leave the rootpage
** of the new table in register pParse->regRoot. This is important
** because the OpenWrite opcode below will be needing it. */
sqlite3NestedParse(pParse,
"CREATE TABLE %Q.%s(%s)", pDb->zName, zTab, aTable[i].zCols
);
aRoot[i] = pParse->regRoot;
aCreateTbl[i] = 1;
}else{
/* The table already exists. If zWhere is not NULL, delete all entries
** associated with the table zWhere. If zWhere is NULL, delete the
** entire contents of the table. */
aRoot[i] = pStat->tnum;
sqlite3TableLock(pParse, iDb, aRoot[i], 1, zTab);
if( zWhere ){
sqlite3NestedParse(pParse,
"DELETE FROM %Q.%s WHERE tbl=%Q", pDb->zName, zTab, zWhere
);
}else{
/* The sqlite_stat[12] table already exists. Delete all rows. */
sqlite3VdbeAddOp2(v, OP_Clear, aRoot[i], iDb);
}
}
if( (pStat = sqlite3FindTable(db, "sqlite_stat1", pDb->zName))==0 ){
/* The sqlite_stat1 tables does not exist. Create it.
** Note that a side-effect of the CREATE TABLE statement is to leave
** the rootpage of the new table on the top of the stack. This is
** important because the OpenWrite opcode below will be needing it. */
sqlite3NestedParse(pParse,
"CREATE TABLE %Q.sqlite_stat1(tbl,idx,stat)",
pDb->zName
);
iRootPage = 0; /* Cause rootpage to be taken from top of stack */
}else if( zWhere ){
/* The sqlite_stat1 table exists. Delete all entries associated with
** the table zWhere. */
sqlite3NestedParse(pParse,
"DELETE FROM %Q.sqlite_stat1 WHERE tbl=%Q",
pDb->zName, zWhere
);
iRootPage = pStat->tnum;
}else{
/* The sqlite_stat1 table already exists. Delete all rows. */
iRootPage = pStat->tnum;
sqlite3VdbeAddOp(v, OP_Clear, pStat->tnum, iDb);
}
/* Open the sqlite_stat[12] tables for writing. */
for(i=0; i<ArraySize(aTable); i++){
sqlite3VdbeAddOp3(v, OP_OpenWrite, iStatCur+i, aRoot[i], iDb);
sqlite3VdbeChangeP4(v, -1, (char *)3, P4_INT32);
sqlite3VdbeChangeP5(v, aCreateTbl[i]);
}
/* Open the sqlite_stat1 table for writing.
*/
sqlite3VdbeAddOp(v, OP_Integer, iDb, 0);
sqlite3VdbeAddOp(v, OP_OpenWrite, iStatCur, iRootPage);
sqlite3VdbeAddOp(v, OP_SetNumColumns, iStatCur, 3);
}
/*
@@ -105,193 +75,93 @@ static void openStatTable(
static void analyzeOneTable(
Parse *pParse, /* Parser context */
Table *pTab, /* Table whose indices are to be analyzed */
int iStatCur, /* Index of VdbeCursor that writes the sqlite_stat1 table */
int iStatCur, /* Cursor that writes to the sqlite_stat1 table */
int iMem /* Available memory locations begin here */
){
sqlite3 *db = pParse->db; /* Database handle */
Index *pIdx; /* An index to being analyzed */
int iIdxCur; /* Cursor open on index being analyzed */
Vdbe *v; /* The virtual machine being built up */
int i; /* Loop counter */
int topOfLoop; /* The top of the loop */
int endOfLoop; /* The end of the loop */
int addr; /* The address of an instruction */
int iDb; /* Index of database containing pTab */
int regTabname = iMem++; /* Register containing table name */
int regIdxname = iMem++; /* Register containing index name */
int regSampleno = iMem++; /* Register containing next sample number */
int regCol = iMem++; /* Content of a column analyzed table */
int regRec = iMem++; /* Register holding completed record */
int regTemp = iMem++; /* Temporary use register */
int regRowid = iMem++; /* Rowid for the inserted record */
#ifdef SQLITE_ENABLE_STAT2
int regTemp2 = iMem++; /* Temporary use register */
int regSamplerecno = iMem++; /* Index of next sample to record */
int regRecno = iMem++; /* Current sample index */
int regLast = iMem++; /* Index of last sample to record */
int regFirst = iMem++; /* Index of first sample to record */
#endif
Index *pIdx; /* An index to being analyzed */
int iIdxCur; /* Cursor number for index being analyzed */
int nCol; /* Number of columns in the index */
Vdbe *v; /* The virtual machine being built up */
int i; /* Loop counter */
int topOfLoop; /* The top of the loop */
int endOfLoop; /* The end of the loop */
int addr; /* The address of an instruction */
v = sqlite3GetVdbe(pParse);
if( v==0 || NEVER(pTab==0) || pTab->pIndex==0 ){
if( pTab==0 || pTab->pIndex==0 ){
/* Do no analysis for tables that have no indices */
return;
}
assert( sqlite3BtreeHoldsAllMutexes(db) );
iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
assert( iDb>=0 );
#ifndef SQLITE_OMIT_AUTHORIZATION
if( sqlite3AuthCheck(pParse, SQLITE_ANALYZE, pTab->zName, 0,
db->aDb[iDb].zName ) ){
pParse->db->aDb[pTab->iDb].zName ) ){
return;
}
#endif
/* Establish a read-lock on the table at the shared-cache level. */
sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
iIdxCur = pParse->nTab++;
iIdxCur = pParse->nTab;
for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
int nCol = pIdx->nColumn;
KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
if( iMem+1+(nCol*2)>pParse->nMem ){
pParse->nMem = iMem+1+(nCol*2);
/* Open a cursor to the index to be analyzed
*/
sqlite3VdbeAddOp(v, OP_Integer, pIdx->iDb, 0);
VdbeComment((v, "# %s", pIdx->zName));
sqlite3VdbeOp3(v, OP_OpenRead, iIdxCur, pIdx->tnum,
(char*)&pIdx->keyInfo, P3_KEYINFO);
nCol = pIdx->nColumn;
if( iMem+nCol*2>=pParse->nMem ){
pParse->nMem = iMem+nCol*2+1;
}
sqlite3VdbeAddOp(v, OP_SetNumColumns, iIdxCur, nCol+1);
/* Open a cursor to the index to be analyzed. */
assert( iDb==sqlite3SchemaToIndex(db, pIdx->pSchema) );
sqlite3VdbeAddOp4(v, OP_OpenRead, iIdxCur, pIdx->tnum, iDb,
(char *)pKey, P4_KEYINFO_HANDOFF);
VdbeComment((v, "%s", pIdx->zName));
/* Populate the registers containing the table and index names. */
if( pTab->pIndex==pIdx ){
sqlite3VdbeAddOp4(v, OP_String8, 0, regTabname, 0, pTab->zName, 0);
}
sqlite3VdbeAddOp4(v, OP_String8, 0, regIdxname, 0, pIdx->zName, 0);
#ifdef SQLITE_ENABLE_STAT2
/* If this iteration of the loop is generating code to analyze the
** first index in the pTab->pIndex list, then register regLast has
** not been populated. In this case populate it now. */
if( pTab->pIndex==pIdx ){
sqlite3VdbeAddOp2(v, OP_Integer, SQLITE_INDEX_SAMPLES, regSamplerecno);
sqlite3VdbeAddOp2(v, OP_Integer, SQLITE_INDEX_SAMPLES*2-1, regTemp);
sqlite3VdbeAddOp2(v, OP_Integer, SQLITE_INDEX_SAMPLES*2, regTemp2);
sqlite3VdbeAddOp2(v, OP_Count, iIdxCur, regLast);
sqlite3VdbeAddOp2(v, OP_Null, 0, regFirst);
addr = sqlite3VdbeAddOp3(v, OP_Lt, regSamplerecno, 0, regLast);
sqlite3VdbeAddOp3(v, OP_Divide, regTemp2, regLast, regFirst);
sqlite3VdbeAddOp3(v, OP_Multiply, regLast, regTemp, regLast);
sqlite3VdbeAddOp2(v, OP_AddImm, regLast, SQLITE_INDEX_SAMPLES*2-2);
sqlite3VdbeAddOp3(v, OP_Divide, regTemp2, regLast, regLast);
sqlite3VdbeJumpHere(v, addr);
}
/* Zero the regSampleno and regRecno registers. */
sqlite3VdbeAddOp2(v, OP_Integer, 0, regSampleno);
sqlite3VdbeAddOp2(v, OP_Integer, 0, regRecno);
sqlite3VdbeAddOp2(v, OP_Copy, regFirst, regSamplerecno);
#endif
/* The block of memory cells initialized here is used as follows.
/* Memory cells are used as follows:
**
** iMem:
** The total number of rows in the table.
** mem[iMem]: The total number of rows in the table.
** mem[iMem+1]: Number of distinct values in column 1
** ...
** mem[iMem+nCol]: Number of distinct values in column N
** mem[iMem+nCol+1] Last observed value of column 1
** ...
** mem[iMem+nCol+nCol]: Last observed value of column N
**
** iMem+1 .. iMem+nCol:
** Number of distinct entries in index considering the
** left-most N columns only, where N is between 1 and nCol,
** inclusive.
**
** iMem+nCol+1 .. Mem+2*nCol:
** Previous value of indexed columns, from left to right.
**
** Cells iMem through iMem+nCol are initialized to 0. The others are
** initialized to contain an SQL NULL.
** Cells iMem through iMem+nCol are initialized to 0. The others
** are initialized to NULL.
*/
for(i=0; i<=nCol; i++){
sqlite3VdbeAddOp2(v, OP_Integer, 0, iMem+i);
sqlite3VdbeAddOp(v, OP_MemInt, 0, iMem+i);
}
for(i=0; i<nCol; i++){
sqlite3VdbeAddOp2(v, OP_Null, 0, iMem+nCol+i+1);
sqlite3VdbeAddOp(v, OP_MemNull, iMem+nCol+i+1, 0);
}
/* Start the analysis loop. This loop runs through all the entries in
** the index b-tree. */
/* Do the analysis.
*/
endOfLoop = sqlite3VdbeMakeLabel(v);
sqlite3VdbeAddOp2(v, OP_Rewind, iIdxCur, endOfLoop);
sqlite3VdbeAddOp(v, OP_Rewind, iIdxCur, endOfLoop);
topOfLoop = sqlite3VdbeCurrentAddr(v);
sqlite3VdbeAddOp2(v, OP_AddImm, iMem, 1);
sqlite3VdbeAddOp(v, OP_MemIncr, iMem, 0);
for(i=0; i<nCol; i++){
sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regCol);
#ifdef SQLITE_ENABLE_STAT2
if( i==0 ){
/* Check if the record that cursor iIdxCur points to contains a
** value that should be stored in the sqlite_stat2 table. If so,
** store it. */
int ne = sqlite3VdbeAddOp3(v, OP_Ne, regRecno, 0, regSamplerecno);
assert( regTabname+1==regIdxname
&& regTabname+2==regSampleno
&& regTabname+3==regCol
);
sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 4, regRec, "aaab", 0);
sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur+1, regRowid);
sqlite3VdbeAddOp3(v, OP_Insert, iStatCur+1, regRec, regRowid);
/* Calculate new values for regSamplerecno and regSampleno.
**
** sampleno = sampleno + 1
** samplerecno = samplerecno+(remaining records)/(remaining samples)
*/
sqlite3VdbeAddOp2(v, OP_AddImm, regSampleno, 1);
sqlite3VdbeAddOp3(v, OP_Subtract, regRecno, regLast, regTemp);
sqlite3VdbeAddOp2(v, OP_AddImm, regTemp, -1);
sqlite3VdbeAddOp2(v, OP_Integer, SQLITE_INDEX_SAMPLES, regTemp2);
sqlite3VdbeAddOp3(v, OP_Subtract, regSampleno, regTemp2, regTemp2);
sqlite3VdbeAddOp3(v, OP_Divide, regTemp2, regTemp, regTemp);
sqlite3VdbeAddOp3(v, OP_Add, regSamplerecno, regTemp, regSamplerecno);
sqlite3VdbeJumpHere(v, ne);
sqlite3VdbeAddOp2(v, OP_AddImm, regRecno, 1);
}
#endif
sqlite3VdbeAddOp3(v, OP_Ne, regCol, 0, iMem+nCol+i+1);
/**** TODO: add collating sequence *****/
sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
sqlite3VdbeAddOp(v, OP_Column, iIdxCur, i);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem+nCol+i+1, 0);
sqlite3VdbeAddOp(v, OP_Ne, 0x100, 0);
}
if( db->mallocFailed ){
/* If a malloc failure has occurred, then the result of the expression
** passed as the second argument to the call to sqlite3VdbeJumpHere()
** below may be negative. Which causes an assert() to fail (or an
** out-of-bounds write if SQLITE_DEBUG is not defined). */
return;
}
sqlite3VdbeAddOp2(v, OP_Goto, 0, endOfLoop);
sqlite3VdbeAddOp(v, OP_Goto, 0, endOfLoop);
for(i=0; i<nCol; i++){
sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-(nCol*2));
sqlite3VdbeAddOp2(v, OP_AddImm, iMem+i+1, 1);
sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, iMem+nCol+i+1);
addr = sqlite3VdbeAddOp(v, OP_MemIncr, iMem+i+1, 0);
sqlite3VdbeChangeP2(v, topOfLoop + 3*i + 3, addr);
sqlite3VdbeAddOp(v, OP_Column, iIdxCur, i);
sqlite3VdbeAddOp(v, OP_MemStore, iMem+nCol+i+1, 1);
}
/* End of the analysis loop. */
sqlite3VdbeResolveLabel(v, endOfLoop);
sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, topOfLoop);
sqlite3VdbeAddOp1(v, OP_Close, iIdxCur);
sqlite3VdbeAddOp(v, OP_Next, iIdxCur, topOfLoop);
sqlite3VdbeAddOp(v, OP_Close, iIdxCur, 0);
/* Store the results in sqlite_stat1.
/* Store the results.
**
** The result is a single row of the sqlite_stat1 table. The first
** The result is a single row of the sqlite_stmt1 table. The first
** two columns are the names of the table and index. The third column
** is a string composed of a list of integer statistics about the
** index. The first integer in the list is the total number of entries
** index. The first integer in the list is the total number of entires
** in the index. There is one additional integer in the list for each
** column of the table. This additional integer is a guess of how many
** rows of the table the index will select. If D is the count of distinct
@@ -304,21 +174,28 @@ static void analyzeOneTable(
** If K>0 then it is always the case the D>0 so division by zero
** is never possible.
*/
addr = sqlite3VdbeAddOp1(v, OP_IfNot, iMem);
sqlite3VdbeAddOp2(v, OP_SCopy, iMem, regSampleno);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem, 0);
addr = sqlite3VdbeAddOp(v, OP_IfNot, 0, 0);
sqlite3VdbeAddOp(v, OP_NewRowid, iStatCur, 0);
sqlite3VdbeOp3(v, OP_String8, 0, 0, pTab->zName, 0);
sqlite3VdbeOp3(v, OP_String8, 0, 0, pIdx->zName, 0);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem, 0);
sqlite3VdbeOp3(v, OP_String8, 0, 0, " ", 0);
for(i=0; i<nCol; i++){
sqlite3VdbeAddOp4(v, OP_String8, 0, regTemp, 0, " ", 0);
sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regSampleno, regSampleno);
sqlite3VdbeAddOp3(v, OP_Add, iMem, iMem+i+1, regTemp);
sqlite3VdbeAddOp2(v, OP_AddImm, regTemp, -1);
sqlite3VdbeAddOp3(v, OP_Divide, iMem+i+1, regTemp, regTemp);
sqlite3VdbeAddOp1(v, OP_ToInt, regTemp);
sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regSampleno, regSampleno);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem, 0);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem+i+1, 0);
sqlite3VdbeAddOp(v, OP_Add, 0, 0);
sqlite3VdbeAddOp(v, OP_AddImm, -1, 0);
sqlite3VdbeAddOp(v, OP_MemLoad, iMem+i+1, 0);
sqlite3VdbeAddOp(v, OP_Divide, 0, 0);
if( i==nCol-1 ){
sqlite3VdbeAddOp(v, OP_Concat, nCol*2-1, 0);
}else{
sqlite3VdbeAddOp(v, OP_Dup, 1, 0);
}
}
sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regRec, "aaa", 0);
sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regRowid);
sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regRec, regRowid);
sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
sqlite3VdbeOp3(v, OP_MakeRecord, 3, 0, "ttt", 0);
sqlite3VdbeAddOp(v, OP_Insert, iStatCur, 0);
sqlite3VdbeJumpHere(v, addr);
}
}
@@ -329,9 +206,7 @@ static void analyzeOneTable(
*/
static void loadAnalysis(Parse *pParse, int iDb){
Vdbe *v = sqlite3GetVdbe(pParse);
if( v ){
sqlite3VdbeAddOp1(v, OP_LoadAnalysis, iDb);
}
sqlite3VdbeAddOp(v, OP_LoadAnalysis, iDb, 0);
}
/*
@@ -339,17 +214,15 @@ static void loadAnalysis(Parse *pParse, int iDb){
*/
static void analyzeDatabase(Parse *pParse, int iDb){
sqlite3 *db = pParse->db;
Schema *pSchema = db->aDb[iDb].pSchema; /* Schema of database iDb */
HashElem *k;
int iStatCur;
int iMem;
sqlite3BeginWriteOperation(pParse, 0, iDb);
iStatCur = pParse->nTab;
pParse->nTab += 2;
iStatCur = pParse->nTab++;
openStatTable(pParse, iDb, iStatCur, 0);
iMem = pParse->nMem+1;
for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
iMem = pParse->nMem;
for(k=sqliteHashFirst(&db->aDb[iDb].tblHash); k; k=sqliteHashNext(k)){
Table *pTab = (Table*)sqliteHashData(k);
analyzeOneTable(pParse, pTab, iStatCur, iMem);
}
@@ -365,13 +238,11 @@ static void analyzeTable(Parse *pParse, Table *pTab){
int iStatCur;
assert( pTab!=0 );
assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
iDb = pTab->iDb;
sqlite3BeginWriteOperation(pParse, 0, iDb);
iStatCur = pParse->nTab;
pParse->nTab += 2;
iStatCur = pParse->nTab++;
openStatTable(pParse, iDb, iStatCur, pTab->zName);
analyzeOneTable(pParse, pTab, iStatCur, pParse->nMem+1);
analyzeOneTable(pParse, pTab, iStatCur, pParse->nMem);
loadAnalysis(pParse, iDb);
}
@@ -397,31 +268,27 @@ void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){
/* Read the database schema. If an error occurs, leave an error message
** and code in pParse and return NULL. */
assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
return;
}
assert( pName2!=0 || pName1==0 );
if( pName1==0 ){
/* Form 1: Analyze everything */
for(i=0; i<db->nDb; i++){
if( i==1 ) continue; /* Do not analyze the TEMP database */
analyzeDatabase(pParse, i);
}
}else if( pName2->n==0 ){
}else if( pName2==0 || pName2->n==0 ){
/* Form 2: Analyze the database or table named */
iDb = sqlite3FindDb(db, pName1);
if( iDb>=0 ){
analyzeDatabase(pParse, iDb);
}else{
z = sqlite3NameFromToken(db, pName1);
if( z ){
pTab = sqlite3LocateTable(pParse, 0, z, 0);
sqlite3DbFree(db, z);
if( pTab ){
analyzeTable(pParse, pTab);
}
z = sqlite3NameFromToken(pName1);
pTab = sqlite3LocateTable(pParse, z, 0);
sqliteFree(z);
if( pTab ){
analyzeTable(pParse, pTab);
}
}
}else{
@@ -429,13 +296,11 @@ void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){
iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pTableName);
if( iDb>=0 ){
zDb = db->aDb[iDb].zName;
z = sqlite3NameFromToken(db, pTableName);
if( z ){
pTab = sqlite3LocateTable(pParse, 0, z, zDb);
sqlite3DbFree(db, z);
if( pTab ){
analyzeTable(pParse, pTab);
}
z = sqlite3NameFromToken(pTableName);
pTab = sqlite3LocateTable(pParse, z, zDb);
sqliteFree(z);
if( pTab ){
analyzeTable(pParse, pTab);
}
}
}
@@ -458,7 +323,7 @@ struct analysisInfo {
** argv[0] = name of the index
** argv[1] = results of analysis - on integer for each column
*/
static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
static int analysisLoader(void *pData, int argc, char **argv, char **azNotUsed){
analysisInfo *pInfo = (analysisInfo*)pData;
Index *pIndex;
int i, c;
@@ -466,8 +331,6 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
const char *z;
assert( argc==2 );
UNUSED_PARAMETER2(NotUsed, argc);
if( argv==0 || argv[0]==0 || argv[1]==0 ){
return 0;
}
@@ -489,164 +352,34 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
}
/*
** If the Index.aSample variable is not NULL, delete the aSample[] array
** and its contents.
** Load the content of the sqlite_stat1 table into the index hash tables.
*/
void sqlite3DeleteIndexSamples(Index *pIdx){
#ifdef SQLITE_ENABLE_STAT2
if( pIdx->aSample ){
int j;
sqlite3 *dbMem = pIdx->pTable->dbMem;
for(j=0; j<SQLITE_INDEX_SAMPLES; j++){
IndexSample *p = &pIdx->aSample[j];
if( p->eType==SQLITE_TEXT || p->eType==SQLITE_BLOB ){
sqlite3DbFree(pIdx->pTable->dbMem, p->u.z);
}
}
sqlite3DbFree(dbMem, pIdx->aSample);
pIdx->aSample = 0;
}
#else
UNUSED_PARAMETER(pIdx);
#endif
}
/*
** Load the content of the sqlite_stat1 and sqlite_stat2 tables. The
** contents of sqlite_stat1 are used to populate the Index.aiRowEst[]
** arrays. The contents of sqlite_stat2 are used to populate the
** Index.aSample[] arrays.
**
** If the sqlite_stat1 table is not present in the database, SQLITE_ERROR
** is returned. In this case, even if SQLITE_ENABLE_STAT2 was defined
** during compilation and the sqlite_stat2 table is present, no data is
** read from it.
**
** If SQLITE_ENABLE_STAT2 was defined during compilation and the
** sqlite_stat2 table is not present in the database, SQLITE_ERROR is
** returned. However, in this case, data is read from the sqlite_stat1
** table (if it is present) before returning.
**
** If an OOM error occurs, this function always sets db->mallocFailed.
** This means if the caller does not care about other errors, the return
** code may be ignored.
*/
int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
void sqlite3AnalysisLoad(sqlite3 *db, int iDb){
analysisInfo sInfo;
HashElem *i;
char *zSql;
int rc;
assert( iDb>=0 && iDb<db->nDb );
assert( db->aDb[iDb].pBt!=0 );
assert( sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
/* Clear any prior statistics */
for(i=sqliteHashFirst(&db->aDb[iDb].pSchema->idxHash);i;i=sqliteHashNext(i)){
for(i=sqliteHashFirst(&db->aDb[iDb].idxHash); i; i=sqliteHashNext(i)){
Index *pIdx = sqliteHashData(i);
sqlite3DefaultRowEst(pIdx);
sqlite3DeleteIndexSamples(pIdx);
}
/* Check to make sure the sqlite_stat1 table exists */
/* Check to make sure the sqlite_stat1 table existss */
sInfo.db = db;
sInfo.zDatabase = db->aDb[iDb].zName;
if( sqlite3FindTable(db, "sqlite_stat1", sInfo.zDatabase)==0 ){
return SQLITE_ERROR;
return;
}
/* Load new statistics out of the sqlite_stat1 table */
zSql = sqlite3MPrintf(db,
"SELECT idx, stat FROM %Q.sqlite_stat1", sInfo.zDatabase);
if( zSql==0 ){
rc = SQLITE_NOMEM;
}else{
(void)sqlite3SafetyOff(db);
rc = sqlite3_exec(db, zSql, analysisLoader, &sInfo, 0);
(void)sqlite3SafetyOn(db);
sqlite3DbFree(db, zSql);
}
/* Load the statistics from the sqlite_stat2 table. */
#ifdef SQLITE_ENABLE_STAT2
if( rc==SQLITE_OK && !sqlite3FindTable(db, "sqlite_stat2", sInfo.zDatabase) ){
rc = SQLITE_ERROR;
}
if( rc==SQLITE_OK ){
sqlite3_stmt *pStmt = 0;
zSql = sqlite3MPrintf(db,
"SELECT idx,sampleno,sample FROM %Q.sqlite_stat2", sInfo.zDatabase);
if( !zSql ){
rc = SQLITE_NOMEM;
}else{
(void)sqlite3SafetyOff(db);
rc = sqlite3_prepare(db, zSql, -1, &pStmt, 0);
(void)sqlite3SafetyOn(db);
sqlite3DbFree(db, zSql);
}
if( rc==SQLITE_OK ){
(void)sqlite3SafetyOff(db);
while( sqlite3_step(pStmt)==SQLITE_ROW ){
char *zIndex = (char *)sqlite3_column_text(pStmt, 0);
Index *pIdx = sqlite3FindIndex(db, zIndex, sInfo.zDatabase);
if( pIdx ){
int iSample = sqlite3_column_int(pStmt, 1);
sqlite3 *dbMem = pIdx->pTable->dbMem;
assert( dbMem==db || dbMem==0 );
if( iSample<SQLITE_INDEX_SAMPLES && iSample>=0 ){
int eType = sqlite3_column_type(pStmt, 2);
if( pIdx->aSample==0 ){
static const int sz = sizeof(IndexSample)*SQLITE_INDEX_SAMPLES;
pIdx->aSample = (IndexSample *)sqlite3DbMallocZero(dbMem, sz);
if( pIdx->aSample==0 ){
db->mallocFailed = 1;
break;
}
}
assert( pIdx->aSample );
{
IndexSample *pSample = &pIdx->aSample[iSample];
pSample->eType = (u8)eType;
if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
pSample->u.r = sqlite3_column_double(pStmt, 2);
}else if( eType==SQLITE_TEXT || eType==SQLITE_BLOB ){
const char *z = (const char *)(
(eType==SQLITE_BLOB) ?
sqlite3_column_blob(pStmt, 2):
sqlite3_column_text(pStmt, 2)
);
int n = sqlite3_column_bytes(pStmt, 2);
if( n>24 ){
n = 24;
}
pSample->nByte = (u8)n;
pSample->u.z = sqlite3DbMallocRaw(dbMem, n);
if( pSample->u.z ){
memcpy(pSample->u.z, z, n);
}else{
db->mallocFailed = 1;
break;
}
}
}
}
}
}
rc = sqlite3_finalize(pStmt);
(void)sqlite3SafetyOn(db);
}
}
#endif
if( rc==SQLITE_NOMEM ){
db->mallocFailed = 1;
}
return rc;
zSql = sqlite3MPrintf("SELECT idx, stat FROM %Q.sqlite_stat1",
sInfo.zDatabase);
sqlite3SafetyOff(db);
sqlite3_exec(db, zSql, analysisLoader, &sInfo, 0);
sqlite3SafetyOn(db);
sqliteFree(zSql);
}
+143 -328
View File
@@ -11,388 +11,203 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
** $Id: attach.c,v 1.93 2009/05/31 21:21:41 drh Exp $
** $Id: attach.c,v 1.34 2005/08/20 03:03:04 drh Exp $
*/
#include "sqliteInt.h"
#ifndef SQLITE_OMIT_ATTACH
/*
** Resolve an expression that was part of an ATTACH or DETACH statement. This
** is slightly different from resolving a normal SQL expression, because simple
** identifiers are treated as strings, not possible column names or aliases.
** This routine is called by the parser to process an ATTACH statement:
**
** i.e. if the parser sees:
** ATTACH DATABASE filename AS dbname
**
** ATTACH DATABASE abc AS def
**
** it treats the two expressions as literal strings 'abc' and 'def' instead of
** looking for columns of the same name.
**
** This only applies to the root node of pExpr, so the statement:
**
** ATTACH DATABASE abc||def AS 'db2'
**
** will fail because neither abc or def can be resolved.
** The pFilename and pDbname arguments are the tokens that define the
** filename and dbname in the ATTACH statement.
*/
static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
{
int rc = SQLITE_OK;
if( pExpr ){
if( pExpr->op!=TK_ID ){
rc = sqlite3ResolveExprNames(pName, pExpr);
if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){
sqlite3ErrorMsg(pName->pParse, "invalid name: \"%s\"", pExpr->u.zToken);
return SQLITE_ERROR;
}
}else{
pExpr->op = TK_STRING;
}
}
return rc;
}
/*
** An SQL user-function registered to do the work of an ATTACH statement. The
** three arguments to the function come directly from an attach statement:
**
** ATTACH DATABASE x AS y KEY z
**
** SELECT sqlite_attach(x, y, z)
**
** If the optional "KEY z" syntax is omitted, an SQL NULL is passed as the
** third argument.
*/
static void attachFunc(
sqlite3_context *context,
int NotUsed,
sqlite3_value **argv
void sqlite3Attach(
Parse *pParse, /* The parser context */
Token *pFilename, /* Name of database file */
Token *pDbname, /* Name of the database to use internally */
int keyType, /* 0: no key. 1: TEXT, 2: BLOB */
Token *pKey /* Text of the key for keytype 1 and 2 */
){
int i;
int rc = 0;
sqlite3 *db = sqlite3_context_db_handle(context);
const char *zName;
const char *zFile;
Db *aNew;
char *zErrDyn = 0;
int rc, i;
char *zFile = 0;
char *zName = 0;
sqlite3 *db;
Vdbe *v;
UNUSED_PARAMETER(NotUsed);
zFile = (const char *)sqlite3_value_text(argv[0]);
zName = (const char *)sqlite3_value_text(argv[1]);
if( zFile==0 ) zFile = "";
if( zName==0 ) zName = "";
/* Check for the following errors:
**
** * Too many attached databases,
** * Transaction currently open
** * Specified database name already being used.
*/
if( db->nDb>=db->aLimit[SQLITE_LIMIT_ATTACHED]+2 ){
zErrDyn = sqlite3MPrintf(db, "too many attached databases - max %d",
db->aLimit[SQLITE_LIMIT_ATTACHED]
);
goto attach_error;
v = sqlite3GetVdbe(pParse);
if( !v ) return;
sqlite3VdbeAddOp(v, OP_Expire, 1, 0);
sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
if( pParse->explain ) return;
db = pParse->db;
if( db->nDb>=MAX_ATTACHED+2 ){
sqlite3ErrorMsg(pParse, "too many attached databases - max %d",
MAX_ATTACHED);
pParse->rc = SQLITE_ERROR;
return;
}
if( !db->autoCommit ){
zErrDyn = sqlite3MPrintf(db, "cannot ATTACH database within transaction");
goto attach_error;
sqlite3ErrorMsg(pParse, "cannot ATTACH database within transaction");
pParse->rc = SQLITE_ERROR;
return;
}
zFile = sqlite3NameFromToken(pFilename);
if( zFile==0 ){
goto attach_end;
}
#ifndef SQLITE_OMIT_AUTHORIZATION
if( sqlite3AuthCheck(pParse, SQLITE_ATTACH, zFile, 0, 0)!=SQLITE_OK ){
goto attach_end;
}
#endif /* SQLITE_OMIT_AUTHORIZATION */
zName = sqlite3NameFromToken(pDbname);
if( zName==0 ){
goto attach_end;
}
for(i=0; i<db->nDb; i++){
char *z = db->aDb[i].zName;
assert( z && zName );
if( sqlite3StrICmp(z, zName)==0 ){
zErrDyn = sqlite3MPrintf(db, "database %s is already in use", zName);
goto attach_error;
if( z && sqlite3StrICmp(z, zName)==0 ){
sqlite3ErrorMsg(pParse, "database %s is already in use", zName);
pParse->rc = SQLITE_ERROR;
goto attach_end;
}
}
/* Allocate the new entry in the db->aDb[] array and initialise the schema
** hash tables.
*/
if( db->aDb==db->aDbStatic ){
aNew = sqlite3DbMallocRaw(db, sizeof(db->aDb[0])*3 );
if( aNew==0 ) return;
aNew = sqliteMalloc( sizeof(db->aDb[0])*3 );
if( aNew==0 ){
goto attach_end;
}
memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2);
}else{
aNew = sqlite3DbRealloc(db, db->aDb, sizeof(db->aDb[0])*(db->nDb+1) );
if( aNew==0 ) return;
aNew = sqliteRealloc(db->aDb, sizeof(db->aDb[0])*(db->nDb+1) );
if( aNew==0 ){
goto attach_end;
}
}
db->aDb = aNew;
aNew = &db->aDb[db->nDb];
aNew = &db->aDb[db->nDb++];
memset(aNew, 0, sizeof(*aNew));
/* Open the database file. If the btree is successfully opened, use
** it to obtain the database schema. At this point the schema may
** or may not be initialised.
*/
rc = sqlite3BtreeFactory(db, zFile, 0, SQLITE_DEFAULT_CACHE_SIZE,
db->openFlags | SQLITE_OPEN_MAIN_DB,
&aNew->pBt);
db->nDb++;
if( rc==SQLITE_CONSTRAINT ){
rc = SQLITE_ERROR;
zErrDyn = sqlite3MPrintf(db, "database is already attached");
}else if( rc==SQLITE_OK ){
Pager *pPager;
aNew->pSchema = sqlite3SchemaGet(db, aNew->pBt);
if( !aNew->pSchema ){
rc = SQLITE_NOMEM;
}else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){
zErrDyn = sqlite3MPrintf(db,
"attached databases must use the same text encoding as main database");
rc = SQLITE_ERROR;
}
pPager = sqlite3BtreePager(aNew->pBt);
sqlite3PagerLockingMode(pPager, db->dfltLockMode);
sqlite3PagerJournalMode(pPager, db->dfltJournalMode);
}
aNew->zName = sqlite3DbStrDup(db, zName);
sqlite3HashInit(&aNew->tblHash, SQLITE_HASH_STRING, 0);
sqlite3HashInit(&aNew->idxHash, SQLITE_HASH_STRING, 0);
sqlite3HashInit(&aNew->trigHash, SQLITE_HASH_STRING, 0);
sqlite3HashInit(&aNew->aFKey, SQLITE_HASH_STRING, 1);
aNew->zName = zName;
zName = 0;
aNew->safety_level = 3;
rc = sqlite3BtreeFactory(db, zFile, 0, MAX_PAGES, &aNew->pBt);
if( rc ){
sqlite3ErrorMsg(pParse, "unable to open database: %s", zFile);
}
#if SQLITE_HAS_CODEC
if( rc==SQLITE_OK ){
extern int sqlite3CodecAttach(sqlite3*, int, const void*, int);
extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
int nKey;
{
extern int sqlite3CodecAttach(sqlite3*, int, void*, int);
char *zKey;
int t = sqlite3_value_type(argv[2]);
switch( t ){
case SQLITE_INTEGER:
case SQLITE_FLOAT:
zErrDyn = sqlite3DbStrDup(db, "Invalid key value");
rc = SQLITE_ERROR;
break;
case SQLITE_TEXT:
case SQLITE_BLOB:
nKey = sqlite3_value_bytes(argv[2]);
zKey = (char *)sqlite3_value_blob(argv[2]);
rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
break;
case SQLITE_NULL:
/* No key specified. Use the key from the main database */
sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey);
rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
break;
int nKey;
if( keyType==0 ){
/* No key specified. Use the key from the main database */
extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey);
}else if( keyType==1 ){
/* Key specified as text */
zKey = sqlite3NameFromToken(pKey);
nKey = strlen(zKey);
}else{
/* Key specified as a BLOB */
char *zTemp;
assert( keyType==2 );
pKey->z++;
pKey->n--;
zTemp = sqlite3NameFromToken(pKey);
zKey = sqlite3HexToBlob(zTemp);
sqliteFree(zTemp);
}
sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
if( keyType ){
sqliteFree(zKey);
}
}
#endif
/* If the file was opened successfully, read the schema for the new database.
** If this fails, or if opening the file failed, then close the file and
** remove the entry from the db->aDb[] array. i.e. put everything back the way
** we found it.
*/
if( rc==SQLITE_OK ){
(void)sqlite3SafetyOn(db);
sqlite3BtreeEnterAll(db);
rc = sqlite3Init(db, &zErrDyn);
sqlite3BtreeLeaveAll(db);
(void)sqlite3SafetyOff(db);
db->flags &= ~SQLITE_Initialized;
if( pParse->nErr==0 && rc==SQLITE_OK ){
rc = sqlite3ReadSchema(pParse);
}
if( rc ){
int iDb = db->nDb - 1;
assert( iDb>=2 );
if( db->aDb[iDb].pBt ){
sqlite3BtreeClose(db->aDb[iDb].pBt);
db->aDb[iDb].pBt = 0;
db->aDb[iDb].pSchema = 0;
int i = db->nDb - 1;
assert( i>=2 );
if( db->aDb[i].pBt ){
sqlite3BtreeClose(db->aDb[i].pBt);
db->aDb[i].pBt = 0;
}
sqlite3ResetInternalSchema(db, 0);
db->nDb = iDb;
if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
db->mallocFailed = 1;
sqlite3DbFree(db, zErrDyn);
zErrDyn = sqlite3MPrintf(db, "out of memory");
}else if( zErrDyn==0 ){
zErrDyn = sqlite3MPrintf(db, "unable to open database: %s", zFile);
assert( pParse->nErr>0 ); /* Always set by sqlite3ReadSchema() */
if( pParse->rc==SQLITE_OK ){
pParse->rc = SQLITE_ERROR;
}
goto attach_error;
}
return;
attach_error:
/* Return an error if we get here */
if( zErrDyn ){
sqlite3_result_error(context, zErrDyn, -1);
sqlite3DbFree(db, zErrDyn);
}
if( rc ) sqlite3_result_error_code(context, rc);
attach_end:
sqliteFree(zFile);
sqliteFree(zName);
}
/*
** An SQL user-function registered to do the work of an DETACH statement. The
** three arguments to the function come directly from a detach statement:
** This routine is called by the parser to process a DETACH statement:
**
** DETACH DATABASE x
** DETACH DATABASE dbname
**
** SELECT sqlite_detach(x)
** The pDbname argument is the name of the database in the DETACH statement.
*/
static void detachFunc(
sqlite3_context *context,
int NotUsed,
sqlite3_value **argv
){
const char *zName = (const char *)sqlite3_value_text(argv[0]);
sqlite3 *db = sqlite3_context_db_handle(context);
void sqlite3Detach(Parse *pParse, Token *pDbname){
int i;
sqlite3 *db;
Vdbe *v;
Db *pDb = 0;
char zErr[128];
char *zName;
UNUSED_PARAMETER(NotUsed);
if( zName==0 ) zName = "";
v = sqlite3GetVdbe(pParse);
if( !v ) return;
sqlite3VdbeAddOp(v, OP_Expire, 0, 0);
sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
if( pParse->explain ) return;
db = pParse->db;
zName = sqlite3NameFromToken(pDbname);
if( zName==0 ) return;
for(i=0; i<db->nDb; i++){
pDb = &db->aDb[i];
if( pDb->pBt==0 ) continue;
if( sqlite3StrICmp(pDb->zName, zName)==0 ) break;
}
if( i>=db->nDb ){
sqlite3_snprintf(sizeof(zErr),zErr, "no such database: %s", zName);
goto detach_error;
sqlite3ErrorMsg(pParse, "no such database: %z", zName);
return;
}
if( i<2 ){
sqlite3_snprintf(sizeof(zErr),zErr, "cannot detach database %s", zName);
goto detach_error;
sqlite3ErrorMsg(pParse, "cannot detach database %z", zName);
return;
}
sqliteFree(zName);
if( !db->autoCommit ){
sqlite3_snprintf(sizeof(zErr), zErr,
"cannot DETACH database within transaction");
goto detach_error;
sqlite3ErrorMsg(pParse, "cannot DETACH database within transaction");
pParse->rc = SQLITE_ERROR;
return;
}
if( sqlite3BtreeIsInReadTrans(pDb->pBt) || sqlite3BtreeIsInBackup(pDb->pBt) ){
sqlite3_snprintf(sizeof(zErr),zErr, "database %s is locked", zName);
goto detach_error;
}
sqlite3BtreeClose(pDb->pBt);
pDb->pBt = 0;
pDb->pSchema = 0;
sqlite3ResetInternalSchema(db, 0);
return;
detach_error:
sqlite3_result_error(context, zErr, -1);
}
/*
** This procedure generates VDBE code for a single invocation of either the
** sqlite_detach() or sqlite_attach() SQL user functions.
*/
static void codeAttach(
Parse *pParse, /* The parser context */
int type, /* Either SQLITE_ATTACH or SQLITE_DETACH */
FuncDef *pFunc, /* FuncDef wrapper for detachFunc() or attachFunc() */
Expr *pAuthArg, /* Expression to pass to authorization callback */
Expr *pFilename, /* Name of database file */
Expr *pDbname, /* Name of the database to use internally */
Expr *pKey /* Database key for encryption extension */
){
int rc;
NameContext sName;
Vdbe *v;
sqlite3* db = pParse->db;
int regArgs;
memset(&sName, 0, sizeof(NameContext));
sName.pParse = pParse;
if(
SQLITE_OK!=(rc = resolveAttachExpr(&sName, pFilename)) ||
SQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) ||
SQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey))
){
pParse->nErr++;
goto attach_end;
}
#ifndef SQLITE_OMIT_AUTHORIZATION
if( pAuthArg ){
char *zAuthArg = pAuthArg->u.zToken;
if( NEVER(zAuthArg==0) ){
goto attach_end;
}
rc = sqlite3AuthCheck(pParse, type, zAuthArg, 0, 0);
if(rc!=SQLITE_OK ){
goto attach_end;
}
if( sqlite3AuthCheck(pParse,SQLITE_DETACH,db->aDb[i].zName,0,0)!=SQLITE_OK ){
return;
}
#endif /* SQLITE_OMIT_AUTHORIZATION */
v = sqlite3GetVdbe(pParse);
regArgs = sqlite3GetTempRange(pParse, 4);
sqlite3ExprCode(pParse, pFilename, regArgs);
sqlite3ExprCode(pParse, pDbname, regArgs+1);
sqlite3ExprCode(pParse, pKey, regArgs+2);
assert( v || db->mallocFailed );
if( v ){
sqlite3VdbeAddOp3(v, OP_Function, 0, regArgs+3-pFunc->nArg, regArgs+3);
assert( pFunc->nArg==-1 || (pFunc->nArg&0xff)==pFunc->nArg );
sqlite3VdbeChangeP5(v, (u8)(pFunc->nArg));
sqlite3VdbeChangeP4(v, -1, (char *)pFunc, P4_FUNCDEF);
/* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this
** statement only). For DETACH, set it to false (expire all existing
** statements).
*/
sqlite3VdbeAddOp1(v, OP_Expire, (type==SQLITE_ATTACH));
}
attach_end:
sqlite3ExprDelete(db, pFilename);
sqlite3ExprDelete(db, pDbname);
sqlite3ExprDelete(db, pKey);
sqlite3BtreeClose(pDb->pBt);
pDb->pBt = 0;
sqlite3ResetInternalSchema(db, 0);
}
/*
** Called by the parser to compile a DETACH statement.
**
** DETACH pDbname
*/
void sqlite3Detach(Parse *pParse, Expr *pDbname){
static FuncDef detach_func = {
1, /* nArg */
SQLITE_UTF8, /* iPrefEnc */
0, /* flags */
0, /* pUserData */
0, /* pNext */
detachFunc, /* xFunc */
0, /* xStep */
0, /* xFinalize */
"sqlite_detach", /* zName */
0 /* pHash */
};
codeAttach(pParse, SQLITE_DETACH, &detach_func, pDbname, 0, 0, pDbname);
}
/*
** Called by the parser to compile an ATTACH statement.
**
** ATTACH p AS pDbname KEY pKey
*/
void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){
static FuncDef attach_func = {
3, /* nArg */
SQLITE_UTF8, /* iPrefEnc */
0, /* flags */
0, /* pUserData */
0, /* pNext */
attachFunc, /* xFunc */
0, /* xStep */
0, /* xFinalize */
"sqlite_attach", /* zName */
0 /* pHash */
};
codeAttach(pParse, SQLITE_ATTACH, &attach_func, p, p, pDbname, pKey);
}
#endif /* SQLITE_OMIT_ATTACH */
/*
** Initialize a DbFixer structure. This routine must be called prior
** to passing the structure to one of the sqliteFixAAAA() routines below.
@@ -409,7 +224,7 @@ int sqlite3FixInit(
){
sqlite3 *db;
if( NEVER(iDb<0) || iDb==1 ) return 0;
if( iDb<0 || iDb==1 ) return 0;
db = pParse->db;
assert( db->nDb>iDb );
pFix->pParse = pParse;
@@ -441,11 +256,11 @@ int sqlite3FixSrcList(
const char *zDb;
struct SrcList_item *pItem;
if( NEVER(pList==0) ) return 0;
if( pList==0 ) return 0;
zDb = pFix->zDb;
for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
if( pItem->zDatabase==0 ){
pItem->zDatabase = sqlite3DbStrDup(pFix->pParse->db, zDb);
pItem->zDatabase = sqliteStrDup(zDb);
}else if( sqlite3StrICmp(pItem->zDatabase,zDb)!=0 ){
sqlite3ErrorMsg(pFix->pParse,
"%s %T cannot reference objects in database %s",
@@ -486,11 +301,11 @@ int sqlite3FixExpr(
Expr *pExpr /* The expression to be fixed to one database */
){
while( pExpr ){
if( ExprHasAnyProperty(pExpr, EP_TokenOnly) ) break;
if( ExprHasProperty(pExpr, EP_xIsSelect) ){
if( sqlite3FixSelect(pFix, pExpr->x.pSelect) ) return 1;
}else{
if( sqlite3FixExprList(pFix, pExpr->x.pList) ) return 1;
if( sqlite3FixSelect(pFix, pExpr->pSelect) ){
return 1;
}
if( sqlite3FixExprList(pFix, pExpr->pList) ){
return 1;
}
if( sqlite3FixExpr(pFix, pExpr->pRight) ){
return 1;
+49 -75
View File
@@ -14,7 +14,7 @@
** systems that do not need this facility may omit it by recompiling
** the library with -DSQLITE_OMIT_AUTHORIZATION=1
**
** $Id: auth.c,v 1.32 2009/07/02 18:40:35 danielk1977 Exp $
** $Id: auth.c,v 1.22 2005/07/29 15:36:15 drh Exp $
*/
#include "sqliteInt.h"
@@ -74,11 +74,9 @@ int sqlite3_set_authorizer(
int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
void *pArg
){
sqlite3_mutex_enter(db->mutex);
db->xAuth = xAuth;
db->pAuthArg = pArg;
sqlite3ExpirePreparedStatements(db);
sqlite3_mutex_leave(db->mutex);
return SQLITE_OK;
}
@@ -86,44 +84,13 @@ int sqlite3_set_authorizer(
** Write an error message into pParse->zErrMsg that explains that the
** user-supplied authorization function returned an illegal value.
*/
static void sqliteAuthBadReturnCode(Parse *pParse){
sqlite3ErrorMsg(pParse, "authorizer malfunction");
static void sqliteAuthBadReturnCode(Parse *pParse, int rc){
sqlite3ErrorMsg(pParse, "illegal return value (%d) from the "
"authorization function - should be SQLITE_OK, SQLITE_IGNORE, "
"or SQLITE_DENY", rc);
pParse->rc = SQLITE_ERROR;
}
/*
** Invoke the authorization callback for permission to read column zCol from
** table zTab in database zDb. This function assumes that an authorization
** callback has been registered (i.e. that sqlite3.xAuth is not NULL).
**
** If SQLITE_IGNORE is returned and pExpr is not NULL, then pExpr is changed
** to an SQL NULL expression. Otherwise, if pExpr is NULL, then SQLITE_IGNORE
** is treated as SQLITE_DENY. In this case an error is left in pParse.
*/
int sqlite3AuthReadCol(
Parse *pParse, /* The parser context */
const char *zTab, /* Table name */
const char *zCol, /* Column name */
int iDb /* Index of containing database. */
){
sqlite3 *db = pParse->db; /* Database handle */
char *zDb = db->aDb[iDb].zName; /* Name of attached database */
int rc; /* Auth callback return code */
rc = db->xAuth(db->pAuthArg, SQLITE_READ, zTab,zCol,zDb,pParse->zAuthContext);
if( rc==SQLITE_DENY ){
if( db->nDb>2 || iDb!=0 ){
sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",zDb,zTab,zCol);
}else{
sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited", zTab, zCol);
}
pParse->rc = SQLITE_AUTH;
}else if( rc!=SQLITE_IGNORE && rc!=SQLITE_OK ){
sqliteAuthBadReturnCode(pParse);
}
return rc;
}
/*
** The pExpr should be a TK_COLUMN expression. The table referred to
** is in pTabList or else it is the NEW or OLD table of a trigger.
@@ -136,51 +103,59 @@ int sqlite3AuthReadCol(
void sqlite3AuthRead(
Parse *pParse, /* The parser context */
Expr *pExpr, /* The expression to check authorization on */
Schema *pSchema, /* The schema of the expression */
SrcList *pTabList /* All table that pExpr might refer to */
){
sqlite3 *db = pParse->db;
Table *pTab = 0; /* The table being read */
int rc;
Table *pTab; /* The table being read */
const char *zCol; /* Name of the column of the table */
int iSrc; /* Index in pTabList->a[] of table being read */
int iDb; /* The index of the database the expression refers to */
int iCol; /* Index of column in table */
const char *zDBase; /* Name of database being accessed */
TriggerStack *pStack; /* The stack of current triggers */
if( db->xAuth==0 ) return;
iDb = sqlite3SchemaToIndex(pParse->db, pSchema);
if( iDb<0 ){
/* An attempt to read a column out of a subquery or other
** temporary table. */
if( pExpr->op==TK_AS ) return;
assert( pExpr->op==TK_COLUMN );
for(iSrc=0; pTabList && iSrc<pTabList->nSrc; iSrc++){
if( pExpr->iTable==pTabList->a[iSrc].iCursor ) break;
}
if( iSrc>=0 && pTabList && iSrc<pTabList->nSrc ){
pTab = pTabList->a[iSrc].pTab;
}else if( (pStack = pParse->trigStack)!=0 ){
/* This must be an attempt to read the NEW or OLD pseudo-tables
** of a trigger.
*/
assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx );
pTab = pStack->pTab;
}else{
return;
}
assert( pExpr->op==TK_COLUMN || pExpr->op==TK_TRIGGER );
if( pExpr->op==TK_TRIGGER ){
pTab = pParse->pTriggerTab;
}else{
assert( pTabList );
for(iSrc=0; ALWAYS(iSrc<pTabList->nSrc); iSrc++){
if( pExpr->iTable==pTabList->a[iSrc].iCursor ){
pTab = pTabList->a[iSrc].pTab;
break;
}
}
}
iCol = pExpr->iColumn;
if( NEVER(pTab==0) ) return;
if( iCol>=0 ){
assert( iCol<pTab->nCol );
zCol = pTab->aCol[iCol].zName;
if( pTab==0 ) return;
if( pExpr->iColumn>=0 ){
assert( pExpr->iColumn<pTab->nCol );
zCol = pTab->aCol[pExpr->iColumn].zName;
}else if( pTab->iPKey>=0 ){
assert( pTab->iPKey<pTab->nCol );
zCol = pTab->aCol[pTab->iPKey].zName;
}else{
zCol = "ROWID";
}
assert( iDb>=0 && iDb<db->nDb );
if( SQLITE_IGNORE==sqlite3AuthReadCol(pParse, pTab->zName, zCol, iDb) ){
assert( pExpr->iDb<db->nDb );
zDBase = db->aDb[pExpr->iDb].zName;
rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol, zDBase,
pParse->zAuthContext);
if( rc==SQLITE_IGNORE ){
pExpr->op = TK_NULL;
}else if( rc==SQLITE_DENY ){
if( db->nDb>2 || pExpr->iDb!=0 ){
sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",
zDBase, pTab->zName, zCol);
}else{
sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited",pTab->zName,zCol);
}
pParse->rc = SQLITE_AUTH;
}else if( rc!=SQLITE_OK ){
sqliteAuthBadReturnCode(pParse, rc);
}
}
@@ -200,10 +175,8 @@ int sqlite3AuthCheck(
sqlite3 *db = pParse->db;
int rc;
/* Don't do any authorization checks if the database is initialising
** or if the parser is being invoked from within sqlite3_declare_vtab.
*/
if( db->init.busy || IN_DECLARE_VTAB ){
/* Don't do any authorization checks if the database is initialising. */
if( db->init.busy ){
return SQLITE_OK;
}
@@ -216,7 +189,7 @@ int sqlite3AuthCheck(
pParse->rc = SQLITE_AUTH;
}else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){
rc = SQLITE_DENY;
sqliteAuthBadReturnCode(pParse);
sqliteAuthBadReturnCode(pParse, rc);
}
return rc;
}
@@ -231,10 +204,11 @@ void sqlite3AuthContextPush(
AuthContext *pContext,
const char *zContext
){
assert( pParse );
pContext->pParse = pParse;
pContext->zAuthContext = pParse->zAuthContext;
pParse->zAuthContext = zContext;
if( pParse ){
pContext->zAuthContext = pParse->zAuthContext;
pParse->zAuthContext = zContext;
}
}
/*
-630
View File
@@ -1,630 +0,0 @@
/*
** 2009 January 28
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This file contains the implementation of the sqlite3_backup_XXX()
** API functions and the related features.
**
** $Id: backup.c,v 1.19 2009/07/06 19:03:13 drh Exp $
*/
#include "sqliteInt.h"
#include "btreeInt.h"
/* Macro to find the minimum of two numeric values.
*/
#ifndef MIN
# define MIN(x,y) ((x)<(y)?(x):(y))
#endif
/*
** Structure allocated for each backup operation.
*/
struct sqlite3_backup {
sqlite3* pDestDb; /* Destination database handle */
Btree *pDest; /* Destination b-tree file */
u32 iDestSchema; /* Original schema cookie in destination */
int bDestLocked; /* True once a write-transaction is open on pDest */
Pgno iNext; /* Page number of the next source page to copy */
sqlite3* pSrcDb; /* Source database handle */
Btree *pSrc; /* Source b-tree file */
int rc; /* Backup process error code */
/* These two variables are set by every call to backup_step(). They are
** read by calls to backup_remaining() and backup_pagecount().
*/
Pgno nRemaining; /* Number of pages left to copy */
Pgno nPagecount; /* Total number of pages to copy */
int isAttached; /* True once backup has been registered with pager */
sqlite3_backup *pNext; /* Next backup associated with source pager */
};
/*
** THREAD SAFETY NOTES:
**
** Once it has been created using backup_init(), a single sqlite3_backup
** structure may be accessed via two groups of thread-safe entry points:
**
** * Via the sqlite3_backup_XXX() API function backup_step() and
** backup_finish(). Both these functions obtain the source database
** handle mutex and the mutex associated with the source BtShared
** structure, in that order.
**
** * Via the BackupUpdate() and BackupRestart() functions, which are
** invoked by the pager layer to report various state changes in
** the page cache associated with the source database. The mutex
** associated with the source database BtShared structure will always
** be held when either of these functions are invoked.
**
** The other sqlite3_backup_XXX() API functions, backup_remaining() and
** backup_pagecount() are not thread-safe functions. If they are called
** while some other thread is calling backup_step() or backup_finish(),
** the values returned may be invalid. There is no way for a call to
** BackupUpdate() or BackupRestart() to interfere with backup_remaining()
** or backup_pagecount().
**
** Depending on the SQLite configuration, the database handles and/or
** the Btree objects may have their own mutexes that require locking.
** Non-sharable Btrees (in-memory databases for example), do not have
** associated mutexes.
*/
/*
** Return a pointer corresponding to database zDb (i.e. "main", "temp")
** in connection handle pDb. If such a database cannot be found, return
** a NULL pointer and write an error message to pErrorDb.
**
** If the "temp" database is requested, it may need to be opened by this
** function. If an error occurs while doing so, return 0 and write an
** error message to pErrorDb.
*/
static Btree *findBtree(sqlite3 *pErrorDb, sqlite3 *pDb, const char *zDb){
int i = sqlite3FindDbName(pDb, zDb);
if( i==1 ){
Parse *pParse;
int rc = 0;
pParse = sqlite3StackAllocZero(pErrorDb, sizeof(*pParse));
if( pParse==0 ){
sqlite3Error(pErrorDb, SQLITE_NOMEM, "out of memory");
rc = SQLITE_NOMEM;
}else{
pParse->db = pDb;
if( sqlite3OpenTempDatabase(pParse) ){
sqlite3ErrorClear(pParse);
sqlite3Error(pErrorDb, pParse->rc, "%s", pParse->zErrMsg);
rc = SQLITE_ERROR;
}
sqlite3StackFree(pErrorDb, pParse);
}
if( rc ){
return 0;
}
}
if( i<0 ){
sqlite3Error(pErrorDb, SQLITE_ERROR, "unknown database %s", zDb);
return 0;
}
return pDb->aDb[i].pBt;
}
/*
** Create an sqlite3_backup process to copy the contents of zSrcDb from
** connection handle pSrcDb to zDestDb in pDestDb. If successful, return
** a pointer to the new sqlite3_backup object.
**
** If an error occurs, NULL is returned and an error code and error message
** stored in database handle pDestDb.
*/
sqlite3_backup *sqlite3_backup_init(
sqlite3* pDestDb, /* Database to write to */
const char *zDestDb, /* Name of database within pDestDb */
sqlite3* pSrcDb, /* Database connection to read from */
const char *zSrcDb /* Name of database within pSrcDb */
){
sqlite3_backup *p; /* Value to return */
/* Lock the source database handle. The destination database
** handle is not locked in this routine, but it is locked in
** sqlite3_backup_step(). The user is required to ensure that no
** other thread accesses the destination handle for the duration
** of the backup operation. Any attempt to use the destination
** database connection while a backup is in progress may cause
** a malfunction or a deadlock.
*/
sqlite3_mutex_enter(pSrcDb->mutex);
sqlite3_mutex_enter(pDestDb->mutex);
if( pSrcDb==pDestDb ){
sqlite3Error(
pDestDb, SQLITE_ERROR, "source and destination must be distinct"
);
p = 0;
}else {
/* Allocate space for a new sqlite3_backup object */
p = (sqlite3_backup *)sqlite3_malloc(sizeof(sqlite3_backup));
if( !p ){
sqlite3Error(pDestDb, SQLITE_NOMEM, 0);
}
}
/* If the allocation succeeded, populate the new object. */
if( p ){
memset(p, 0, sizeof(sqlite3_backup));
p->pSrc = findBtree(pDestDb, pSrcDb, zSrcDb);
p->pDest = findBtree(pDestDb, pDestDb, zDestDb);
p->pDestDb = pDestDb;
p->pSrcDb = pSrcDb;
p->iNext = 1;
p->isAttached = 0;
if( 0==p->pSrc || 0==p->pDest ){
/* One (or both) of the named databases did not exist. An error has
** already been written into the pDestDb handle. All that is left
** to do here is free the sqlite3_backup structure.
*/
sqlite3_free(p);
p = 0;
}
}
if( p ){
p->pSrc->nBackup++;
}
sqlite3_mutex_leave(pDestDb->mutex);
sqlite3_mutex_leave(pSrcDb->mutex);
return p;
}
/*
** Argument rc is an SQLite error code. Return true if this error is
** considered fatal if encountered during a backup operation. All errors
** are considered fatal except for SQLITE_BUSY and SQLITE_LOCKED.
*/
static int isFatalError(int rc){
return (rc!=SQLITE_OK && rc!=SQLITE_BUSY && ALWAYS(rc!=SQLITE_LOCKED));
}
/*
** Parameter zSrcData points to a buffer containing the data for
** page iSrcPg from the source database. Copy this data into the
** destination database.
*/
static int backupOnePage(sqlite3_backup *p, Pgno iSrcPg, const u8 *zSrcData){
Pager * const pDestPager = sqlite3BtreePager(p->pDest);
const int nSrcPgsz = sqlite3BtreeGetPageSize(p->pSrc);
int nDestPgsz = sqlite3BtreeGetPageSize(p->pDest);
const int nCopy = MIN(nSrcPgsz, nDestPgsz);
const i64 iEnd = (i64)iSrcPg*(i64)nSrcPgsz;
int rc = SQLITE_OK;
i64 iOff;
assert( p->bDestLocked );
assert( !isFatalError(p->rc) );
assert( iSrcPg!=PENDING_BYTE_PAGE(p->pSrc->pBt) );
assert( zSrcData );
/* Catch the case where the destination is an in-memory database and the
** page sizes of the source and destination differ.
*/
if( nSrcPgsz!=nDestPgsz && sqlite3PagerIsMemdb(sqlite3BtreePager(p->pDest)) ){
rc = SQLITE_READONLY;
}
/* This loop runs once for each destination page spanned by the source
** page. For each iteration, variable iOff is set to the byte offset
** of the destination page.
*/
for(iOff=iEnd-(i64)nSrcPgsz; rc==SQLITE_OK && iOff<iEnd; iOff+=nDestPgsz){
DbPage *pDestPg = 0;
Pgno iDest = (Pgno)(iOff/nDestPgsz)+1;
if( iDest==PENDING_BYTE_PAGE(p->pDest->pBt) ) continue;
if( SQLITE_OK==(rc = sqlite3PagerGet(pDestPager, iDest, &pDestPg))
&& SQLITE_OK==(rc = sqlite3PagerWrite(pDestPg))
){
const u8 *zIn = &zSrcData[iOff%nSrcPgsz];
u8 *zDestData = sqlite3PagerGetData(pDestPg);
u8 *zOut = &zDestData[iOff%nDestPgsz];
/* Copy the data from the source page into the destination page.
** Then clear the Btree layer MemPage.isInit flag. Both this module
** and the pager code use this trick (clearing the first byte
** of the page 'extra' space to invalidate the Btree layers
** cached parse of the page). MemPage.isInit is marked
** "MUST BE FIRST" for this purpose.
*/
memcpy(zOut, zIn, nCopy);
((u8 *)sqlite3PagerGetExtra(pDestPg))[0] = 0;
}
sqlite3PagerUnref(pDestPg);
}
return rc;
}
/*
** If pFile is currently larger than iSize bytes, then truncate it to
** exactly iSize bytes. If pFile is not larger than iSize bytes, then
** this function is a no-op.
**
** Return SQLITE_OK if everything is successful, or an SQLite error
** code if an error occurs.
*/
static int backupTruncateFile(sqlite3_file *pFile, i64 iSize){
i64 iCurrent;
int rc = sqlite3OsFileSize(pFile, &iCurrent);
if( rc==SQLITE_OK && iCurrent>iSize ){
rc = sqlite3OsTruncate(pFile, iSize);
}
return rc;
}
/*
** Register this backup object with the associated source pager for
** callbacks when pages are changed or the cache invalidated.
*/
static void attachBackupObject(sqlite3_backup *p){
sqlite3_backup **pp;
assert( sqlite3BtreeHoldsMutex(p->pSrc) );
pp = sqlite3PagerBackupPtr(sqlite3BtreePager(p->pSrc));
p->pNext = *pp;
*pp = p;
p->isAttached = 1;
}
/*
** Copy nPage pages from the source b-tree to the destination.
*/
int sqlite3_backup_step(sqlite3_backup *p, int nPage){
int rc;
sqlite3_mutex_enter(p->pSrcDb->mutex);
sqlite3BtreeEnter(p->pSrc);
if( p->pDestDb ){
sqlite3_mutex_enter(p->pDestDb->mutex);
}
rc = p->rc;
if( !isFatalError(rc) ){
Pager * const pSrcPager = sqlite3BtreePager(p->pSrc); /* Source pager */
Pager * const pDestPager = sqlite3BtreePager(p->pDest); /* Dest pager */
int ii; /* Iterator variable */
int nSrcPage = -1; /* Size of source db in pages */
int bCloseTrans = 0; /* True if src db requires unlocking */
/* If the source pager is currently in a write-transaction, return
** SQLITE_BUSY immediately.
*/
if( p->pDestDb && p->pSrc->pBt->inTransaction==TRANS_WRITE ){
rc = SQLITE_BUSY;
}else{
rc = SQLITE_OK;
}
/* Lock the destination database, if it is not locked already. */
if( SQLITE_OK==rc && p->bDestLocked==0
&& SQLITE_OK==(rc = sqlite3BtreeBeginTrans(p->pDest, 2))
){
p->bDestLocked = 1;
sqlite3BtreeGetMeta(p->pDest, BTREE_SCHEMA_VERSION, &p->iDestSchema);
}
/* If there is no open read-transaction on the source database, open
** one now. If a transaction is opened here, then it will be closed
** before this function exits.
*/
if( rc==SQLITE_OK && 0==sqlite3BtreeIsInReadTrans(p->pSrc) ){
rc = sqlite3BtreeBeginTrans(p->pSrc, 0);
bCloseTrans = 1;
}
/* Now that there is a read-lock on the source database, query the
** source pager for the number of pages in the database.
*/
if( rc==SQLITE_OK ){
rc = sqlite3PagerPagecount(pSrcPager, &nSrcPage);
}
for(ii=0; (nPage<0 || ii<nPage) && p->iNext<=(Pgno)nSrcPage && !rc; ii++){
const Pgno iSrcPg = p->iNext; /* Source page number */
if( iSrcPg!=PENDING_BYTE_PAGE(p->pSrc->pBt) ){
DbPage *pSrcPg; /* Source page object */
rc = sqlite3PagerGet(pSrcPager, iSrcPg, &pSrcPg);
if( rc==SQLITE_OK ){
rc = backupOnePage(p, iSrcPg, sqlite3PagerGetData(pSrcPg));
sqlite3PagerUnref(pSrcPg);
}
}
p->iNext++;
}
if( rc==SQLITE_OK ){
p->nPagecount = nSrcPage;
p->nRemaining = nSrcPage+1-p->iNext;
if( p->iNext>(Pgno)nSrcPage ){
rc = SQLITE_DONE;
}else if( !p->isAttached ){
attachBackupObject(p);
}
}
/* Update the schema version field in the destination database. This
** is to make sure that the schema-version really does change in
** the case where the source and destination databases have the
** same schema version.
*/
if( rc==SQLITE_DONE
&& (rc = sqlite3BtreeUpdateMeta(p->pDest,1,p->iDestSchema+1))==SQLITE_OK
){
const int nSrcPagesize = sqlite3BtreeGetPageSize(p->pSrc);
const int nDestPagesize = sqlite3BtreeGetPageSize(p->pDest);
int nDestTruncate;
if( p->pDestDb ){
sqlite3ResetInternalSchema(p->pDestDb, 0);
}
/* Set nDestTruncate to the final number of pages in the destination
** database. The complication here is that the destination page
** size may be different to the source page size.
**
** If the source page size is smaller than the destination page size,
** round up. In this case the call to sqlite3OsTruncate() below will
** fix the size of the file. However it is important to call
** sqlite3PagerTruncateImage() here so that any pages in the
** destination file that lie beyond the nDestTruncate page mark are
** journalled by PagerCommitPhaseOne() before they are destroyed
** by the file truncation.
*/
if( nSrcPagesize<nDestPagesize ){
int ratio = nDestPagesize/nSrcPagesize;
nDestTruncate = (nSrcPage+ratio-1)/ratio;
if( nDestTruncate==(int)PENDING_BYTE_PAGE(p->pDest->pBt) ){
nDestTruncate--;
}
}else{
nDestTruncate = nSrcPage * (nSrcPagesize/nDestPagesize);
}
sqlite3PagerTruncateImage(pDestPager, nDestTruncate);
if( nSrcPagesize<nDestPagesize ){
/* If the source page-size is smaller than the destination page-size,
** two extra things may need to happen:
**
** * The destination may need to be truncated, and
**
** * Data stored on the pages immediately following the
** pending-byte page in the source database may need to be
** copied into the destination database.
*/
const i64 iSize = (i64)nSrcPagesize * (i64)nSrcPage;
sqlite3_file * const pFile = sqlite3PagerFile(pDestPager);
assert( pFile );
assert( (i64)nDestTruncate*(i64)nDestPagesize >= iSize || (
nDestTruncate==(int)(PENDING_BYTE_PAGE(p->pDest->pBt)-1)
&& iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+nDestPagesize
));
if( SQLITE_OK==(rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1))
&& SQLITE_OK==(rc = backupTruncateFile(pFile, iSize))
&& SQLITE_OK==(rc = sqlite3PagerSync(pDestPager))
){
i64 iOff;
i64 iEnd = MIN(PENDING_BYTE + nDestPagesize, iSize);
for(
iOff=PENDING_BYTE+nSrcPagesize;
rc==SQLITE_OK && iOff<iEnd;
iOff+=nSrcPagesize
){
PgHdr *pSrcPg = 0;
const Pgno iSrcPg = (Pgno)((iOff/nSrcPagesize)+1);
rc = sqlite3PagerGet(pSrcPager, iSrcPg, &pSrcPg);
if( rc==SQLITE_OK ){
u8 *zData = sqlite3PagerGetData(pSrcPg);
rc = sqlite3OsWrite(pFile, zData, nSrcPagesize, iOff);
}
sqlite3PagerUnref(pSrcPg);
}
}
}else{
rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 0);
}
/* Finish committing the transaction to the destination database. */
if( SQLITE_OK==rc
&& SQLITE_OK==(rc = sqlite3BtreeCommitPhaseTwo(p->pDest))
){
rc = SQLITE_DONE;
}
}
/* If bCloseTrans is true, then this function opened a read transaction
** on the source database. Close the read transaction here. There is
** no need to check the return values of the btree methods here, as
** "committing" a read-only transaction cannot fail.
*/
if( bCloseTrans ){
TESTONLY( int rc2 );
TESTONLY( rc2 = ) sqlite3BtreeCommitPhaseOne(p->pSrc, 0);
TESTONLY( rc2 |= ) sqlite3BtreeCommitPhaseTwo(p->pSrc);
assert( rc2==SQLITE_OK );
}
p->rc = rc;
}
if( p->pDestDb ){
sqlite3_mutex_leave(p->pDestDb->mutex);
}
sqlite3BtreeLeave(p->pSrc);
sqlite3_mutex_leave(p->pSrcDb->mutex);
return rc;
}
/*
** Release all resources associated with an sqlite3_backup* handle.
*/
int sqlite3_backup_finish(sqlite3_backup *p){
sqlite3_backup **pp; /* Ptr to head of pagers backup list */
sqlite3_mutex *mutex; /* Mutex to protect source database */
int rc; /* Value to return */
/* Enter the mutexes */
if( p==0 ) return SQLITE_OK;
sqlite3_mutex_enter(p->pSrcDb->mutex);
sqlite3BtreeEnter(p->pSrc);
mutex = p->pSrcDb->mutex;
if( p->pDestDb ){
sqlite3_mutex_enter(p->pDestDb->mutex);
}
/* Detach this backup from the source pager. */
if( p->pDestDb ){
p->pSrc->nBackup--;
}
if( p->isAttached ){
pp = sqlite3PagerBackupPtr(sqlite3BtreePager(p->pSrc));
while( *pp!=p ){
pp = &(*pp)->pNext;
}
*pp = p->pNext;
}
/* If a transaction is still open on the Btree, roll it back. */
sqlite3BtreeRollback(p->pDest);
/* Set the error code of the destination database handle. */
rc = (p->rc==SQLITE_DONE) ? SQLITE_OK : p->rc;
sqlite3Error(p->pDestDb, rc, 0);
/* Exit the mutexes and free the backup context structure. */
if( p->pDestDb ){
sqlite3_mutex_leave(p->pDestDb->mutex);
}
sqlite3BtreeLeave(p->pSrc);
if( p->pDestDb ){
sqlite3_free(p);
}
sqlite3_mutex_leave(mutex);
return rc;
}
/*
** Return the number of pages still to be backed up as of the most recent
** call to sqlite3_backup_step().
*/
int sqlite3_backup_remaining(sqlite3_backup *p){
return p->nRemaining;
}
/*
** Return the total number of pages in the source database as of the most
** recent call to sqlite3_backup_step().
*/
int sqlite3_backup_pagecount(sqlite3_backup *p){
return p->nPagecount;
}
/*
** This function is called after the contents of page iPage of the
** source database have been modified. If page iPage has already been
** copied into the destination database, then the data written to the
** destination is now invalidated. The destination copy of iPage needs
** to be updated with the new data before the backup operation is
** complete.
**
** It is assumed that the mutex associated with the BtShared object
** corresponding to the source database is held when this function is
** called.
*/
void sqlite3BackupUpdate(sqlite3_backup *pBackup, Pgno iPage, const u8 *aData){
sqlite3_backup *p; /* Iterator variable */
for(p=pBackup; p; p=p->pNext){
assert( sqlite3_mutex_held(p->pSrc->pBt->mutex) );
if( !isFatalError(p->rc) && iPage<p->iNext ){
/* The backup process p has already copied page iPage. But now it
** has been modified by a transaction on the source pager. Copy
** the new data into the backup.
*/
int rc = backupOnePage(p, iPage, aData);
assert( rc!=SQLITE_BUSY && rc!=SQLITE_LOCKED );
if( rc!=SQLITE_OK ){
p->rc = rc;
}
}
}
}
/*
** Restart the backup process. This is called when the pager layer
** detects that the database has been modified by an external database
** connection. In this case there is no way of knowing which of the
** pages that have been copied into the destination database are still
** valid and which are not, so the entire process needs to be restarted.
**
** It is assumed that the mutex associated with the BtShared object
** corresponding to the source database is held when this function is
** called.
*/
void sqlite3BackupRestart(sqlite3_backup *pBackup){
sqlite3_backup *p; /* Iterator variable */
for(p=pBackup; p; p=p->pNext){
assert( sqlite3_mutex_held(p->pSrc->pBt->mutex) );
p->iNext = 1;
}
}
#ifndef SQLITE_OMIT_VACUUM
/*
** Copy the complete content of pBtFrom into pBtTo. A transaction
** must be active for both files.
**
** The size of file pTo may be reduced by this operation. If anything
** goes wrong, the transaction on pTo is rolled back. If successful, the
** transaction is committed before returning.
*/
int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
int rc;
sqlite3_backup b;
sqlite3BtreeEnter(pTo);
sqlite3BtreeEnter(pFrom);
/* Set up an sqlite3_backup object. sqlite3_backup.pDestDb must be set
** to 0. This is used by the implementations of sqlite3_backup_step()
** and sqlite3_backup_finish() to detect that they are being called
** from this function, not directly by the user.
*/
memset(&b, 0, sizeof(b));
b.pSrcDb = pFrom->db;
b.pSrc = pFrom;
b.pDest = pTo;
b.iNext = 1;
/* 0x7FFFFFFF is the hard limit for the number of pages in a database
** file. By passing this as the number of pages to copy to
** sqlite3_backup_step(), we can guarantee that the copy finishes
** within a single call (unless an error occurs). The assert() statement
** checks this assumption - (p->rc) should be set to either SQLITE_DONE
** or an error code.
*/
sqlite3_backup_step(&b, 0x7FFFFFFF);
assert( b.rc!=SQLITE_OK );
rc = sqlite3_backup_finish(&b);
if( rc==SQLITE_OK ){
pTo->pBt->pageSizeFixed = 0;
}
sqlite3BtreeLeave(pFrom);
sqlite3BtreeLeave(pTo);
return rc;
}
#endif /* SQLITE_OMIT_VACUUM */

Some files were not shown because too many files have changed in this diff Show More