Imported Upstream version 3.2.0upstream

1 files changed, 11 insertions, 4 deletions

diff --git a/test/whereF.test b/test/whereF.test
index 57bdbee..b9580bb 100644
--- a/test/whereF.test
+++ b/test/whereF.test
@@ -46,7 +46,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-set testprefix x
+set testprefix whereF
 
 do_execsql_test 1.0 {
   PRAGMA automatic_index = 0;
@@ -63,7 +63,7 @@ foreach {tn sql} {
 } {
   do_test 1.$tn {
     db eval "EXPLAIN QUERY PLAN $sql"
-   } {/.*SCAN TABLE t2 .*SEARCH TABLE t1 .*/}
+   } {/.*SCAN TABLE t2\y.*SEARCH TABLE t1\y.*/}
 }
 
 do_execsql_test 2.0 {
@@ -84,7 +84,7 @@ foreach {tn sql} {
 } {
   do_test 2.$tn {
     db eval "EXPLAIN QUERY PLAN $sql"
-   } {/.*SCAN TABLE t2 .*SEARCH TABLE t1 .*/}
+   } {/.*SCAN TABLE t2\y.*SEARCH TABLE t1\y.*/}
 }
 
 do_execsql_test 3.0 {
@@ -109,7 +109,14 @@ foreach {tn sql} {
 } {
   do_test 3.$tn {
     db eval "EXPLAIN QUERY PLAN $sql"
-   } {/.*SCAN TABLE t2 .*SEARCH TABLE t1 .*/}
+   } {/.*SCAN TABLE t2\y.*SEARCH TABLE t1\y.*/}
 }
 
+do_execsql_test 4.0 {
+  CREATE TABLE t4(a,b,c,d,e, PRIMARY KEY(a,b,c));
+  CREATE INDEX t4adc ON t4(a,d,c);
+  CREATE UNIQUE INDEX t4aebc ON t4(a,e,b,c);
+  EXPLAIN QUERY PLAN SELECT rowid FROM t4 WHERE a=? AND b=?;
+} {/a=. AND b=./}
+
 finish_test