From: dan <dan@noemail.net>
Date: Sat, 13 Nov 2010 16:42:27 +0000 (+0000)
Subject: Change the EXPLAIN QUERY PLAN output to use "USING INDEX" instead of "BY INDEX",... 
X-Git-Tag: version-3.7.4~59^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bc39fa1886665f4496fbd98c3a439729d7de1f8;p=thirdparty%2Fsqlite.git

Change the EXPLAIN QUERY PLAN output to use "USING INDEX" instead of "BY INDEX", and to use "SEARCH" instead of "SCAN" for loops that are not full-table scans.

FossilOrigin-Name: 6611b76b0296875fb9903b25dfaa783a9c12eaa1
---

diff --git a/manifest b/manifest
index 702177af08..7c2d1b53ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sEXPLAIN\sQUERY\sPLAN\stest\scases\sto\scheck\sthat\sthe\sexamples\sin\sthe\sdocumentation\swork.
-D 2010-11-12T17:41:38
+C Change\sthe\sEXPLAIN\sQUERY\sPLAN\soutput\sto\suse\s"USING\sINDEX"\sinstead\sof\s"BY\sINDEX",\sand\sto\suse\s"SEARCH"\sinstead\sof\s"SCAN"\sfor\sloops\sthat\sare\snot\sfull-table\sscans.
+D 2010-11-13T16:42:27
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -239,7 +239,7 @@ F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 F src/wal.c f26b8d297bd11cb792e609917f9d4c6718ac8e0e
 F src/wal.h c1aac6593a0b02b15dc625987e619edeab39292e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 2a5a0c68cc6c646f5835d484416480f25c9235e9
+F src/where.c 5a982c342355588f40b1b02e1127000fe8e0a3fe
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
@@ -264,7 +264,7 @@ F test/auth.test 26cc6f219580191539bf335abe03e55e49310846
 F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
 F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
 F test/autoinc.test 85ef3180a737e6580086a018c09c6f1a52759b46
-F test/autoindex1.test c00ee946c4a16bef593e104d8ea81370ff8e5a37
+F test/autoindex1.test 67e2de552a458db13a2eab4fefb291b84f87db5c
 F test/autovacuum.test bb7c0885e6f8f1d633045de48f2b66082162766d
 F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
@@ -350,10 +350,10 @@ F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
 F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f
 F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_createtable.test 5fd86f532e3c50fca6bbaab78ab0b0f8b9c7533c
+F test/e_createtable.test b8f5286879315d5b7f4cc5ead1afda4846f0c0bb
 F test/e_delete.test 55d868b647acc091c261a10b9b0cb0ab660a6acb
 F test/e_expr.test 4e004d1f5187d4bbc9ca3d55660a8d164dd59f4e
-F test/e_fkey.test 64e69327091444471a14f854b2e297c5039c47ab
+F test/e_fkey.test 38039b840ab19331000b0f0eb1d82baa7208a67a
 F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469
 F test/e_insert.test 7390c2da39f16a134dc9a439144768c727757d2c
 F test/e_reindex.test a064f0878b8f848fbca38f1f61f82f15a3000c64
@@ -365,7 +365,7 @@ F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
 F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
-F test/eqp.test 4ca41a9fc38292c5c50fe982adec9f1ebfb0ecb8
+F test/eqp.test 8f8e8ca502267bd34841f66564c1154aecc4fcc4
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 F test/exclusive2.test 76e63c05349cb70d09d60b99d2ae625525ff5155
@@ -476,7 +476,7 @@ F test/incrvacuum_ioerr.test 57d2f5777ab13fa03b87b262a4ea1bad5cfc0291
 F test/index.test df7c00c6edd9504ab71c83a9514f1c5ca0fa54d8
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
-F test/indexedby.test cd78133723657b02d113670791a899e400ec170c
+F test/indexedby.test d7367c5a0e8ed8db642824a68126753e0808c706
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test aef273dd1cee84cc92407469e6bd1b3cdcb76908
 F test/insert2.test 4f3a04d168c728ed5ec2c88842e772606c7ce435
@@ -679,7 +679,7 @@ F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
 F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
 F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
 F test/tkt-5ee23731f.test 3581260f2a71e51db94e1506ba6b0f7311d002a9
-F test/tkt-78e04e52ea.test 567dcb06c6c2885d0e5430d2ed3ec9bb563cc2b7
+F test/tkt-78e04e52ea.test ab52f0c1e2de6e46c910f4cc16b086bba05952b7
 F test/tkt-80e031a00f.test 9a154173461a4dbe2de49cda73963e04842d52f7
 F test/tkt-8454a207b9.test c583a9f814a82a2b5ba95207f55001c9f0cd816c
 F test/tkt-94c04eaadb.test be5ea61cb04dfdc047d19b5c5a9e75fa3da67a7f
@@ -740,7 +740,7 @@ F test/tkt3346.test 6f67c3ed7db94dfc5df4f5f0b63809a1f611e01a
 F test/tkt3357.test 77c37c6482b526fe89941ce951c22d011f5922ed
 F test/tkt3419.test 1bbf36d7ea03b638c15804251287c2391f5c1f6b
 F test/tkt3424.test 61f831bd2b071bd128fa5d00fbda57e656ca5812
-F test/tkt3442.test b88362e90270f4c7c35eb27d529e9d68c185747b
+F test/tkt3442.test 0adb70e9fe9cb750a702065a68ad647409dbc158
 F test/tkt3457.test edbf54b05cbe5165f00192becbd621038f1615e4
 F test/tkt3461.test 228ea328a5a21e8663f80ee3d212a6ad92549a19
 F test/tkt3493.test 1686cbde85f8721fc1bdc0ee72f2ef2f63139218
@@ -842,14 +842,14 @@ F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
 F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
