Index: test/vtab1.test
==================================================================
--- test/vtab1.test
+++ test/vtab1.test
@@ -872,10 +872,18 @@
 do_test vtab1.7-13 {
   execsql {
     SELECT rowid, a, b, c FROM real_abc
   }
 } {}
+
+# PRAGMA index_info and index_xinfo are no-ops on a virtual table
+do_test vtab1.7-14 {
+  execsql {
+    PRAGMA index_info('echo_abc');
+    PRAGMA index_xinfo('echo_abc');
+  }
+} {}
 
 ifcapable attach {
   do_test vtab1.8-1 {
     set echo_module ""
     execsql {

Index: test/without_rowid1.test
==================================================================
--- test/without_rowid1.test
+++ test/without_rowid1.test
@@ -28,10 +28,14 @@
   INSERT INTO t1 VALUES('arctic','sleep','ammonia','helena');
   SELECT *, '|' FROM t1 ORDER BY c, a;
 } {arctic sleep ammonia helena | journal sherman ammonia helena | dynamic juliet flipper command | journal sherman gamma patriot |}
 
 integrity_check without_rowid1-1.0ic
+
+do_execsql_test without_rowid1-1.0ixi {
+  SELECT name, key FROM pragma_index_xinfo('t1');
+} {c 1 a 1 b 0 d 0}
 
 do_execsql_test without_rowid1-1.1 {
   SELECT *, '|' FROM t1 ORDER BY +c, a;
 } {arctic sleep ammonia helena | journal sherman ammonia helena | dynamic juliet flipper command | journal sherman gamma patriot |}
 
@@ -118,10 +122,13 @@
 } {abc def}
 do_execsql_test 2.1.2 {
   UPDATE t4 SET a = 'ABC';
   SELECT * FROM t4;
 } {ABC def}
+do_execsql_test 2.1.3 {
+  SELECT name, coll, key FROM pragma_index_xinfo('t4');
+} {a nocase 1 b BINARY 0}
 
 do_execsql_test 2.2.1 {
   DROP TABLE t4;
   CREATE TABLE t4 (b, a COLLATE nocase PRIMARY KEY) WITHOUT ROWID;
   INSERT INTO t4(a, b) VALUES('abc', 'def');
@@ -130,16 +137,26 @@
 
 do_execsql_test 2.2.2 {
   UPDATE t4 SET a = 'ABC', b = 'xyz';
   SELECT * FROM t4;
 } {xyz ABC}
+
+do_execsql_test 2.2.3 {
+  SELECT name, coll, key FROM pragma_index_xinfo('t4');
+} {a nocase 1 b BINARY 0}
+
 
 do_execsql_test 2.3.1 {
   CREATE TABLE t5 (a, b, PRIMARY KEY(b, a)) WITHOUT ROWID;
   INSERT INTO t5(a, b) VALUES('abc', 'def');
   UPDATE t5 SET a='abc', b='def';
 } {}
+
+do_execsql_test 2.3.2 {
+  SELECT name, coll, key FROM pragma_index_xinfo('t5');
+} {b BINARY 1 a BINARY 1}
+
 
 do_execsql_test 2.4.1 {
   CREATE TABLE t6 (
     a COLLATE nocase, b, c UNIQUE, PRIMARY KEY(b, a)
   ) WITHOUT ROWID;
@@ -150,10 +167,15 @@
 
 do_execsql_test 2.4.2 {
   SELECT * FROM t6 ORDER BY b, a;
   SELECT * FROM t6 ORDER BY c;
 } {ABC def ghi ABC def ghi}
+
+do_execsql_test 2.4.3 {
+  SELECT name, coll, key FROM pragma_index_xinfo('t6');
+} {b BINARY 1 a nocase 1 c BINARY 0}
+
 
 #-------------------------------------------------------------------------
 # Unless the destination table is completely empty, the xfer optimization 
 # is disabled for WITHOUT ROWID tables. The following tests check for
 # some problems that might occur if this were not the case.

Index: test/without_rowid6.test
==================================================================
--- test/without_rowid6.test
+++ test/without_rowid6.test
@@ -22,10 +22,13 @@
   WITH RECURSIVE
     c(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM c WHERE i<1000)
   INSERT INTO t1(a,b,c,d,e) SELECT i, i+1000, printf('x%dy',i), 0, 0 FROM c;
   ANALYZE;
 } {}
+do_execsql_test without_rowid6-101 {
+  SELECT name, key FROM pragma_index_xinfo('t1');
+} {a 1 b 1 c 1 d 1 e 0}
 do_execsql_test without_rowid6-110 {
   SELECT c FROM t1 WHERE a=123;
 } {x123y}
 do_execsql_test without_rowid6-120 {
   SELECT c FROM t1 WHERE b=1123;
@@ -49,10 +52,13 @@
     PRIMARY KEY(b)
   ) WITHOUT ROWID;
   INSERT INTO t1(a,b,c) VALUES(1,8,3),(4,5,6),(7,2,9);
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {4 1}
+do_execsql_test without_rowid6-201 {
+  SELECT name, key FROM pragma_index_xinfo('t1');
+} {b 1 a 0 c 0}
 do_execsql_test without_rowid6-210 {
   EXPLAIN QUERY PLAN
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {/SEARCH TABLE t1 USING PRIMARY KEY .b>../}
 do_execsql_test without_rowid6-220 {
@@ -103,10 +109,13 @@
     PRIMARY KEY(b,c)
   ) WITHOUT ROWID;
   INSERT INTO t1(a,b,c) VALUES(1,8,3),(4,5,6),(7,2,9);
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {4 1}
+do_execsql_test without_rowid6-501 {
+  SELECT name, key FROM pragma_index_xinfo('t1');
+} {b 1 c 1 a 0}
 do_execsql_test without_rowid6-510 {
   EXPLAIN QUERY PLAN
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {/SEARCH TABLE t1 USING PRIMARY KEY .b>../}
 do_execsql_test without_rowid6-520 {