aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/fts5/test/fts5_common.tcl13
-rw-r--r--ext/fts5/test/fts5bigtok.test1
-rw-r--r--ext/fts5/test/fts5merge2.test5
-rw-r--r--ext/fts5/test/fts5simple.test20
-rw-r--r--ext/misc/spellfix.c2
-rw-r--r--manifest29
-rw-r--r--manifest.uuid2
-rw-r--r--src/test_bestindex.c2
-rw-r--r--test/permutations.test8
-rw-r--r--test/releasetest.tcl1
10 files changed, 52 insertions, 31 deletions
diff --git a/ext/fts5/test/fts5_common.tcl b/ext/fts5/test/fts5_common.tcl
index cf688dcc0..32691d1c8 100644
--- a/ext/fts5/test/fts5_common.tcl
+++ b/ext/fts5/test/fts5_common.tcl
@@ -16,8 +16,13 @@ if {![info exists testdir]} {
source $testdir/tester.tcl
ifcapable !fts5 {
- finish_test
+ proc return_if_no_fts5 {} {
+ finish_test
+ return -code return
+ }
return
+} else {
+ proc return_if_no_fts5 {} {}
}
catch {
@@ -25,12 +30,6 @@ catch {
reset_db
}
-# If SQLITE_ENABLE_FTS5 is not defined, skip this test.
-ifcapable !fts5 {
- finish_test
- return
-}
-
proc fts5_test_poslist {cmd} {
set res [list]
for {set i 0} {$i < [$cmd xInstCount]} {incr i} {
diff --git a/ext/fts5/test/fts5bigtok.test b/ext/fts5/test/fts5bigtok.test
index 2267be505..9ccaf6c86 100644
--- a/ext/fts5/test/fts5bigtok.test
+++ b/ext/fts5/test/fts5bigtok.test
@@ -14,6 +14,7 @@
source [file join [file dirname [info script]] fts5_common.tcl]
set testprefix fts5bigtok
+return_if_no_fts5
proc rndterm {} {
set L [list a b c d e f g h i j k l m n o p q r s t u v w x y z]
diff --git a/ext/fts5/test/fts5merge2.test b/ext/fts5/test/fts5merge2.test
index 87dbf1433..0d3fad8b0 100644
--- a/ext/fts5/test/fts5merge2.test
+++ b/ext/fts5/test/fts5merge2.test
@@ -13,7 +13,8 @@
#
source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5merge
+set testprefix fts5merge2
+return_if_no_fts5
proc dump_structure {} {
db eval {SELECT fts5_decode(id, block) AS t FROM t1_data WHERE id=10} {
@@ -26,8 +27,6 @@ proc dump_structure {} {
foreach_detail_mode $testprefix {
-if {[detail_is_none]==0} continue
-
do_execsql_test 1.0 {
CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
diff --git a/ext/fts5/test/fts5simple.test b/ext/fts5/test/fts5simple.test
index 01111d78c..464b60154 100644
--- a/ext/fts5/test/fts5simple.test
+++ b/ext/fts5/test/fts5simple.test
@@ -429,5 +429,23 @@ do_execsql_test 20.2 {
INSERT INTO x1(x1) VALUES('integrity-check');
} {}
-finish_test
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 20.0 {
+ CREATE VIRTUAL TABLE x1 USING fts5(x);
+ INSERT INTO x1(x1, rank) VALUES('pgsz', 32);
+ INSERT INTO x1(rowid, x) VALUES(11111, 'onetwothree');
+}
+do_test 20.1 {
+ for {set i 1} {$i <= 200} {incr i} {
+ execsql { INSERT INTO x1(rowid, x) VALUES($i, 'one two three'); }
+ }
+ execsql { INSERT INTO x1(x1) VALUES('optimize'); }
+ execsql { DELETE FROM x1 WHERE rowid = 4; }
+} {}
+do_execsql_test 20.2 {
+ INSERT INTO x1(x1) VALUES('optimize');
+ INSERT INTO x1(x1) VALUES('integrity-check');
+} {}
+finish_test
diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c
index cac1edcff..5734d04f4 100644
--- a/ext/misc/spellfix.c
+++ b/ext/misc/spellfix.c
@@ -1775,7 +1775,7 @@ static void scriptCodeSqlFunc(
*/
/* Maximum length of a phonehash used for querying the shadow table */
-#define SPELLFIX_MX_HASH 8
+#define SPELLFIX_MX_HASH 32
/* Maximum number of hash strings to examine per query */
#define SPELLFIX_MX_RUN 1
diff --git a/manifest b/manifest
index 80c000527..828140d3e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\stest\sscript\sbestindex1.test\sto\sthe\sutf16\spermutation.
-D 2016-03-02T17:57:53.035
+C Allow\sthe\sleft-hand\sside\sof\sIN\soperators\son\svirtual\stables\sto\shave\sthe\naConstraintUsage[].omit\sflag\sclear.
+D 2016-03-03T20:42:18.637
F Makefile.in e335453db0b16da00c884ad51bb56d1c091a74de
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc dbd4621ecc585c2ef0c2aa0874698c54675754f1
@@ -116,7 +116,7 @@ F ext/fts5/fts5_varint.c a5aceacda04dafcbae725413d7a16818ecd65738
F ext/fts5/fts5_vocab.c dba72ca393d71c2588548b51380387f6b44c77a8
F ext/fts5/fts5parse.y 86fe6ba094a47e02fe8be2571539e6833d197764
F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-F ext/fts5/test/fts5_common.tcl 61ff0d1a29d98a91c4553b20b3f410d858834ee9
+F ext/fts5/test/fts5_common.tcl b9b1fed811c0390511cef8b254826ea15d380f4d
F ext/fts5/test/fts5aa.test 7e814df4a0e6c22a6fe2d84f210fdc0b5068a084
F ext/fts5/test/fts5ab.test 30325a89453280160106be411bba3acf138e6d1b
F ext/fts5/test/fts5ac.test 55cad4275a1f5acabfe14d8442a8046b47e49e5f
@@ -134,7 +134,7 @@ F ext/fts5/test/fts5auto.test 401c20e89f1114d733b94809be1e6f893e16c09e
F ext/fts5/test/fts5aux.test 8c687c948cc98e9a94be014df7d518acc1b3b74f
F ext/fts5/test/fts5auxdata.test 141a7cbffcceb1bd2799b4b29c183ff8780d586e
F ext/fts5/test/fts5bigpl.test 04ee0d7eebbebf17c31f5a0b5c5f9494eac3a0cb
-F ext/fts5/test/fts5bigtok.test 981b2790f6fa02773c889bd35d42c6b97f80f0f4
+F ext/fts5/test/fts5bigtok.test 017a9397b14e7598883a6328ead4a6539b42d59a
F ext/fts5/test/fts5columnsize.test a8cfef21ffa1c264b9f670a7d94eeaccb5341c07
F ext/fts5/test/fts5config.test 8b2bc6dcc0eb06fa2b7dd65b2ce2db09e829e873
F ext/fts5/test/fts5conflict.test 26f4e46c4d31e16221794832a990dc4e30e18de5
@@ -163,7 +163,7 @@ F ext/fts5/test/fts5hash.test 06f9309ccb4d5050a131594e9e47d0b21456837d
F ext/fts5/test/fts5integrity.test f5e4f8d284385875068ad0f3e894ce43e9de835d
F ext/fts5/test/fts5matchinfo.test f7dde99697bcb310ea8faa8eb2714d9f4dfc0e1b
F ext/fts5/test/fts5merge.test 8f3cdba2ec9c5e7e568246e81b700ad37f764367
-F ext/fts5/test/fts5merge2.test c0cb66eb38a41c26cc5848fb9e50093e0f59ac93
+F ext/fts5/test/fts5merge2.test a6da3c16d694235938d1939f503cfa53f0943d75
F ext/fts5/test/fts5near.test b214cddb1c1f1bddf45c75af768f20145f7e71cc
F ext/fts5/test/fts5onepass.test 7ed9608e258132cb8d55e7c479b08676ad68810c
F ext/fts5/test/fts5optimize.test 42741e7c085ee0a1276140a752d4407d97c2c9f5
@@ -177,7 +177,7 @@ F ext/fts5/test/fts5rank.test 7e9e64eac7245637f6f2033aec4b292aaf611aab
F ext/fts5/test/fts5rebuild.test 03935f617ace91ed23a6099c7c74d905227ff29b
F ext/fts5/test/fts5restart.test c17728fdea26e7d0f617d22ad5b4b2862b994c17
F ext/fts5/test/fts5rowid.test 16908a99d6efc9ba21081b4f2b86b3fc699839a6
-F ext/fts5/test/fts5simple.test 92e06be1c119f88a73ea11a05599a276ec3ff7fd
+F ext/fts5/test/fts5simple.test ac5006cc3d0d08b3538e1e76c7300de9f24fbed1
F ext/fts5/test/fts5simple2.test 98377ae1ff7749a42c21fe1a139c1ed312522c46
F ext/fts5/test/fts5simple3.test 8e71733b3d1b0e695011d02c68ebc5ca40b6124e
F ext/fts5/test/fts5synonym.test 6475d189c2e20d60795808f83e36bf9318708d48
@@ -214,7 +214,7 @@ F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
F ext/misc/series.c e11e534ada797d5b816d7e7a93c022306563ca35
F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
-F ext/misc/spellfix.c 525190484b7a9dbc6be646c4842274fff4f27d53
+F ext/misc/spellfix.c 194b5fc3a9a63cb6c5680d8f713800012bddca7c
F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
@@ -371,7 +371,7 @@ F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
-F src/test_bestindex.c a711473c79e812e4082fbf045ed6c18c99c16058
+F src/test_bestindex.c cd36324f05404df5f1a82608a321b91932a549ea
F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
@@ -947,7 +947,7 @@ F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 7872debaba9e4513dfc7bb52ff32f5a1429985e4
+F test/permutations.test 64abe58d53cde4adcfb881e37aa5ea1b2a980e58
F test/pragma.test 507ac7ef2ea5682241ea0ef041799ca70bb5e0bf
F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@ -968,7 +968,7 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
F test/regexp2.test aa7ffcc21350007a78361b82bcf3b74d12227144
F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 975449bf742b8bb9025208292208af816a1fcb58
+F test/releasetest.tcl a246ecb14ed594bf44bf77bd21df873971d779bf
F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
@@ -1453,7 +1453,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d2d28251566d2a0ec1a07fe5b8ed047136840bfd
-R f53f8a06609558c5e139632a3abf7f8d
-U dan
-Z 9060a915fc132a5c0981e5ef43325748
+P 7abc2dd953477797fa05421b061d73596aa025fb 5893e97244126c80762e55249461f21a4e81bb70
+R 77ba9a90eb8d576bb990c5514d94e81b
+T +closed 5893e97244126c80762e55249461f21a4e81bb70
+U drh
+Z 36b3ebd704c119dedfd1de0a698a068a
diff --git a/manifest.uuid b/manifest.uuid
index 2e05ec224..feb712161 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5893e97244126c80762e55249461f21a4e81bb70 \ No newline at end of file
+3eb74342740cd393e03aa38cd01690ccab173b76 \ No newline at end of file
diff --git a/src/test_bestindex.c b/src/test_bestindex.c
index 6982ce3ca..ab10463fd 100644
--- a/src/test_bestindex.c
+++ b/src/test_bestindex.c
@@ -210,7 +210,6 @@ static int tclClose(sqlite3_vtab_cursor *cur){
static int tclNext(sqlite3_vtab_cursor *pVtabCursor){
tcl_cursor *pCsr = (tcl_cursor*)pVtabCursor;
- tcl_vtab *pTab = (tcl_vtab*)(pVtabCursor->pVtab);
if( pCsr->pStmt ){
tcl_vtab *pTab = (tcl_vtab*)(pVtabCursor->pVtab);
int rc = sqlite3_step(pCsr->pStmt);
@@ -286,7 +285,6 @@ static int tclFilter(
rc = SQLITE_ERROR;
pTab->base.zErrMsg = sqlite3_mprintf("%s", zErr);
}else{
- int iArgv = 1;
for(ii=0; rc==SQLITE_OK && ii<nElem; ii+=2){
const char *zCmd = Tcl_GetString(apElem[ii]);
Tcl_Obj *p = apElem[ii+1];
diff --git a/test/permutations.test b/test/permutations.test
index 975021a61..6c02af8fb 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -86,7 +86,10 @@ proc test_set {args} {
#
set alltests [list]
foreach f [glob $testdir/*.test] { lappend alltests [file tail $f] }
-foreach f [glob -nocomplain $testdir/../ext/rtree/*.test] {
+foreach f [glob -nocomplain \
+ $testdir/../ext/rtree/*.test \
+ $testdir/../ext/fts5/test/*.test \
+] {
lappend alltests $f
}
@@ -157,7 +160,8 @@ test_suite "veryquick" -prefix "" -description {
This test suite is the same as the "quick" tests, except that some files
that test malloc and IO errors are omitted.
} -files [
- test_set $allquicktests -exclude *malloc* *ioerr* *fault* *bigfile* *_err*
+ test_set $allquicktests -exclude *malloc* *ioerr* *fault* *bigfile* *_err* \
+ *fts5corrupt* *fts5big* *fts5aj*
]
test_suite "extraquick" -prefix "" -description {
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index bb902eec3..2bcf1aa51 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -203,6 +203,7 @@ array set ::Configs [strip_comments {
-DSQLITE_MAX_ATTACHED=30
-DSQLITE_ENABLE_COLUMN_METADATA
-DSQLITE_ENABLE_FTS4
+ -DSQLITE_ENABLE_FTS5
-DSQLITE_ENABLE_FTS4_PARENTHESIS
-DSQLITE_DISABLE_FTS4_DEFERRED
-DSQLITE_ENABLE_RTREE
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-22 03:55:58 +0000