-F test/where3.test 6fc33631b7350b2c4066f835d4f994149ddd0a1d
+F test/where3.test 8ebedae552e13fc7f2b4e8df6cbe72a095347400
 F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
 F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
-F test/where7.test 2707b476dbf752f8cdc986212373700f703a6527
+F test/where7.test aa4cfcd6f66e2a4ef87b6717327325bf4d547502
 F test/where8.test a6c740fd286d7883e274e17b6230a9d672a7ab1f
 F test/where8m.test da346596e19d54f0aba35ebade032a7c47d79739
-F test/where9.test 576ce5bf3bf5d2cefe4dcea9c2e8fc69d1a7ec8f
+F test/where9.test 7ee38c3fd67e76789a6ec769f62f6433d3d4a5cf
 F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
@@ -886,7 +886,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6fdae9a635a43e1bf7e4a480de1413064732c6b0
-R daab0aaa24235586c63182117bdd1fd4
+P 85fdad850a4da33fd74f5394b921a63ea6b40bdb
+R db8952c6470eaa949f02eb93faae70b0
 U dan
-Z 670382a8dc894a7df10be266dfbf69b3
+Z ea9cbebbd7abab9a68340ca7a9b4dfcf
diff --git a/manifest.uuid b/manifest.uuid
index c0d1a3835b..ea53f06c01 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85fdad850a4da33fd74f5394b921a63ea6b40bdb
\ No newline at end of file
+6611b76b0296875fb9903b25dfaa783a9c12eaa1
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 1c1f7bbcb9..7c7eae17fa 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3221,13 +3221,17 @@ static void explainOneScan(
     char *zMsg;                   /* Text to add to EQP output */
     sqlite3_int64 nRow;           /* Expected number of rows visited by scan */
     int iId = pParse->iSelectId;  /* Select id (left-most output column) */
+    int isSearch;                 /* True for a SEARCH. False for SCAN. */
 
     if( (flags&WHERE_MULTI_OR) || (wctrlFlags&WHERE_ONETABLE_ONLY) ) return;
 
+    isSearch = (pLevel->plan.nEq>0 || flags&(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT));
+
+    zMsg = sqlite3MPrintf(db, "%s", isSearch?"SEARCH":"SCAN");
     if( pItem->pSelect ){
-      zMsg = sqlite3MPrintf(db, "SCAN SUBQUERY %d", pItem->iSelectId);
+      zMsg = sqlite3MAppendf(db, zMsg, "%s SUBQUERY %d", zMsg,pItem->iSelectId);
     }else{
-      zMsg = sqlite3MPrintf(db, "SCAN TABLE %s", pItem->zName);
+      zMsg = sqlite3MAppendf(db, zMsg, "%s TABLE %s", zMsg, pItem->zName);
     }
 
     if( pItem->zAlias ){
@@ -3235,7 +3239,7 @@ static void explainOneScan(
     }
     if( (flags & WHERE_INDEXED)!=0 ){
       char *zWhere = explainIndexRange(db, pLevel, pItem->pTab);
-      zMsg = sqlite3MAppendf(db, zMsg, "%s BY %s%sINDEX%s%s%s", zMsg, 
+      zMsg = sqlite3MAppendf(db, zMsg, "%s USING %s%sINDEX%s%s%s", zMsg, 
           ((flags & WHERE_TEMP_INDEX)?"AUTOMATIC ":""),
           ((flags & WHERE_IDX_ONLY)?"COVERING ":""),
           ((flags & WHERE_TEMP_INDEX)?"":" "),
@@ -3244,7 +3248,7 @@ static void explainOneScan(
       );
       sqlite3DbFree(db, zWhere);
     }else if( flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
-      zMsg = sqlite3MAppendf(db, zMsg, "%s BY INTEGER PRIMARY KEY", zMsg);
+      zMsg = sqlite3MAppendf(db, zMsg, "%s USING INTEGER PRIMARY KEY", zMsg);
 
       if( flags&WHERE_ROWID_EQ ){
         zMsg = sqlite3MAppendf(db, zMsg, "%s (rowid=?)", zMsg);
diff --git a/test/autoindex1.test b/test/autoindex1.test
index 30da4d0b6b..6552fe8b3b 100644
--- a/test/autoindex1.test
+++ b/test/autoindex1.test
@@ -147,7 +147,7 @@ do_execsql_test autoindex1-500 {
   SELECT b FROM t501
    WHERE t501.a IN (SELECT x FROM t502 WHERE y=?);
 } {
-  0 0 0 {SCAN TABLE t501 BY INTEGER PRIMARY KEY (rowid=?) (~25 rows)} 
+  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?) (~25 rows)} 
   0 0 0 {EXECUTE LIST SUBQUERY 1} 
   1 0 0 {SCAN TABLE t502 (~100000 rows)}
 }
@@ -158,7 +158,7 @@ do_execsql_test autoindex1-501 {
 } {
   0 0 0 {SCAN TABLE t501 (~500000 rows)} 
   0 0 0 {EXECUTE CORRELATED LIST SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t502 BY AUTOMATIC COVERING INDEX (y=?) (~7 rows)}
+  1 0 0 {SEARCH TABLE t502 USING AUTOMATIC COVERING INDEX (y=?) (~7 rows)}
 }
 do_execsql_test autoindex1-502 {
   EXPLAIN QUERY PLAN
@@ -166,7 +166,7 @@ do_execsql_test autoindex1-502 {
    WHERE t501.a=123
      AND t501.a IN (SELECT x FROM t502 WHERE y=t501.b);
 } {
-  0 0 0 {SCAN TABLE t501 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
   0 0 0 {EXECUTE CORRELATED LIST SUBQUERY 1} 
   1 0 0 {SCAN TABLE t502 (~100000 rows)}
 }
@@ -241,11 +241,11 @@ do_execsql_test autoindex1-600 {
    ORDER BY x.registering_flock;
 } {
   1 0 0 {SCAN TABLE sheep AS s (~1000000 rows)} 
-  1 1 1 {SCAN TABLE flock_owner AS prev BY INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date<?) (~2 rows)} 
+  1 1 1 {SEARCH TABLE flock_owner AS prev USING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date<?) (~2 rows)} 
   1 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 2} 
-  2 0 0 {SCAN TABLE flock_owner AS later BY COVERING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date>? AND owner_change_date<?) (~1 rows)} 
-  0 0 0 {SCAN TABLE sheep AS x BY INDEX sheep_reg_flock_index (~1000000 rows)} 
-  0 1 1 {SCAN SUBQUERY 1 AS y BY AUTOMATIC COVERING INDEX (sheep_no=?) (~7 rows)}
+  2 0 0 {SEARCH TABLE flock_owner AS later USING COVERING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date>? AND owner_change_date<?) (~1 rows)} 
+  0 0 0 {SCAN TABLE sheep AS x USING INDEX sheep_reg_flock_index (~1000000 rows)} 
+  0 1 1 {SEARCH SUBQUERY 1 AS y USING AUTOMATIC COVERING INDEX (sheep_no=?) (~7 rows)}
 }
 
 finish_test
diff --git a/test/e_createtable.test b/test/e_createtable.test
index 0a310f812d..6696484349 100644
--- a/test/e_createtable.test
+++ b/test/e_createtable.test
@@ -1373,13 +1373,13 @@ do_execsql_test 4.10.0 {
 }
 do_createtable_tests 4.10 {
   1    "EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b = 5" 
-       {0 0 0 {SCAN TABLE t1 BY INDEX sqlite_autoindex_t1_1 (b=?) (~1 rows)}}
+       {0 0 0 {SEARCH TABLE t1 USING INDEX sqlite_autoindex_t1_1 (b=?) (~1 rows)}}
 
   2    "EXPLAIN QUERY PLAN SELECT * FROM t2 ORDER BY b, c"
-       {0 0 0 {SCAN TABLE t2 BY INDEX sqlite_autoindex_t2_1 (~1000000 rows)}}
+       {0 0 0 {SCAN TABLE t2 USING INDEX sqlite_autoindex_t2_1 (~1000000 rows)}}
 
   3    "EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE b=10 AND c>10"
-       {0 0 0 {SCAN TABLE t2 BY INDEX sqlite_autoindex_t2_1 (b=? AND c>?) (~3 rows)}}
+       {0 0 0 {SEARCH TABLE t2 USING INDEX sqlite_autoindex_t2_1 (b=? AND c>?) (~3 rows)}}
 }
 
 # EVIDENCE-OF: R-45493-35653 A CHECK constraint may be attached to a
diff --git a/test/e_fkey.test b/test/e_fkey.test
index 76dc0f5b8a..ae789d5072 100644
--- a/test/e_fkey.test
+++ b/test/e_fkey.test
@@ -1099,14 +1099,14 @@ do_execsql_test e_fkey-27.3 {
   EXPLAIN QUERY PLAN UPDATE artist SET artistid = ?, artistname = ?
 } {
   0 0 0 {SCAN TABLE artist (~1000000 rows)} 
-  0 0 0 {SCAN TABLE track BY COVERING INDEX trackindex (trackartist=?) (~10 rows)} 
-  0 0 0 {SCAN TABLE track BY COVERING INDEX trackindex (trackartist=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)} 
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)}
 }
 do_execsql_test e_fkey-27.4 {
   EXPLAIN QUERY PLAN DELETE FROM artist
 } {
   0 0 0 {SCAN TABLE artist (~1000000 rows)} 
-  0 0 0 {SCAN TABLE track BY COVERING INDEX trackindex (trackartist=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)}
 }
 
 
