Merge the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: 8baef58170ff851d0c4387a6888f59b487b4f33c
This commit is contained in:
drh
2011-10-21 17:08:23 +00:00
62 changed files with 2176 additions and 595 deletions
+59
View File
@@ -0,0 +1,59 @@
# 2011 October 13
#
# 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 regression tests for the FTS SQLite module.
#
# This file implements tests to verify that ticket [9fd058691] has been
# fixed.
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
# If SQLITE_ENABLE_FTS3 is defined, omit this file.
ifcapable !fts3 {
finish_test
return
}
set ::testprefix fts3-9fd058691
do_execsql_test 1.0 {
CREATE VIRTUAL TABLE fts USING fts3( tags TEXT);
INSERT INTO fts (tags) VALUES ('tag1');
SELECT * FROM fts WHERE tags MATCH 'tag1';
} {tag1}
do_test 1.1 {
db close
sqlite3 db test.db
execsql {
UPDATE fts SET tags = 'tag1' WHERE rowid = 1;
SELECT * FROM fts WHERE tags MATCH 'tag1';
}
} {tag1}
db close
forcedelete test.db
sqlite3 db test.db
do_execsql_test 2.0 {
CREATE VIRTUAL TABLE fts USING fts3(tags TEXT);
INSERT INTO fts (docid, tags) VALUES (1, 'tag1');
INSERT INTO fts (docid, tags) VALUES (2, NULL);
INSERT INTO fts (docid, tags) VALUES (3, 'three');
} {}
do_test 2.1 {
execsql {
UPDATE fts SET tags = 'two' WHERE rowid = 2;
SELECT * FROM fts WHERE tags MATCH 'two';
}
} {two}
finish_test
+3
View File
@@ -200,6 +200,9 @@ do_test fts3ao-4.7 {
SELECT * FROM t5;
}
} {{the quick brown fox} {jumped over the} {lazy dog}}
do_execsql_test fts3ao-4.8 {
SELECT snippet(t5, '[', ']') FROM t5 WHERE t5 MATCH 'the'
} {{[the] quick brown fox} {jumped over [the]}}
# Test that it is possible to rename an FTS4 table. Renaming an FTS4 table
# involves renaming the extra %_docsize and %_stat tables.
+53
View File
@@ -304,4 +304,57 @@ do_test fts3d-5.1 {
}
} {{Index already optimal} 2 0}
# ALTER TABLE RENAME should work regardless of the database encoding.
#
do_test fts3d-6.0 {
db close
forcedelete test.db
sqlite3 db test.db
db eval {
PRAGMA encoding=UTF8;
CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {fts_content fts_segdir fts_segments}
do_test fts3d-6.1 {
db eval {
ALTER TABLE fts RENAME TO xyz;
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {xyz_content xyz_segdir xyz_segments}
do_test fts3d-6.2 {
db close
forcedelete test.db
sqlite3 db test.db
db eval {
PRAGMA encoding=UTF16le;
CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {fts_content fts_segdir fts_segments}
do_test fts3d-6.3 {
db eval {
ALTER TABLE fts RENAME TO xyz;
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {xyz_content xyz_segdir xyz_segments}
do_test fts3d-6.4 {
db close
forcedelete test.db
sqlite3 db test.db
db eval {
PRAGMA encoding=UTF16be;
CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {fts_content fts_segdir fts_segments}
do_test fts3d-6.5 {
db eval {
ALTER TABLE fts RENAME TO xyz;
SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
}
} {xyz_content xyz_segdir xyz_segments}
finish_test
+40
View File
@@ -426,6 +426,18 @@ foreach {tn setup} {
SELECT rowid FROM t1 WHERE t1 MATCH '"jk xduvfhk" OR "zm azavwm"'
} {8 15 26 92 96}
}
if {$tn>1} {
# These tests will not work with $tn==1, as in this case table t1 is
# created using FTS3. The ^ syntax is only available with FTS4 tables.
#
do_select_test 7.1 {
SELECT rowid FROM t1 WHERE t1 MATCH '^zm mjpavjuhw'
} {56 62}
do_select_test 7.2 {
SELECT rowid FROM t1 WHERE t1 MATCH '^azavwm zm'
} {43}
}
}
set testprefix fts3defer
@@ -449,5 +461,33 @@ do_execsql_test 3.3 {
SELECT count(*) FROM x1 WHERE x1 MATCH '"d e f"'
} {16}
# At one point the following was causing a floating-point exception.
#
do_execsql_test 4.1 {
CREATE VIRTUAL TABLE x2 USING FTS4(x);
BEGIN;
INSERT INTO x2 VALUES('m m m m m m m m m m m m m m m m m m m m m m m m m m');
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 SELECT * FROM x2;
INSERT INTO x2 VALUES('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 m');
COMMIT;
}
do_execsql_test 4.2 {
SELECT * FROM x2 WHERE x2 MATCH 'a b c d e f g h i j k l m n o p q r s';
} {{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 m}}
finish_test
+49
View File
@@ -82,4 +82,53 @@ do_faultsim_test 2.1 -prep {
faultsim_test_result {0 {a * 1 1 a 0 1 1 b * 1 1 b 0 1 1 c * 1 1 c 0 1 1 x * 1 1 x 1 1 1 y * 1 1 y 1 1 1 z * 1 1 z 1 1 1}}
}
do_faultsim_test 3.0 -faults oom* -prep {
faultsim_delete_and_reopen
db eval { CREATE TABLE 'xx yy'(a, b); }
} -body {
execsql {
CREATE VIRTUAL TABLE tt USING fts4(content="xx yy");
}
} -test {
faultsim_test_result {0 {}}
}
do_faultsim_test 3.1 -faults oom* -prep {
faultsim_delete_and_reopen
db func zip zip
db func unzip unzip
} -body {
execsql {
CREATE VIRTUAL TABLE tt USING fts4(compress=zip, uncompress=unzip);
}
} -test {
faultsim_test_result {0 {}}
}
do_test 4.0 {
faultsim_delete_and_reopen
execsql {
CREATE VIRTUAL TABLE ft USING fts4(a, b);
INSERT INTO ft VALUES('U U T C O', 'F N D E S');
INSERT INTO ft VALUES('P H X G B', 'I D M R U');
INSERT INTO ft VALUES('P P X D M', 'Y V N T C');
INSERT INTO ft VALUES('Z L Q O W', 'D F U N Q');
INSERT INTO ft VALUES('A J D U P', 'C H M Q E');
INSERT INTO ft VALUES('P S A O H', 'S Z C W D');
INSERT INTO ft VALUES('T B N L W', 'C A K T I');
INSERT INTO ft VALUES('K E Z L O', 'L L Y C E');
INSERT INTO ft VALUES('C R E S V', 'Q V F W P');
INSERT INTO ft VALUES('S K H G W', 'R W Q F G');
}
faultsim_save_and_close
} {}
do_faultsim_test 4.1 -prep {
faultsim_restore_and_reopen
db eval {SELECT * FROM sqlite_master}
} -body {
execsql { INSERT INTO ft(ft) VALUES('rebuild') }
} -test {
faultsim_test_result {0 {}}
}
finish_test
+163
View File
@@ -0,0 +1,163 @@
# 2011 October 18
#
# 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.
#
#***********************************************************************
set testdir [file dirname $argv0]
source $testdir/tester.tcl
source $testdir/malloc_common.tcl
ifcapable !fts3 {
finish_test
return
}
set testprefix fts3first
proc lreverse {L} {
set res [list]
for {set ii [expr [llength $L]-1]} {$ii>=0} {incr ii -1} {
lappend res [lindex $L $ii]
}
set res
}
proc mit {blob} {
set scan(littleEndian) i*
set scan(bigEndian) I*
binary scan $blob $scan($::tcl_platform(byteOrder)) r
return $r
}
db func mit mit
do_execsql_test 1.0 {
CREATE VIRTUAL TABLE x1 USING FTS4(a, b, c);
INSERT INTO x1(docid,a,b,c) VALUES(0, 'K H D S T', 'V M N Y K', 'S Z N Q S');
INSERT INTO x1(docid,a,b,c) VALUES(1, 'K N J L W', 'S Z W J Q', 'D U W S E');
INSERT INTO x1(docid,a,b,c) VALUES(2, 'B P M O I', 'R P H W S', 'R J L L E');
INSERT INTO x1(docid,a,b,c) VALUES(3, 'U R Q M L', 'M J K A V', 'Q W J T J');
INSERT INTO x1(docid,a,b,c) VALUES(4, 'N J C Y N', 'R U D X V', 'B O U A Q');
INSERT INTO x1(docid,a,b,c) VALUES(5, 'Q L X L U', 'I F N X S', 'U Q A N Y');
INSERT INTO x1(docid,a,b,c) VALUES(6, 'M R G U T', 'U V I Q P', 'X Y D L S');
INSERT INTO x1(docid,a,b,c) VALUES(7, 'D Y P O I', 'X J P K R', 'V O T H V');
INSERT INTO x1(docid,a,b,c) VALUES(8, 'R Y D L R', 'U U E S J', 'N W L M R');
INSERT INTO x1(docid,a,b,c) VALUES(9, 'Z P F N P', 'W A X D U', 'V A E Q A');
INSERT INTO x1(docid,a,b,c) VALUES(10, 'Q I A Q M', 'N D K H C', 'A H T Q Z');
INSERT INTO x1(docid,a,b,c) VALUES(11, 'T E R Q B', 'C I B C B', 'F Z U W R');
INSERT INTO x1(docid,a,b,c) VALUES(12, 'E S V U W', 'T P F W H', 'A M D J Q');
INSERT INTO x1(docid,a,b,c) VALUES(13, 'X S B X Y', 'U D N D P', 'X Z Y G F');
INSERT INTO x1(docid,a,b,c) VALUES(14, 'K H A B L', 'S R C C Z', 'D W E H J');
INSERT INTO x1(docid,a,b,c) VALUES(15, 'C E U C C', 'W F M N M', 'T Z U X T');
INSERT INTO x1(docid,a,b,c) VALUES(16, 'Q G C G H', 'H N N B H', 'B Q I H Y');
INSERT INTO x1(docid,a,b,c) VALUES(17, 'Q T S K B', 'W B D Y N', 'V J P E C');
INSERT INTO x1(docid,a,b,c) VALUES(18, 'A J M O Q', 'L G Y Y A', 'G N M R N');
INSERT INTO x1(docid,a,b,c) VALUES(19, 'T R Y P Y', 'N V Y B X', 'L Z T N T');
CREATE VIRTUAL TABLE x2 USING FTS4(a, b, c, order=DESC);
INSERT INTO x2(docid, a, b, c) SELECT docid, a, b, c FROM x1;
}
# Test queries.
#
foreach x {1 2} {
foreach {tn match res} {
1 "^K" {0 1 14}
2 "^S" {0 1 14}
3 "^W" {9 15 17}
4 "^J" {}
5 "^E" {12}
6 "V ^-E" {0 3 4 6 7 9 17 19}
7 "V -^E" {0 3 4 6 7 9 17 19}
8 "^-E V" {0 3 4 6 7 9 17 19}
9 "-^E V" {0 3 4 6 7 9 17 19}
10 "V" {0 3 4 6 7 9 12 17 19}
11 {"^K H"} {0 14}
12 {"K H"} {0 10 14}
13 {"K ^H"} {}
} {
set rev [lreverse $res]
do_execsql_test 1.$x.$tn.1 {SELECT docid FROM x1 WHERE x1 MATCH $match} $res
do_execsql_test 1.$x.$tn.2 {SELECT docid FROM x2 WHERE x2 MATCH $match} $rev
}
do_execsql_test 1.$x.[expr $tn+1] {
INSERT INTO x1(x1) VALUES('optimize');
INSERT INTO x2(x2) VALUES('optimize');
} {}
}
# Test the snippet() function.
#
foreach {tn match res} {
1 {^K} {{[K] H D S T} {[K] N J L W} {[K] H A B L}}
2 {^X} {{[X] Y D L S} {[X] J P K R} {[X] S B X Y}}
3 {^X Y} {{[X] [Y] D L S} {D [Y] P O I...[X] J P K R} {[X] S B X [Y]}}
} {
set rev [lreverse $res]
do_execsql_test 1.3.$tn.1 {
SELECT snippet(x1, '[', ']', '...') FROM x1 WHERE x1 MATCH $match
} $res
do_execsql_test 1.3.$tn.2 {
SELECT snippet(x2, '[', ']', '...') FROM x2 WHERE x2 MATCH $match
} $rev
}
# Test matchinfo().
#
foreach {tn match res} {
1 {^K} {
{1 3 3 0 0 0 0 0 0}
{1 3 3 0 0 0 0 0 0}
{1 3 3 0 0 0 0 0 0}
}
2 {^X} {
{0 1 1 0 1 1 1 2 2}
{0 1 1 1 1 1 0 2 2}
{1 1 1 0 1 1 1 2 2}
}
3 {^X Y} {
{0 1 1 0 1 1 1 2 2 0 6 5 0 5 4 1 4 4}
{0 1 1 1 1 1 0 2 2 1 6 5 0 5 4 0 4 4}
{1 1 1 0 1 1 1 2 2 1 6 5 0 5 4 1 4 4}
}
} {
set rev [lreverse $res]
do_execsql_test 1.3.$tn.1 {
SELECT mit(matchinfo(x1, 'x')) FROM x1 WHERE x1 MATCH $match
} $res
do_execsql_test 1.3.$tn.2 {
SELECT mit(matchinfo(x2, 'x')) FROM x2 WHERE x2 MATCH $match
} $rev
}
# Test that ^ is ignored for FTS3 tables.
#
do_execsql_test 2.1 {
CREATE VIRTUAL TABLE x3 USING fts3;
INSERT INTO x3 VALUES('A B C');
INSERT INTO x3 VALUES('B A C');
CREATE VIRTUAL TABLE x4 USING fts4;
INSERT INTO x4 VALUES('A B C');
INSERT INTO x4 VALUES('B A C');
}
do_execsql_test 2.2.1 {
SELECT * FROM x3 WHERE x3 MATCH '^A';
} {{A B C} {B A C}}
do_execsql_test 2.2.2 {
SELECT * FROM x4 WHERE x4 MATCH '^A';
} {{A B C}}
finish_test
+1
View File
@@ -294,6 +294,7 @@ do_write_test fts3_malloc-5.1 ft_content {
do_test fts3_malloc-5.2 {
execsql { CREATE VIRTUAL TABLE ft8 USING fts3(x, tokenize porter) }
} {}
do_write_test fts3_malloc-5.3 ft_content {
INSERT INTO ft8 VALUES('short alongertoken reallyquitealotlongerimeanit andthistokenisjustsolongthatonemightbeforgivenforimaginingthatitwasmerelyacontrivedexampleandnotarealtoken')
}
+16
View File
@@ -19,6 +19,7 @@ source $testdir/tester.tcl
ifcapable !fts3 { finish_test ; return }
set testprefix fts3matchinfo
set sqlite_fts3_enable_parentheses 0
proc mit {blob} {
set scan(littleEndian) i*
@@ -57,6 +58,9 @@ do_catchsql_test 2.0 {
do_catchsql_test 2.1 {
CREATE VIRTUAL TABLE x2 USING fts4(mtchinfo=fts3);
} {1 {unrecognized parameter: mtchinfo=fts3}}
do_catchsql_test 2.2 {
CREATE VIRTUAL TABLE x2 USING fts4(matchinfo=fts5);
} {1 {unrecognized matchinfo: fts5}}
# Check that with fts3, the "=" character is permitted in column definitions.
#
@@ -224,6 +228,18 @@ do_matchinfo_test 4.1.3 t4 {t4 MATCH 'a b'} { s {{2 0} {0 2}} }
do_matchinfo_test 4.1.4 t4 {t4 MATCH '"a b" c'} { s {{2 0} {0 2}} }
do_matchinfo_test 4.1.5 t4 {t4 MATCH 'a "b c"'} { s {{2 0} {0 2}} }
do_matchinfo_test 4.1.6 t4 {t4 MATCH 'd d'} { s {{1 0} {0 1}} }
do_matchinfo_test 4.1.7 t4 {t4 MATCH 'f OR abcd'} {
x {
{0 1 1 1 1 1 0 0 0 0 0 0}
{1 1 1 0 1 1 0 0 0 0 0 0}
}
}
do_matchinfo_test 4.1.8 t4 {t4 MATCH 'f -abcd'} {
x {
{0 1 1 1 1 1}
{1 1 1 0 1 1}
}
}
do_execsql_test 4.2.0 {
CREATE VIRTUAL TABLE t5 USING fts4;
+10
View File
@@ -200,4 +200,14 @@ do_execsql_test 4.6 {
SELECT * FROM t3 WHERE t3 MATCH 'one*'
} {{one two three}}
#-------------------------------------------------------------------------
# Syntax tests.
#
do_catchsql_test 5.1 {
CREATE VIRTUAL TABLE t4 USING fts4(prefix="abc");
} {1 {error parsing prefix parameter: abc}}
do_catchsql_test 5.2 {
CREATE VIRTUAL TABLE t4 USING fts4(prefix="");
} {0 {}}
finish_test
+5
View File
@@ -138,6 +138,8 @@ foreach {tn param res} {
3 "order=dec" {1 {unrecognized order: dec}}
4 "order=xxx, order=asc" {1 {unrecognized order: xxx}}
5 "order=desc, order=asc" {0 {}}
6 "order=xxxx, order=asc" {1 {unrecognized order: xxxx}}
7 "order=desk" {1 {unrecognized order: desk}}
} {
execsql { DROP TABLE IF EXISTS t1 }
do_catchsql_test 2.1.$tn "
@@ -157,6 +159,9 @@ do_execsql_test 2.2 {
do_execsql_test 2.3 {
SELECT docid FROM t2 WHERE t2 MATCH 'aa';
} {3 1}
do_execsql_test 2.4 {
SELECT docid FROM t2 WHERE t2 MATCH 'aa' ORDER BY content;
} {1 3}
#-------------------------------------------------------------------------
# Test that ticket [56be976859] has been fixed.
+478
View File
@@ -0,0 +1,478 @@
# 2011 October 03
#
# 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 regression tests for SQLite library. The
# focus of this script is testing the content=xxx FTS4 option.
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set ::testprefix fts4content
# If SQLITE_ENABLE_FTS3 is defined, omit this file.
ifcapable !fts3 {
finish_test
return
}
#-------------------------------------------------------------------------
# Test organization:
#
# 1.* - Warm-body tests.
#
# 2.* - Querying a content=xxx FTS table.
#
# 3.* - Writing to a content=xxx FTS table.
#
# 4.* - The "INSERT INTO fts(fts) VALUES('rebuild')" command.
#
# 5.* - Check that CREATE TABLE, DROP TABLE and ALTER TABLE correctly
# ignore any %_content table when used with the content=xxx option.
#
# 6.* - Test the effects of messing with the schema of table xxx after
# creating a content=xxx FTS index.
#
do_execsql_test 1.1.1 {
CREATE TABLE t1(a, b, c);
INSERT INTO t1 VALUES('w x', 'x y', 'y z');
CREATE VIRTUAL TABLE ft1 USING fts4(content=t1);
}
do_execsql_test 1.1.2 {
PRAGMA table_info(ft1);
} {
0 a {} 0 {} 0
1 b {} 0 {} 0
2 c {} 0 {} 0
}
do_execsql_test 1.1.3 { SELECT *, rowid FROM ft1 } {{w x} {x y} {y z} 1}
do_execsql_test 1.1.4 { SELECT a, c FROM ft1 WHERE rowid=1 } {{w x} {y z}}
do_execsql_test 1.1.5 { INSERT INTO ft1(ft1) VALUES('rebuild') } {}
do_execsql_test 1.1.6 { SELECT rowid FROM ft1 WHERE ft1 MATCH 'x' } {1}
do_execsql_test 1.1.7 { SELECT rowid FROM ft1 WHERE ft1 MATCH 'a' } {}
do_execsql_test 1.2.1 {
DROP TABLE ft1;
CREATE VIRTUAL TABLE ft1 USING fts4(content=t1, b);
PRAGMA table_info(ft1);
} {
0 b {} 0 {} 0
}
do_execsql_test 1.2.2 {
SELECT *, rowid FROM ft1
} {{x y} 1}
#-------------------------------------------------------------------------
# The following block of tests - 2.* - test that a content=xxx FTS table
# can be queried. Also tested are cases where rows identified in the FTS
# are missing from the content table, and cases where the index is
# inconsistent with the content table.
#
do_execsql_test 2.0 {
CREATE TABLE t2(x);
INSERT INTO t2 VALUES('O S W W F U C R Q I C N P Z Y Y E Y Y E'); -- 1
INSERT INTO t2 VALUES('Y X U V L B E H Y J C Y A I A P V F V K'); -- 2
INSERT INTO t2 VALUES('P W I N J H I I N I F B K D U Q B Z S F'); -- 3
INSERT INTO t2 VALUES('N R O R H J R H G M D I U U B O M P A U'); -- 4
INSERT INTO t2 VALUES('Y O V O G T P N G T N F I V B U M J M G'); -- 5
INSERT INTO t2 VALUES('J O B N K N E C H Z R K J O U G M K L S'); -- 6
INSERT INTO t2 VALUES('S Z S R I Q U A P W R X H K C Z U L S P'); -- 7
INSERT INTO t2 VALUES('J C H N R C K R V N M O F Z M Z A I H W'); -- 8
INSERT INTO t2 VALUES('O Y G I S J U U W O D Z F J K N R P R L'); -- 9
INSERT INTO t2 VALUES('B G L K U R U P V X Z I H V R W C Q A S'); -- 10
INSERT INTO t2 VALUES('T F T J F F Y V F W N X K Q A Y L X W G'); -- 11
INSERT INTO t2 VALUES('C J U H B Q X L C M M Y E G V F W V Z C'); -- 12
INSERT INTO t2 VALUES('B W L T F S G X D P H N G M R I O A X I'); -- 13
INSERT INTO t2 VALUES('N G Y O K Q K Z N M H U J E D H U W R K'); -- 14
INSERT INTO t2 VALUES('U D T R U Y F J D S J X E H Q G V A S Z'); -- 15
INSERT INTO t2 VALUES('M I W P J S H R J D Q I C G P C T P H R'); -- 16
INSERT INTO t2 VALUES('J M N I S L X Q C A B F C B Y D H V R J'); -- 17
INSERT INTO t2 VALUES('F V Z W J Q L P X Y E W B U Q N H X K T'); -- 18
INSERT INTO t2 VALUES('R F S R Y O F Q E I E G H C B H R X Y N'); -- 19
INSERT INTO t2 VALUES('U Q Q Q T E P D M F X P J G H X C Q D L'); -- 20
}
do_execsql_test 2.1 {
CREATE VIRTUAL TABLE ft2 USING fts4(content=t2);
INSERT INTO ft2(ft2) VALUES('rebuild');
-- Modify the backing table a bit: Row 17 is missing and the contents
-- of row 20 do not match the FTS index contents.
DELETE FROM t2 WHERE rowid = 17;
UPDATE t2 SET x = 'a b c d e f g h i j' WHERE rowid = 20;
}
foreach {tn match rowidlist} {
1 {S} {1 3 6 7 9 10 13 15 16 17 19}
2 {"S R"} {7 19}
3 {"N K N"} {6}
4 {"Q Q"} {20}
5 {"B Y D"} {17}
} {
do_execsql_test 2.2.1.$tn {
SELECT rowid FROM ft2 WHERE ft2 MATCH $match
} $rowidlist
do_execsql_test 2.2.2.$tn {
SELECT docid FROM ft2 WHERE ft2 MATCH $match
} $rowidlist
}
foreach {tn match result} {
1 {"N K N"} {{J O B N K N E C H Z R K J O U G M K L S}}
2 {"Q Q"} {{a b c d e f g h i j}}
3 {"B Y D"} {{}}
} {
do_execsql_test 2.3.$tn {
SELECT * FROM ft2 WHERE ft2 MATCH $match
} $result
}
foreach {tn match result} {
1 {"N K N"} {{..O B [N] [K] [N] E..}}
2 {"B Y D"} {{}}
3 {"Q Q"} {{a [b] [c] [d] e f..}}
} {
do_execsql_test 2.4.$tn {
SELECT snippet(ft2, '[', ']', '..', -1, 6) FROM ft2 WHERE ft2 MATCH $match
} $result
}
foreach {tn match result} {
1 {"N K N"} {{0 0 6 1 0 1 8 1 0 2 10 1}}
2 {"B Y D"} {{}}
3 {"Q Q"} {{0 0 2 1 0 0 4 1 0 1 4 1 0 1 6 1}}
4 {"Q D L"} {{}}
} {
do_execsql_test 2.5.$tn {
SELECT offsets(ft2) FROM ft2 WHERE ft2 MATCH $match
} $result
}
#-------------------------------------------------------------------------
# The following block of tests - 3.* - test that the FTS index can be
# modified by writing to the table. But that this has no effect on the
# content table.
#
do_execsql_test 3.1 {
CREATE TABLE t3(x, y);
CREATE VIRTUAL TABLE ft3 USING fts4(content=t3);
}
do_catchsql_test 3.1.1 {
INSERT INTO ft3 VALUES('a b c', 'd e f');
} {1 {constraint failed}}
do_execsql_test 3.1.2 {
INSERT INTO ft3(docid, x, y) VALUES(21, 'a b c', 'd e f');
SELECT rowid FROM ft3 WHERE ft3 MATCH '"a b c"';
} {21}
do_execsql_test 3.1.3 { SELECT * FROM t3 } {}
# This DELETE does not work, since there is no row in [t3] to base the
# DELETE on. So the SELECT on [ft3] still returns rowid 21.
do_execsql_test 3.1.4 {
DELETE FROM ft3;
SELECT rowid FROM ft3 WHERE ft3 MATCH '"a b c"';
} {21}
# If the row is added to [t3] before the DELETE on [ft3], it works.
do_execsql_test 3.1.5 {
INSERT INTO t3(rowid, x, y) VALUES(21, 'a b c', 'd e f');
DELETE FROM ft3;
SELECT rowid FROM ft3 WHERE ft3 MATCH '"a b c"';
} {}
do_execsql_test 3.1.6 { SELECT rowid FROM t3 } {21}
do_execsql_test 3.2.1 {
INSERT INTO ft3(rowid, x, y) VALUES(0, 'R T M S M', 'A F O K H');
INSERT INTO ft3(rowid, x, y) VALUES(1, 'C Z J O X', 'U S Q D K');
INSERT INTO ft3(rowid, x, y) VALUES(2, 'N G H P O', 'N O P O C');
INSERT INTO ft3(rowid, x, y) VALUES(3, 'V H S D R', 'K N G E C');
INSERT INTO ft3(rowid, x, y) VALUES(4, 'J T R V U', 'U X S L C');
INSERT INTO ft3(rowid, x, y) VALUES(5, 'N A Y N G', 'X D G P Y');
INSERT INTO ft3(rowid, x, y) VALUES(6, 'I Q I S P', 'D R O Q B');
INSERT INTO ft3(rowid, x, y) VALUES(7, 'T K T Z J', 'B W D G O');
INSERT INTO ft3(rowid, x, y) VALUES(8, 'Y K F X T', 'D F G V G');
INSERT INTO ft3(rowid, x, y) VALUES(9, 'E L E T L', 'P W N F Z');
INSERT INTO ft3(rowid, x, y) VALUES(10, 'O G J G X', 'G J F E P');
INSERT INTO ft3(rowid, x, y) VALUES(11, 'O L N N Z', 'K E Z F D');
INSERT INTO ft3(rowid, x, y) VALUES(12, 'R Z M R J', 'X G I M Z');
INSERT INTO ft3(rowid, x, y) VALUES(13, 'L X N N X', 'R R N S T');
INSERT INTO ft3(rowid, x, y) VALUES(14, 'F L B J H', 'K W F L C');
INSERT INTO ft3(rowid, x, y) VALUES(15, 'P E B M V', 'E A A B U');
INSERT INTO ft3(rowid, x, y) VALUES(16, 'V E C F P', 'L U T V K');
INSERT INTO ft3(rowid, x, y) VALUES(17, 'T N O Z N', 'T P Q X N');
INSERT INTO ft3(rowid, x, y) VALUES(18, 'V W U W R', 'H O A A V');
INSERT INTO ft3(rowid, x, y) VALUES(19, 'A H N L F', 'I G H B O');
}
foreach {tn match rowidlist} {
1 "N A" {5 19}
2 "x:O" {1 2 10 11 17}
3 "y:O" {0 2 6 7 18 19}
} {
set res [list]
foreach rowid $rowidlist { lappend res $rowid {} {} }
do_execsql_test 3.2.2.$tn {
SELECT rowid, * FROM ft3 WHERE ft3 MATCH $match
} $res
do_execsql_test 3.2.3.$tn {
SELECT docid, * FROM ft3 WHERE ft3 MATCH $match
} $res
}
do_execsql_test 3.3.1 {
INSERT INTO t3(rowid, x, y) VALUES(0, 'R T M S M', 'A F O K H');
INSERT INTO t3(rowid, x, y) VALUES(1, 'C Z J O X', 'U S Q D K');
INSERT INTO t3(rowid, x, y) VALUES(2, 'N G H P O', 'N O P O C');
INSERT INTO t3(rowid, x, y) VALUES(3, 'V H S D R', 'K N G E C');
INSERT INTO t3(rowid, x, y) VALUES(4, 'J T R V U', 'U X S L C');
INSERT INTO t3(rowid, x, y) VALUES(5, 'N A Y N G', 'X D G P Y');
UPDATE ft3 SET x = y, y = x;
DELETE FROM t3;
}
foreach {tn match rowidlist} {
1 "N A" {5 19}
2 "x:O" {0 2 10 11 17}
3 "y:O" {1 2 6 7 18 19}
} {
set res [list]
foreach rowid $rowidlist { lappend res $rowid {} {} }
do_execsql_test 3.3.2.$tn {
SELECT rowid, * FROM ft3 WHERE ft3 MATCH $match
} $res
do_execsql_test 3.3.3.$tn {
SELECT docid, * FROM ft3 WHERE ft3 MATCH $match
} $res
}
do_execsql_test 3.3.1 {
INSERT INTO t3(rowid, x, y) VALUES(15, 'P E B M V', 'E A A B U');
INSERT INTO t3(rowid, x, y) VALUES(16, 'V E C F P', 'L U T V K');
INSERT INTO t3(rowid, x, y) VALUES(17, 'T N O Z N', 'T P Q X N');
INSERT INTO t3(rowid, x, y) VALUES(18, 'V W U W R', 'H O A A V');
INSERT INTO t3(rowid, x, y) VALUES(19, 'A H N L F', 'I G H B O');
DELETE FROM ft3;
}
foreach {tn match rowidlist} {
1 "N A" {5}
2 "x:O" {0 2 10 11}
3 "y:O" {1 2 6 7}
} {
set res [list]
foreach rowid $rowidlist { lappend res $rowid {} {} }
do_execsql_test 3.3.2.$tn {
SELECT rowid, * FROM ft3 WHERE ft3 MATCH $match
} $res
do_execsql_test 3.3.3.$tn {
SELECT docid, * FROM ft3 WHERE ft3 MATCH $match
} $res
}
#-------------------------------------------------------------------------
# Test cases 4.* test the 'rebuild' command. On content=xxx and regular
# FTS tables.
#
do_execsql_test 4.0 {
CREATE TABLE t4(x);
CREATE VIRTUAL TABLE ft4 USING fts4(content=t4);
CREATE VIRTUAL TABLE ft4x USING fts4(x);
}
do_execsql_test 4.1.1 {
INSERT INTO ft4x(ft4x) VALUES('rebuild');
INSERT INTO ft4(ft4) VALUES('rebuild');
} {}
do_execsql_test 4.1.2 {
SELECT id, quote(value) FROM ft4_stat
} {0 X'000000'}
do_execsql_test 4.1.3 {
SELECT id, quote(value) FROM ft4x_stat
} {0 X'000000'}
do_execsql_test 4.2.1 {
INSERT INTO ft4x VALUES('M G M F T');
INSERT INTO ft4x VALUES('Z Q C A U');
INSERT INTO ft4x VALUES('N L L V');
INSERT INTO ft4x VALUES('T F D X D');
INSERT INTO ft4x VALUES('Z H I S D');
SELECT id, quote(value) FROM ft4x_stat
} {0 X'05182B'}
do_execsql_test 4.2.2 {
INSERT INTO ft4(rowid, x) SELECT rowid, * FROM ft4x;
SELECT id, quote(value) FROM ft4_stat
} {0 X'05182B'}
do_execsql_test 4.2.3 {
SELECT docid, quote(size) FROM ft4_docsize
} {1 X'05' 2 X'05' 3 X'04' 4 X'05' 5 X'05'}
do_execsql_test 4.2.4 {
INSERT INTO ft4x(ft4x) VALUES('rebuild');
SELECT id, quote(value) FROM ft4x_stat;
SELECT docid, quote(size) FROM ft4x_docsize
} {0 X'05182B' 1 X'05' 2 X'05' 3 X'04' 4 X'05' 5 X'05'}
do_execsql_test 4.2.5 {
INSERT INTO ft4(ft4) VALUES('rebuild');
SELECT id, quote(value) FROM ft4_stat;
SELECT docid, quote(size) FROM ft4_docsize
} {0 X'000000'}
do_execsql_test 4.2.6 {
INSERT INTO t4(rowid, x) SELECT rowid, x FROM ft4x;
INSERT INTO ft4(ft4) VALUES('rebuild');
SELECT id, quote(value) FROM ft4_stat;
SELECT docid, quote(size) FROM ft4_docsize
} {0 X'05182B' 1 X'05' 2 X'05' 3 X'04' 4 X'05' 5 X'05'}
#-------------------------------------------------------------------------
# Test cases 5.* test that the following commands do not create/move or
# delete a %_content table when used with a content=xxx FTS table.
#
do_execsql_test 5.1.1 {
CREATE TABLE t5(a, b, c, d);
CREATE VIRTUAL TABLE ft5 USING fts4(content=t5);
SELECT name FROM sqlite_master WHERE name LIKE '%t5%';
} {
t5 ft5 ft5_segments ft5_segdir
sqlite_autoindex_ft5_segdir_1 ft5_docsize ft5_stat
}
do_execsql_test 5.1.2 {
ALTER TABLE ft5 RENAME TO ft6;
SELECT name FROM sqlite_master WHERE name LIKE '%t5%';
} {
t5
}
do_execsql_test 5.1.3 {
SELECT name FROM sqlite_master WHERE name LIKE '%t6%';
} {
ft6 ft6_segments ft6_segdir
sqlite_autoindex_ft6_segdir_1 ft6_docsize ft6_stat
}
do_execsql_test 5.1.4 {
INSERT INTO t5 VALUES('a', 'b', 'c', 'd');
INSERT INTO ft6(ft6) VALUES('rebuild');
SELECT rowid FROM ft6 WHERE ft6 MATCH 'b';
} {1}
do_execsql_test 5.1.5 {
DROP TABLE ft6;
SELECT * FROM t5;
} {a b c d}
do_execsql_test 5.1.6 {
SELECT name FROM sqlite_master WHERE name LIKE '%t6%';
} {
}
do_execsql_test 5.1.7 {
CREATE VIRTUAL TABLE ft5 USING fts4(content=t5);
CREATE TABLE t5_content(a, b);
DROP TABLE ft5;
SELECT name FROM sqlite_master WHERE name LIKE '%t5%';
} {
t5 t5_content
}
#-------------------------------------------------------------------------
# Test cases 6.* test
#
do_catchsql_test 6.1.1 {
CREATE VIRTUAL TABLE ft7 USING fts4(content=t7);
} {1 {vtable constructor failed: ft7}}
do_execsql_test 6.2.1 {
CREATE TABLE t7(one, two);
CREATE VIRTUAL TABLE ft7 USING fts4(content=t7);
INSERT INTO t7 VALUES('A B', 'B A');
INSERT INTO t7 VALUES('C D', 'A A');
SELECT * FROM ft7;
} {
{A B} {B A} {C D} {A A}
}
do_catchsql_test 6.2.2 {
DROP TABLE t7;
SELECT * FROM ft7;
} {1 {SQL logic error or missing database}}
db close
sqlite3 db test.db
do_execsql_test 6.2.3 {
SELECT name FROM sqlite_master WHERE name LIKE '%t7%'
} {
ft7 ft7_segments ft7_segdir sqlite_autoindex_ft7_segdir_1
ft7_docsize ft7_stat
}
do_catchsql_test 6.2.4 {
SELECT * FROM ft7;
} {1 {vtable constructor failed: ft7}}
do_execsql_test 6.2.5 {
CREATE TABLE t7(x, y);
INSERT INTO t7 VALUES('A B', 'B A');
INSERT INTO t7 VALUES('C D', 'A A');
SELECT * FROM ft7;
} {
{A B} {B A} {C D} {A A}
}
do_execsql_test 6.2.6 {
INSERT INTO ft7(ft7) VALUES('rebuild');
SELECT rowid FROM ft7 WHERE ft7 MATCH '"A A"';
} {2}
do_execsql_test 6.2.7 {
DROP TABLE t7;
CREATE TABLE t7(x);
}
do_catchsql_test 6.2.8 {
SELECT * FROM ft7 WHERE ft7 MATCH '"A A"';
} {1 {SQL logic error or missing database}}
do_catchsql_test 6.2.9 {
SELECT * FROM ft7 WHERE ft7 MATCH '"A A"';
} {1 {SQL logic error or missing database}}
db close
sqlite3 db test.db
do_catchsql_test 6.2.10 {
SELECT rowid FROM ft7 WHERE ft7 MATCH '"A A"';
} {0 2}
do_catchsql_test 6.2.11 {
SELECT rowid, * FROM ft7 WHERE ft7 MATCH '"A A"';
} {0 {2 {}}}
#-------------------------------------------------------------------------
# Test cases 7.*
#
do_execsql_test 7.1.1 {
CREATE VIRTUAL TABLE ft8 USING fts4(content=nosuchtable, x);
INSERT INTO ft8(docid, x) VALUES(13, 'U O N X G');
INSERT INTO ft8(docid, x) VALUES(14, 'C J J U B');
INSERT INTO ft8(docid, x) VALUES(15, 'N J Y G X');
INSERT INTO ft8(docid, x) VALUES(16, 'R Y D O R');
INSERT INTO ft8(docid, x) VALUES(17, 'I Y T Q O');
}
do_execsql_test 7.1.2 {
SELECT docid FROM ft8 WHERE ft8 MATCH 'N';
} {13 15}
finish_test
+46
View File
@@ -320,6 +320,52 @@ do_realnum_test nan-4.20 {
db eval {SELECT x, typeof(x) FROM t1}
} {inf real}
do_realnum_test nan-4.30 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e+9999');
SELECT x, typeof(x) FROM t1;
}
} {inf real}
do_realnum_test nan-4.31 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e+10000');
SELECT x, typeof(x) FROM t1;
}
} {inf real}
do_realnum_test nan-4.32 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e-9999');
SELECT x, typeof(x) FROM t1;
}
} {0.0 real}
do_realnum_test nan-4.33 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e-10000');
SELECT x, typeof(x) FROM t1;
}
} {0.0 real}
do_realnum_test nan-4.34 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e2147483650');
SELECT x, typeof(x) FROM t1;
}
} {inf real}
do_realnum_test nan-4.35 {
db eval {
DELETE FROM t1;
INSERT INTO t1 VALUES('2.5e-2147483650');
SELECT x, typeof(x) FROM t1;
}
} {0.0 real}
finish_test
+4 -2
View File
@@ -183,10 +183,12 @@ test_suite "fts3" -prefix "" -description {
fts3defer.test fts3defer2.test fts3e.test fts3expr.test fts3expr2.test
fts3near.test fts3query.test fts3shared.test fts3snippet.test
fts3sort.test
fts3fault.test fts3malloc.test fts3matchinfo.test
fts3aux1.test fts3comp1.test fts3auto.test
fts4aa.test fts4content.test
fts3conf.test fts3prefix.test fts3fault2.test fts3corrupt.test
fts3corrupt2.test
fts3first.test
}
+12
View File
@@ -329,6 +329,9 @@ ifcapable attach {
do_test pragma-3.8.1 {
execsql {PRAGMA quick_check}
} {ok}
do_test pragma-3.8.2 {
execsql {PRAGMA QUICK_CHECK}
} {ok}
do_test pragma-3.9 {
execsql {
ATTACH 'testerr.db' AS t2;
@@ -1219,6 +1222,9 @@ ifcapable pager_pragmas {
PRAGMA page_count;
}
} {2}
do_test pragma-14.2uc {
execsql {pragma PAGE_COUNT}
} {2}
do_test pragma-14.3 {
execsql {
@@ -1227,6 +1233,9 @@ ifcapable pager_pragmas {
PRAGMA page_count;
}
} {3}
do_test pragma-14.3uc {
execsql {pragma PAGE_COUNT}
} {3}
do_test pragma-14.4 {
set page_size [db one {pragma page_size}]
@@ -1256,6 +1265,9 @@ ifcapable pager_pragmas {
PRAGMA aux.page_count;
}
} {5}
do_test pragma-14.6uc {
execsql {pragma AUX.PAGE_COUNT}
} {5}
}
# Test that the value set using the cache_size pragma is not reset when the
+1 -1
View File
@@ -3547,7 +3547,7 @@ do_test printf-4.16 {
do_test printf-5.1 {
set x [sqlite3_mprintf_str {%d %d %100000s} 0 0 {Hello}]
string length $x
} {344}
} {100004}
do_test printf-5.2 {
sqlite3_mprintf_str {%d %d (%-10.10s) %} -9 -10 {HelloHelloHello}
} {-9 -10 (HelloHello) %}
+39
View File
@@ -0,0 +1,39 @@
# 2011 October 13
#
# 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 regression tests for SQLite library. Specifically,
# it tests that ticket [fa7bf5ec94801e7e2030e41eefe5d9dd96eaacfd] has
# been resolved.
#
# The problem described by this ticket was that the sqlite3ExprCompare()
# function was saying that expressions (x='a') and (x='A') were identical
# because it was using sqlite3StrICmp() instead of strcmp() to compare string
# literals. That was causing the query optimizer for aggregate queries to
# believe that both count() operations were identical, and thus only
# computing the first count() and making a copy of the result for the
# second count().
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
do_test tkt-fa7bf5ec-1 {
execsql {
CREATE TABLE t1(x);
INSERT INTO t1 VALUES ('a');
INSERT INTO t1 VALUES ('A');
INSERT INTO t1 VALUES ('A');
SELECT count(CASE WHEN x='a' THEN 1 END),
count(CASE WHEN x='A' THEN 1 END)
FROM t1;
}
} {1 2}
finish_test
+10 -8
View File
@@ -100,16 +100,18 @@ set x 0
# Note: Before the bug was fixed, if [db2] was opened with the "-fullmutex 1"
# option, then this test case would cause an assert() to fail.
#
set ::busyconnection db1
db1 eval {SELECT * FROM t2 ORDER BY a LIMIT 20} {
do_test tkt3793-2.[incr x] { set ::busyconnection } db1
set ::busyconnection db2
db2 eval { SELECT count(*) FROM t2 }
do_test tkt3793-2.[incr x] { set ::busyconnection } db2
ifcapable threadsafe {
set ::busyconnection db1
db1 eval {SELECT * FROM t2 ORDER BY a LIMIT 20} {
do_test tkt3793-2.[incr x] { set ::busyconnection } db1
set ::busyconnection db2
db2 eval { SELECT count(*) FROM t2 }
do_test tkt3793-2.[incr x] { set ::busyconnection } db2
set ::busyconnection db1
}
}
do_test tkt3793-3 {
db1 close
db2 close
+3 -3
View File
@@ -143,7 +143,7 @@ do_multiclient_test tn {
} {1 {unable to open database file}}
# Also test that if the -shm file can be opened for read/write access,
# it is, even if readonly_shm=1 is present in the URI.
# it is not if readonly_shm=1 is present in the URI.
do_test 1.3.2.1 {
code1 { db close }
code2 { db2 close }
@@ -151,8 +151,8 @@ do_multiclient_test tn {
} {0}
do_test 1.3.2.2 {
code1 { sqlite3 db file:test.db?readonly_shm=1 }
sql1 { SELECT * FROM t1 }
} {a b c d e f g h i j k l}
csql1 { SELECT * FROM sqlite_master }
} {1 {unable to open database file}}
do_test 1.3.2.3 {
code1 { db close }
close [open test.db-shm w]
+83
View File
@@ -342,4 +342,87 @@ do_execsql_test where3-5.3 {
0 0 0 {USE TEMP B-TREE FOR ORDER BY}
}
# Name resolution with NATURAL JOIN and USING
#
do_test where3-6.setup {
db eval {
CREATE TABLE t6w(a, w);
INSERT INTO t6w VALUES(1, 'w-one');
INSERT INTO t6w VALUES(2, 'w-two');
INSERT INTO t6w VALUES(9, 'w-nine');
CREATE TABLE t6x(a, x);
INSERT INTO t6x VALUES(1, 'x-one');
INSERT INTO t6x VALUES(3, 'x-three');
INSERT INTO t6x VALUES(9, 'x-nine');
CREATE TABLE t6y(a, y);
INSERT INTO t6y VALUES(1, 'y-one');
INSERT INTO t6y VALUES(4, 'y-four');
INSERT INTO t6y VALUES(9, 'y-nine');
CREATE TABLE t6z(a, z);
INSERT INTO t6z VALUES(1, 'z-one');
INSERT INTO t6z VALUES(5, 'z-five');
INSERT INTO t6z VALUES(9, 'z-nine');
}
} {}
set cnt 0
foreach predicate {
{}
{ORDER BY a}
{ORDER BY t6w.a}
{WHERE a>0}
{WHERE t6y.a>0}
{WHERE a>0 ORDER BY a}
} {
incr cnt
do_test where3-6.$cnt.1 {
set sql "SELECT * FROM t6w NATURAL JOIN t6x NATURAL JOIN t6y"
append sql " NATURAL JOIN t6z "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.2 {
set sql "SELECT * FROM t6w JOIN t6x USING(a) JOIN t6y USING(a)"
append sql " JOIN t6z USING(a) "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.3 {
set sql "SELECT * FROM t6w NATURAL JOIN t6x JOIN t6y USING(a)"
append sql " JOIN t6z USING(a) "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.4 {
set sql "SELECT * FROM t6w JOIN t6x USING(a) NATURAL JOIN t6y"
append sql " JOIN t6z USING(a) "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.5 {
set sql "SELECT * FROM t6w JOIN t6x USING(a) JOIN t6y USING(a)"
append sql " NATURAL JOIN t6z "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.6 {
set sql "SELECT * FROM t6w JOIN t6x USING(a) NATURAL JOIN t6y"
append sql " NATURAL JOIN t6z "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.7 {
set sql "SELECT * FROM t6w NATURAL JOIN t6x JOIN t6y USING(a)"
append sql " NATURAL JOIN t6z "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
do_test where3-6.$cnt.8 {
set sql "SELECT * FROM t6w NATURAL JOIN t6x NATURAL JOIN t6y"
append sql " JOIN t6z USING(a) "
append sql $::predicate
db eval $sql
} {1 w-one x-one y-one z-one 9 w-nine x-nine y-nine z-nine}
}
finish_test