| Index: third_party/sqlite/src/test/fts3defer2.test
|
| diff --git a/third_party/sqlite/src/test/fts3defer2.test b/third_party/sqlite/src/test/fts3defer2.test
|
| index 844180330042945198c7a231b473bb54fc6beea2..87af52461b5487ebe5f29407765865bac17aecbf 100644
|
| --- a/third_party/sqlite/src/test/fts3defer2.test
|
| +++ b/third_party/sqlite/src/test/fts3defer2.test
|
| @@ -13,7 +13,10 @@
|
| set testdir [file dirname $argv0]
|
| source $testdir/tester.tcl
|
| source $testdir/malloc_common.tcl
|
| -ifcapable !fts3 { finish_test ; return }
|
| +ifcapable !fts3||!fts4_deferred {
|
| + finish_test
|
| + return
|
| +}
|
|
|
| set testprefix fts3defer2
|
|
|
| @@ -48,17 +51,22 @@ do_execsql_test 1.1.4 {
|
| UPDATE t1_segments SET block = zeroblob(length(block)) WHERE length(block)>10000;
|
| } {2}
|
|
|
| +do_execsql_test 1.2.0 {
|
| + SELECT content FROM t1 WHERE t1 MATCH 'f (e a)';
|
| +} {{a b c d e f a x y}}
|
| +
|
| do_execsql_test 1.2.1 {
|
| SELECT content FROM t1 WHERE t1 MATCH 'f (e NEAR/2 a)';
|
| } {{a b c d e f a x y}}
|
|
|
| +
|
| do_execsql_test 1.2.2 {
|
| SELECT snippet(t1, '[', ']'), offsets(t1), mit(matchinfo(t1, 'pcxnal'))
|
| FROM t1 WHERE t1 MATCH 'f (e NEAR/2 a)';
|
| } [list \
|
| {a b c d [e] [f] [a] x y} \
|
| {0 1 8 1 0 0 10 1 0 2 12 1} \
|
| - [list 3 1 1 1 1 1 8 8 1 8 8 8 5001 9]
|
| + [list 3 1 1 1 1 1 1 1 1 1 1 8 5001 9]
|
| ]
|
|
|
| do_execsql_test 1.2.3 {
|
| @@ -67,7 +75,7 @@ do_execsql_test 1.2.3 {
|
| } [list \
|
| {[a] b c d [e] [f] [a] x y} \
|
| {0 2 0 1 0 1 8 1 0 0 10 1 0 2 12 1} \
|
| - [list 3 1 1 1 1 1 8 8 2 8 8 8 5001 9]
|
| + [list 3 1 1 1 1 1 1 1 2 2 1 8 5001 9]
|
| ]
|
|
|
| do_execsql_test 1.3.1 { DROP TABLE t1 }
|
| @@ -99,8 +107,14 @@ foreach {tn sql} {
|
| [list 2 1 1 54 54 1 3 3 54 372 7] \
|
| ]
|
|
|
| - set sqlite_fts3_enable_parentheses 1
|
| do_execsql_test 2.2.$tn.2 {
|
| + SELECT mit(matchinfo(t2, 'x')) FROM t2 WHERE t2 MATCH 'g z';
|
| + } [list \
|
| + [list 1 2 2 1 54 54] \
|
| + ]
|
| +
|
| + set sqlite_fts3_enable_parentheses 1
|
| + do_execsql_test 2.2.$tn.3 {
|
| SELECT mit(matchinfo(t2, 'x')) FROM t2 WHERE t2 MATCH 'g OR (g z)';
|
| } [list \
|
| [list 1 2 2 1 2 2 1 54 54] \
|
| @@ -140,4 +154,3 @@ foreach {tn sql} {
|
|
|
|
|
| finish_test
|
| -
|
|
|