diff --git a/test/eqp.test b/test/eqp.test
index 2dcf9d13f9..d35b36d177 100644
--- a/test/eqp.test
+++ b/test/eqp.test
@@ -39,21 +39,21 @@ do_execsql_test 1.1 {
 do_eqp_test 1.2 {
   SELECT * FROM t2, t1 WHERE t1.a=1 OR t1.b=2;
 } {
-  0 0 1 {SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)} 
-  0 0 1 {SCAN TABLE t1 BY INDEX i2 (b=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)} 
   0 1 0 {SCAN TABLE t2 (~1000000 rows)}
 }
 do_eqp_test 1.3 {
   SELECT * FROM t2 CROSS JOIN t1 WHERE t1.a=1 OR t1.b=2;
 } {
   0 0 0 {SCAN TABLE t2 (~1000000 rows)}
-  0 1 1 {SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)} 
-  0 1 1 {SCAN TABLE t1 BY INDEX i2 (b=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)} 
 }
 do_eqp_test 1.3 {
   SELECT a FROM t1 ORDER BY a
 } {
-  0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)}
 }
 do_eqp_test 1.4 {
   SELECT a FROM t1 ORDER BY +a
@@ -64,7 +64,7 @@ do_eqp_test 1.4 {
 do_eqp_test 1.5 {
   SELECT a FROM t1 WHERE a=4
 } {
-  0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}
 }
 do_eqp_test 1.6 {
   SELECT DISTINCT count(*) FROM t3 GROUP BY a;
@@ -92,7 +92,7 @@ det 2.2.1 "SELECT DISTINCT min(x), max(x) FROM t1 GROUP BY x ORDER BY 1" {
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 2.2.2 "SELECT DISTINCT min(x), max(x) FROM t2 GROUP BY x ORDER BY 1" {
-  0 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
   0 0 0 {USE TEMP B-TREE FOR DISTINCT}
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
@@ -112,22 +112,22 @@ det 2.2.5 "SELECT DISTINCT * FROM t1, t2 ORDER BY t1.x" {
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 2.2.6 "SELECT DISTINCT t2.x FROM t1, t2 ORDER BY t2.x" {
-  0 0 1 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1000000 rows)}
+  0 0 1 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
   0 1 0 {SCAN TABLE t1 (~1000000 rows)}
 }
 
 det 2.3.1 "SELECT max(x) FROM t2" {
-  0 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1 rows)}
 }
 det 2.3.2 "SELECT min(x) FROM t2" {
-  0 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1 rows)}
 }
 det 2.3.3 "SELECT min(x), max(x) FROM t2" {
   0 0 0 {SCAN TABLE t2 (~1000000 rows)}
 }
 
 det 2.4.1 "SELECT * FROM t1 WHERE rowid=?" {
-  0 0 0 {SCAN TABLE t1 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
 }
 
 
@@ -162,7 +162,7 @@ do_eqp_test 3.1.4 {
 } {
   0 0 0 {SCAN TABLE t1 (~1000000 rows)}
   0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
 }
 
 det 3.2.1 {
@@ -181,7 +181,7 @@ det 3.2.2 {
 } {
   1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
   1 0 0 {USE TEMP B-TREE FOR ORDER BY} 
-  2 0 0 {SCAN TABLE t2 BY INDEX t2i1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2 USING INDEX t2i1 (~1000000 rows)} 
   0 0 0 {SCAN SUBQUERY 1 AS x1 (~1000000 rows)} 
   0 1 1 {SCAN SUBQUERY 2 AS x2 (~1000000 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
@@ -261,7 +261,7 @@ do_eqp_test 4.2.2 {
 } {
   1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
   1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 BY INDEX t2i1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2 USING INDEX t2i1 (~1000000 rows)} 
   0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} 
 }
 do_eqp_test 4.2.3 {
@@ -314,7 +314,7 @@ do_eqp_test 4.3.3 {
 } {
   2 0 0 {SCAN TABLE t1 (~1000000 rows)} 
   2 0 0 {USE TEMP B-TREE FOR ORDER BY} 
-  3 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1000000 rows)} 
+  3 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)} 
   1 0 0 {COMPOUND SUBQUERIES 2 AND 3 (UNION)} 
   4 0 0 {SCAN TABLE t1 (~1000000 rows)} 
   4 0 0 {USE TEMP B-TREE FOR ORDER BY} 
@@ -329,55 +329,54 @@ drop_all_tables
 
 # EVIDENCE-OF: R-64208-08323 sqlite> EXPLAIN QUERY PLAN SELECT a, b
 # FROM t1 WHERE a=1; 0|0|0|SCAN TABLE t1 (~100000 rows)
-#
 do_execsql_test 5.1.0 { CREATE TABLE t1(a, b) }
 det 5.1.1 "SELECT a, b FROM t1 WHERE a=1" {
   0 0 0 {SCAN TABLE t1 (~100000 rows)}
 }
 
-# EVIDENCE-OF: R-03114-52867 sqlite> CREATE INDEX i1 ON t1(a);
+# EVIDENCE-OF: R-09022-44606 sqlite> CREATE INDEX i1 ON t1(a);
 # sqlite> EXPLAIN QUERY PLAN SELECT a, b FROM t1 WHERE a=1;
-# 0|0|0|SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)
 do_execsql_test 5.2.0 { CREATE INDEX i1 ON t1(a) }
 det 5.2.1 "SELECT a, b FROM t1 WHERE a=1" {
-  0 0 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}
 }
 
