diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:38 -0400 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:38 -0400 |
commit | 487e15dc239ccdb3344d1c99ce120e872bab4a74 (patch) | |
tree | c986d492f6092ca7b4401d91515f74daed17fae2 /test/fts3auto.test | |
parent | 7bb481fda9ecb134804b49c2ce77ca28f7eea583 (diff) |
Imported Upstream version 2.0.6
Diffstat (limited to 'test/fts3auto.test')
-rw-r--r-- | test/fts3auto.test | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/test/fts3auto.test b/test/fts3auto.test index 1c58a17..d5ab4ef 100644 --- a/test/fts3auto.test +++ b/test/fts3auto.test @@ -75,26 +75,27 @@ proc do_fts3query_test {tn args} { } } - get_near_results $tbl $match $deferred aMatchinfo + get_near_results $tbl $match $deferred aHit + get_near_results $tbl [string map {AND OR} $match] $deferred aMatchinfo set matchinfo_asc [list] - foreach docid [lsort -integer -incr [array names aMatchinfo]] { + foreach docid [lsort -integer -incr [array names aHit]] { lappend matchinfo_asc $docid $aMatchinfo($docid) } set matchinfo_desc [list] - foreach docid [lsort -integer -decr [array names aMatchinfo]] { + foreach docid [lsort -integer -decr [array names aHit]] { lappend matchinfo_desc $docid $aMatchinfo($docid) } - set title "(\"$match\" -> [llength [array names aMatchinfo]] rows)" + set title "(\"$match\" -> [llength [array names aHit]] rows)" do_execsql_test $tn$title.1 " SELECT docid FROM $tbl WHERE $tbl MATCH '$match' ORDER BY docid ASC - " [lsort -integer -incr [array names aMatchinfo]] + " [lsort -integer -incr [array names aHit]] do_execsql_test $tn$title.2 " SELECT docid FROM $tbl WHERE $tbl MATCH '$match' ORDER BY docid DESC - " [lsort -integer -decr [array names aMatchinfo]] + " [lsort -integer -decr [array names aHit]] do_execsql_test $tn$title.3 " SELECT docid, mit(matchinfo($tbl, 'x')) FROM $tbl @@ -573,10 +574,10 @@ set chunkconfig [fts3_configure_incr_load 1 1] foreach {tn create pending} { 1 "fts4(a, b)" 1 2 "fts4(a, b, order=ASC, prefix=1)" 1 - 3 "fts4(a, b, order=ASC, prefix=1,3)" 0 - 4 "fts4(a, b, order=DESC, prefix=2,4)" 0 - 5 "fts4(a, b, order=DESC, prefix=1)" 0 - 6 "fts4(a, b, order=ASC, prefix=1,3)" 0 + 3 "fts4(a, b, order=ASC, prefix=\"1,3\")" 0 + 4 "fts4(a, b, order=DESC, prefix=\"2,4\")" 0 + 5 "fts4(a, b, order=DESC, prefix=\"1\")" 0 + 6 "fts4(a, b, order=ASC, prefix=\"1,3\")" 0 } { execsql [subst { @@ -650,6 +651,7 @@ foreach {tn pending create} { do_fts3query_test 6.$tn.2 t1 {b:G AND c:I} do_fts3query_test 6.$tn.3 t1 {b:G NEAR c:I} do_fts3query_test 6.$tn.4 t1 {a:C OR b:G OR c:K OR d:C} + do_fts3query_test 6.$tn.5 t1 {a:G OR b:G} catchsql { COMMIT } |