-# EVIDENCE-OF: R-20407-61322 sqlite> CREATE INDEX i2 ON t1(a, b);
+# EVIDENCE-OF: R-62228-34103 sqlite> CREATE INDEX i2 ON t1(a, b);
 # sqlite> EXPLAIN QUERY PLAN SELECT a, b FROM t1 WHERE a=1;
-# 0|0|0|SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
 do_execsql_test 5.3.0 { CREATE INDEX i2 ON t1(a, b) }
 det 5.3.1 "SELECT a, b FROM t1 WHERE a=1" {
-  0 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
 }
 
-# EVIDENCE-OF: R-01893-00096 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
-# t2.* FROM t1, t2 WHERE t1.a=1 AND t1.b>2; 0|0|0|SCAN TABLE t1 BY
-# COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|1|SCAN TABLE t2
+# EVIDENCE-OF: R-22253-05302 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
+# t2.* FROM t1, t2 WHERE t1.a=1 AND t1.b>2; 0|0|0|SEARCH TABLE t1
+# USING COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|1|SCAN TABLE t2
 # (~1000000 rows)
 do_execsql_test 5.4.0 {CREATE TABLE t2(c, d)}
 det 5.4.1 "SELECT t1.*, t2.* FROM t1, t2 WHERE t1.a=1 AND t1.b>2" {
-  0 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (a=? AND b>?) (~3 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?) (~3 rows)}
   0 1 1 {SCAN TABLE t2 (~1000000 rows)}
 }
 
-# EVIDENCE-OF: R-26531-36629 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
-# t2.* FROM t2, t1 WHERE t1.a=1 AND t1.b>2; 0|0|1|SCAN TABLE t1 BY
-# COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|0|SCAN TABLE t2
+# EVIDENCE-OF: R-21040-07025 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
+# t2.* FROM t2, t1 WHERE t1.a=1 AND t1.b>2; 0|0|1|SEARCH TABLE t1
+# USING COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|0|SCAN TABLE t2
 # (~1000000 rows)
 det 5.5 "SELECT t1.*, t2.* FROM t2, t1 WHERE t1.a=1 AND t1.b>2" {
-  0 0 1 {SCAN TABLE t1 BY COVERING INDEX i2 (a=? AND b>?) (~3 rows)}
+  0 0 1 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?) (~3 rows)}
   0 1 0 {SCAN TABLE t2 (~1000000 rows)}
 }
 
-# EVIDENCE-OF: R-17671-37431 sqlite> CREATE INDEX i3 ON t1(b);
+# EVIDENCE-OF: R-39007-61103 sqlite> CREATE INDEX i3 ON t1(b);
 # sqlite> EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=1 OR b=2;
-# 0|0|0|SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows) 0|0|0|SCAN
-# TABLE t1 BY INDEX i3 (b=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)
 do_execsql_test 5.5.0 {CREATE INDEX i3 ON t1(b)}
 det 5.6.1 "SELECT * FROM t1 WHERE a=1 OR b=2" {
-  0 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows)}
-  0 0 0 {SCAN TABLE t1 BY INDEX i3 (b=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)}
 }
 
 # EVIDENCE-OF: R-33025-54904 sqlite> EXPLAIN QUERY PLAN SELECT c, d
@@ -388,47 +387,47 @@ det 5.7 "SELECT c, d FROM t2 ORDER BY c" {
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 
-# EVIDENCE-OF: R-08354-12138 sqlite> CREATE INDEX i4 ON t2(c);
+# EVIDENCE-OF: R-38854-22809 sqlite> CREATE INDEX i4 ON t2(c);
 # sqlite> EXPLAIN QUERY PLAN SELECT c, d FROM t2 ORDER BY c;
-# 0|0|0|SCAN TABLE t2 BY INDEX i4 (~1000000 rows)
+# 0|0|0|SCAN TABLE t2 USING INDEX i4 (~1000000 rows)
 do_execsql_test 5.8.0 {CREATE INDEX i4 ON t2(c)}
 det 5.8.1 "SELECT c, d FROM t2 ORDER BY c" {
-  0 0 0 {SCAN TABLE t2 BY INDEX i4 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING INDEX i4 (~1000000 rows)}
 }
 
-# EVIDENCE-OF: R-01895-58356 sqlite> EXPLAIN QUERY PLAN SELECT
+# EVIDENCE-OF: R-29884-43993 sqlite> EXPLAIN QUERY PLAN SELECT
 # (SELECT b FROM t1 WHERE a=0), (SELECT a FROM t1 WHERE b=t2.c) FROM t2;
 # 0|0|0|SCAN TABLE t2 (~1000000 rows) 0|0|0|EXECUTE SCALAR SUBQUERY 1
-# 1|0|0|SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows)
-# 0|0|0|EXECUTE CORRELATED SCALAR SUBQUERY 2 2|0|0|SCAN TABLE t1 BY
+# 1|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
+# 0|0|0|EXECUTE CORRELATED SCALAR SUBQUERY 2 2|0|0|SEARCH TABLE t1 USING
 # INDEX i3 (b=?) (~10 rows)
 det 5.9 {
   SELECT (SELECT b FROM t1 WHERE a=0), (SELECT a FROM t1 WHERE b=t2.c) FROM t2
 } {
   0 0 0 {SCAN TABLE t2 (~1000000 rows)}
   0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (a=?) (~10 rows)}
+  1 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
   0 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 2}
-  2 0 0 {SCAN TABLE t1 BY INDEX i3 (b=?) (~10 rows)}
+  2 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)}
 }
 
-# EVIDENCE-OF: R-43933-45972 sqlite> EXPLAIN QUERY PLAN SELECT
+# EVIDENCE-OF: R-17911-16445 sqlite> EXPLAIN QUERY PLAN SELECT
 # count(*) FROM (SELECT max(b) AS x FROM t1 GROUP BY a) GROUP BY x;
-# 1|0|0|SCAN TABLE t1 BY COVERING INDEX i2 (~1000000 rows) 0|0|0|SCAN
+# 1|0|0|SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows) 0|0|0|SCAN
 # SUBQUERY 1 (~1000000 rows) 0|0|0|USE TEMP B-TREE FOR GROUP BY
 det 5.10 {
   SELECT count(*) FROM (SELECT max(b) AS x FROM t1 GROUP BY a) GROUP BY x
 } {
-  1 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)}
   0 0 0 {SCAN SUBQUERY 1 (~1000000 rows)}
   0 0 0 {USE TEMP B-TREE FOR GROUP BY}
 }
 
-# EVIDENCE-OF: R-15989-23611 sqlite> EXPLAIN QUERY PLAN SELECT * FROM
-# (SELECT * FROM t2 WHERE c=1), t1; 0|0|0|SCAN TABLE t2 BY INDEX i4
+# EVIDENCE-OF: R-18544-33103 sqlite> EXPLAIN QUERY PLAN SELECT * FROM
+# (SELECT * FROM t2 WHERE c=1), t1; 0|0|0|SEARCH TABLE t2 USING INDEX i4
 # (c=?) (~10 rows) 0|1|1|SCAN TABLE t1 (~1000000 rows)
 det 5.11 "SELECT * FROM (SELECT * FROM t2 WHERE c=1), t1" {
-  0 0 0 {SCAN TABLE t2 BY INDEX i4 (c=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX i4 (c=?) (~10 rows)}
   0 1 1 {SCAN TABLE t1 (~1000000 rows)}
 }
 
@@ -442,12 +441,13 @@ det 5.12 "SELECT a FROM t1 UNION SELECT c FROM t2" {
   0 0 0 {COMPOUND SUBQUERIES 1 AND 2 USING TEMP B-TREE (UNION)}
 }
 
-# EVIDENCE-OF: R-34523-61710 sqlite> EXPLAIN QUERY PLAN SELECT a FROM
-# t1 EXCEPT SELECT d FROM t2 ORDER BY 1; 1|0|0|SCAN TABLE t1 BY COVERING
-# INDEX i2 (~1000000 rows) 2|0|0|SCAN TABLE t2 (~1000000 rows) 2|0|0|USE
-# TEMP B-TREE FOR ORDER BY 0|0|0|COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)
+# EVIDENCE-OF: R-61538-24748 sqlite> EXPLAIN QUERY PLAN SELECT a FROM
+# t1 EXCEPT SELECT d FROM t2 ORDER BY 1; 1|0|0|SCAN TABLE t1 USING
+# COVERING INDEX i2 (~1000000 rows) 2|0|0|SCAN TABLE t2 (~1000000 rows)
+# 2|0|0|USE TEMP B-TREE FOR ORDER BY 0|0|0|COMPOUND SUBQUERIES 1 AND 2
+# (EXCEPT)
 det 5.13 "SELECT a FROM t1 EXCEPT SELECT d FROM t2 ORDER BY 1" {
-  1 0 0 {SCAN TABLE t1 BY COVERING INDEX i2 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)}
   2 0 0 {SCAN TABLE t2 (~1000000 rows)}
   2 0 0 {USE TEMP B-TREE FOR ORDER BY}
   0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)}
diff --git a/test/indexedby.test b/test/indexedby.test
index 812e54bba8..b8b5be63b6 100644
--- a/test/indexedby.test
+++ b/test/indexedby.test
@@ -42,14 +42,14 @@ proc EQP {sql} {
 #
 do_execsql_test indexedby-1.2 {
   EXPLAIN QUERY PLAN select * from t1 WHERE a = 10; 
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}}
 do_execsql_test indexedby-1.3 {
   EXPLAIN QUERY PLAN select * from t1 ; 
 } {0 0 0 {SCAN TABLE t1 (~1000000 rows)}}
 do_execsql_test indexedby-1.4 {
   EXPLAIN QUERY PLAN select * from t1, t2 WHERE c = 10; 
 } {
-  0 0 1 {SCAN TABLE t2 BY INDEX i3 (c=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t2 USING INDEX i3 (c=?) (~10 rows)} 
   0 1 0 {SCAN TABLE t1 (~1000000 rows)}
 }
 
@@ -89,11 +89,11 @@ do_execsql_test indexedby-3.1 {
 do_execsql_test indexedby-3.2 {
   EXPLAIN QUERY PLAN 
   SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' AND b = 'two'
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
 do_execsql_test indexedby-3.3 {
   EXPLAIN QUERY PLAN 
   SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' AND b = 'two'
-} {0 0 0 {SCAN TABLE t1 BY INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
 do_test indexedby-3.4 {
   catchsql { SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' }
 } {1 {cannot use index: i2}}
@@ -110,11 +110,11 @@ do_test indexedby-3.7 {
 do_execsql_test indexedby-3.8 {
   EXPLAIN QUERY PLAN 
   SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 ORDER BY e 
-} {0 0 0 {SCAN TABLE t3 BY INDEX sqlite_autoindex_t3_1 (~1000000 rows)}}
+} {0 0 0 {SCAN TABLE t3 USING INDEX sqlite_autoindex_t3_1 (~1000000 rows)}}
 do_execsql_test indexedby-3.9 {
   EXPLAIN QUERY PLAN 
   SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE e = 10 
-} {0 0 0 {SCAN TABLE t3 BY INDEX sqlite_autoindex_t3_1 (e=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t3 USING INDEX sqlite_autoindex_t3_1 (e=?) (~1 rows)}}
 do_test indexedby-3.10 {
   catchsql { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE f = 10 }
 } {1 {cannot use index: sqlite_autoindex_t3_1}}
@@ -128,13 +128,13 @@ do_execsql_test indexedby-4.1 {
   EXPLAIN QUERY PLAN SELECT * FROM t1, t2 WHERE a = c 
 } {
   0 0 0 {SCAN TABLE t1 (~1000000 rows)} 
-  0 1 1 {SCAN TABLE t2 BY INDEX i3 (c=?) (~10 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INDEX i3 (c=?) (~10 rows)}
 }
 do_execsql_test indexedby-4.2 {
   EXPLAIN QUERY PLAN SELECT * FROM t1 INDEXED BY i1, t2 WHERE a = c 
 } {
   0 0 1 {SCAN TABLE t2 (~1000000 rows)} 
-  0 1 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~10 rows)}
+  0 1 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}
 }
 do_test indexedby-4.3 {
   catchsql {
@@ -154,10 +154,10 @@ do_test indexedby-4.4 {
 do_execsql_test indexedby-5.1 {
   CREATE VIEW v2 AS SELECT * FROM t1 INDEXED BY i1 WHERE a > 5;
   EXPLAIN QUERY PLAN SELECT * FROM v2 
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a>?) (~330000 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?) (~330000 rows)}}
 do_execsql_test indexedby-5.2 {
   EXPLAIN QUERY PLAN SELECT * FROM v2 WHERE b = 10 
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a>?) (~33000 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?) (~33000 rows)}}
 do_test indexedby-5.3 {
   execsql { DROP INDEX i1 }
   catchsql { SELECT * FROM v2 }
@@ -178,28 +178,28 @@ do_test indexedby-5.5 {
 # 
 do_execsql_test indexedby-6.1 {
   EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b = 10 ORDER BY rowid 
-} {0 0 0 {SCAN TABLE t1 BY INDEX i2 (b=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)}}
 do_execsql_test indexedby-6.2 {
   EXPLAIN QUERY PLAN SELECT * FROM t1 NOT INDEXED WHERE b = 10 ORDER BY rowid 
-} {0 0 0 {SCAN TABLE t1 BY INTEGER PRIMARY KEY (~100000 rows)}}
+} {0 0 0 {SCAN TABLE t1 USING INTEGER PRIMARY KEY (~100000 rows)}}
 
 # Test that "INDEXED BY" can be used in a DELETE statement.
 # 
 do_execsql_test indexedby-7.1 {
   EXPLAIN QUERY PLAN DELETE FROM t1 WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
 do_execsql_test indexedby-7.2 {
   EXPLAIN QUERY PLAN DELETE FROM t1 NOT INDEXED WHERE a = 5 
 } {0 0 0 {SCAN TABLE t1 (~100000 rows)}}
 do_execsql_test indexedby-7.3 {
   EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i1 WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
 do_execsql_test indexedby-7.4 {
   EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i1 WHERE a = 5 AND b = 10
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
 do_execsql_test indexedby-7.5 {
   EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i2 WHERE a = 5 AND b = 10
-} {0 0 0 {SCAN TABLE t1 BY INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
 do_test indexedby-7.6 {
   catchsql { DELETE FROM t1 INDEXED BY i2 WHERE a = 5}
 } {1 {cannot use index: i2}}
@@ -208,21 +208,21 @@ do_test indexedby-7.6 {
 # 
 do_execsql_test indexedby-8.1 {
   EXPLAIN QUERY PLAN UPDATE t1 SET rowid=rowid+1 WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
 do_execsql_test indexedby-8.2 {
   EXPLAIN QUERY PLAN UPDATE t1 NOT INDEXED SET rowid=rowid+1 WHERE a = 5 
 } {0 0 0 {SCAN TABLE t1 (~100000 rows)}}
 do_execsql_test indexedby-8.3 {
   EXPLAIN QUERY PLAN UPDATE t1 INDEXED BY i1 SET rowid=rowid+1 WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 BY COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
 do_execsql_test indexedby-8.4 {
   EXPLAIN QUERY PLAN 
   UPDATE t1 INDEXED BY i1 SET rowid=rowid+1 WHERE a = 5 AND b = 10
-} {0 0 0 {SCAN TABLE t1 BY INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
 do_execsql_test indexedby-8.5 {
   EXPLAIN QUERY PLAN 
   UPDATE t1 INDEXED BY i2 SET rowid=rowid+1 WHERE a = 5 AND b = 10
-} {0 0 0 {SCAN TABLE t1 BY INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
 do_test indexedby-8.6 {
   catchsql { UPDATE t1 INDEXED BY i2 SET rowid=rowid+1 WHERE a = 5}
 } {1 {cannot use index: i2}}
diff --git a/test/tkt-78e04e52ea.test b/test/tkt-78e04e52ea.test
index 7e95b1f813..9524d845e2 100644
--- a/test/tkt-78e04e52ea.test
+++ b/test/tkt-78e04e52ea.test
@@ -57,7 +57,7 @@ do_test tkt-78e04-2.1 {
     CREATE INDEX "" ON t2(x);
     EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE x=5;
   }
-} {0 0 0 {SCAN TABLE t2 BY COVERING INDEX  (x=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t2 USING COVERING INDEX  (x=?) (~10 rows)}}
 do_test tkt-78e04-2.2 {
   execsql {
     DROP INDEX "";
diff --git a/test/tkt3442.test b/test/tkt3442.test
index 57704682e5..ae03949d54 100644
--- a/test/tkt3442.test
+++ b/test/tkt3442.test
@@ -49,10 +49,10 @@ proc EQP {sql} {
 ifcapable explain {
   do_test tkt3442-1.2 {
     EQP { SELECT node FROM listhash WHERE id='5000' LIMIT 1; }
-  } {0 0 0 {SCAN TABLE listhash BY INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
   do_test tkt3442-1.3 {
     EQP { SELECT node FROM listhash WHERE id="5000" LIMIT 1; }
-  } {0 0 0 {SCAN TABLE listhash BY INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
 }
 
 
@@ -61,7 +61,7 @@ ifcapable explain {
 ifcapable explain {
   do_test tkt3442-1.4 {
     EQP { SELECT node FROM listhash WHERE id=5000 LIMIT 1; }
-  } {0 0 0 {SCAN TABLE listhash BY INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
 }
 do_test tkt3442-1.5 {
   catchsql {
diff --git a/test/where3.test b/test/where3.test
index 0031a73a9c..c032f1f0ea 100644
--- a/test/where3.test
+++ b/test/where3.test
@@ -226,14 +226,14 @@ do_execsql_test where3-3.0 {
   explain query plan SELECT * FROM t302, t301 WHERE t302.x=5 AND t301.a=t302.y;
 } {
   0 0 0 {SCAN TABLE t302 (~0 rows)} 
-  0 1 1 {SCAN TABLE t301 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
 }
 do_execsql_test where3-3.1 {
   explain query plan
   SELECT * FROM t301, t302 WHERE t302.x=5 AND t301.a=t302.y;
 } {
   0 0 1 {SCAN TABLE t302 (~0 rows)} 
-  0 1 0 {SCAN TABLE t301 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 0 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
 }
 
 # Verify that when there are multiple tables in a join which must be
@@ -297,8 +297,8 @@ do_execsql_test where3-5.0 {
       AND bbb.parent = 4
     ORDER BY bbb.title COLLATE NOCASE ASC;
 } {
-  0 0 0 {SCAN TABLE aaa BY INDEX aaa_333 (fk=?) (~10 rows)} 
-  0 1 1 {SCAN TABLE bbb BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 0 {SEARCH TABLE aaa USING INDEX aaa_333 (fk=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE bbb USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 do_execsql_test where3-5.1 {
@@ -310,8 +310,8 @@ do_execsql_test where3-5.1 {
       AND bbb.parent = 4
     ORDER BY bbb.title COLLATE NOCASE ASC;
 } {
-  0 0 0 {SCAN TABLE aaa BY INDEX aaa_333 (fk=?) (~10 rows)} 
-  0 1 1 {SCAN TABLE aaa AS bbb BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 0 {SEARCH TABLE aaa USING INDEX aaa_333 (fk=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE aaa AS bbb USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 do_execsql_test where3-5.2 {
@@ -323,8 +323,8 @@ do_execsql_test where3-5.2 {
       AND bbb.parent = 4
     ORDER BY bbb.title COLLATE NOCASE ASC;
 } {
-  0 0 1 {SCAN TABLE aaa BY INDEX aaa_333 (fk=?) (~10 rows)} 
-  0 1 0 {SCAN TABLE bbb BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 1 {SEARCH TABLE aaa USING INDEX aaa_333 (fk=?) (~10 rows)} 
+  0 1 0 {SEARCH TABLE bbb USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 do_execsql_test where3-5.3 {
@@ -336,8 +336,8 @@ do_execsql_test where3-5.3 {
       AND bbb.parent = 4
     ORDER BY bbb.title COLLATE NOCASE ASC;
 } {
-  0 0 1 {SCAN TABLE aaa BY INDEX aaa_333 (fk=?) (~10 rows)} 
-  0 1 0 {SCAN TABLE aaa AS bbb BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 1 {SEARCH TABLE aaa USING INDEX aaa_333 (fk=?) (~10 rows)} 
+  0 1 0 {SEARCH TABLE aaa AS bbb USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 
diff --git a/test/where7.test b/test/where7.test
index e12c6f27b5..e34778c763 100644
--- a/test/where7.test
+++ b/test/where7.test
@@ -23341,9 +23341,9 @@ do_execsql_test where7-3.1 {
            OR t301.c8 = 1407424651264000)
    ORDER BY t302.c5 LIMIT 200;
 } {
-  0 0 1 {SCAN TABLE t301 BY COVERING INDEX t301_c4 (c4=?) (~10 rows)} 
-  0 0 1 {SCAN TABLE t301 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
-  0 1 0 {SCAN TABLE t302 BY INDEX t302_c8_c3 (c8=? AND c3>?) (~2 rows)} 
+  0 0 1 {SEARCH TABLE t301 USING COVERING INDEX t301_c4 (c4=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 1 0 {SEARCH TABLE t302 USING INDEX t302_c8_c3 (c8=? AND c3>?) (~2 rows)} 
   0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 
diff --git a/test/where9.test b/test/where9.test
index 8861222c51..1ffc8ef9ea 100644
--- a/test/where9.test
+++ b/test/where9.test
@@ -363,9 +363,9 @@ ifcapable explain {
     SELECT t2.a FROM t1, t2
     WHERE t1.a=80 AND ((t1.c=t2.c AND t1.d=t2.d) OR t1.f=t2.f)
   } {
-    0 0 0 {SCAN TABLE t1 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
-    0 1 1 {SCAN TABLE t2 BY INDEX t2d (d=?) (~2 rows)} 
-    0 1 1 {SCAN TABLE t2 BY COVERING INDEX t2f (f=?) (~10 rows)}
+    0 0 0 {SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+    0 1 1 {SEARCH TABLE t2 USING INDEX t2d (d=?) (~2 rows)} 
+    0 1 1 {SEARCH TABLE t2 USING COVERING INDEX t2f (f=?) (~10 rows)}
   }
   do_execsql_test where9-3.2 {
     EXPLAIN QUERY PLAN
@@ -373,9 +373,9 @@ ifcapable explain {
     FROM t1 LEFT JOIN t2 ON (t1.c+1=t2.c AND t1.d=t2.d) OR (t1.f||'x')=t2.f
     WHERE t1.a=80
   } {
-    0 0 0 {SCAN TABLE t1 BY INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
-    0 1 1 {SCAN TABLE t2 BY INDEX t2d (d=?) (~2 rows)} 
-    0 1 1 {SCAN TABLE t2 BY COVERING INDEX t2f (f=?) (~10 rows)}
+    0 0 0 {SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+    0 1 1 {SEARCH TABLE t2 USING INDEX t2d (d=?) (~2 rows)} 
+    0 1 1 {SEARCH TABLE t2 USING COVERING INDEX t2f (f=?) (~10 rows)}
   }
 } 
 
@@ -454,8 +454,8 @@ ifcapable explain {
   do_execsql_test where9-5.1 {
     EXPLAIN QUERY PLAN SELECT a FROM t1 WHERE b>1000 AND (c=31031 OR d IS NULL)
   } {
-    0 0 0 {SCAN TABLE t1 BY INDEX t1c (c=?) (~10 rows)} 
-    0 0 0 {SCAN TABLE t1 BY INDEX t1d (d=?) (~10 rows)}
+    0 0 0 {SEARCH TABLE t1 USING INDEX t1c (c=?) (~10 rows)} 
+    0 0 0 {SEARCH TABLE t1 USING INDEX t1d (d=?) (~10 rows)}
   }
 
   # In contrast, b=1000 is preferred over any OR-clause.
@@ -463,7 +463,7 @@ ifcapable explain {
   do_execsql_test where9-5.2 {
     EXPLAIN QUERY PLAN SELECT a FROM t1 WHERE b=1000 AND (c=31031 OR d IS NULL)
   } {
-    0 0 0 {SCAN TABLE t1 BY INDEX t1b (b=?) (~5 rows)}
+    0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~5 rows)}
   }
 
   # Likewise, inequalities in an AND are preferred over inequalities in
@@ -472,7 +472,7 @@ ifcapable explain {
   do_execsql_test where9-5.3 {
     EXPLAIN QUERY PLAN SELECT a FROM t1 WHERE b>1000 AND (c>=31031 OR d IS NULL)
   } {
-    0 0 0 {SCAN TABLE t1 BY INDEX t1b (b>?) (~165000 rows)}
+    0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b>?) (~165000 rows)}
   }
 }