1 files changed, 47 insertions, 4 deletions

diff --git a/src/test8.c b/src/test8.c
index 2107710a9..3e506e36b 100644
--- a/src/test8.c
+++ b/src/test8.c
@@ -746,6 +746,34 @@ static void string_concat(char **pzStr, char *zAppend, int doFree, int *pRc){
 }
 
 /*
+** This function returns a pointer to an sqlite3_malloc()ed buffer 
+** containing the select-list (the thing between keywords SELECT and FROM)
+** to query the underlying real table with for the scan described by
+** argument pIdxInfo.
+**
+** If the current SQLite version is earlier than 3.10.0, this is just "*"
+** (select all columns). Or, for version 3.10.0 and greater, the list of
+** columns identified by the pIdxInfo->colUsed mask.
+*/
+static char *echoSelectList(echo_vtab *pTab, sqlite3_index_info *pIdxInfo){
+  char *zRet = 0;
+  if( sqlite3_libversion_number()<3010000 ){
+    zRet = sqlite3_mprintf(", *");
+  }else{
+    int i;
+    for(i=0; i<pTab->nCol; i++){
+      if( pIdxInfo->colUsed & ((sqlite3_uint64)1 << (i>=63 ? 63 : i)) ){
+        zRet = sqlite3_mprintf("%z, %s", zRet, pTab->aCol[i]);
+      }else{
+        zRet = sqlite3_mprintf("%z, NULL", zRet);
+      }
+      if( !zRet ) break;
+    }
+  }
+  return zRet;
+}
+
+/*
 ** The echo module implements the subset of query constraints and sort
 ** orders that may take advantage of SQLite indices on the underlying
 ** real table. For example, if the real table is declared as:
@@ -770,6 +798,7 @@ static void string_concat(char **pzStr, char *zAppend, int doFree, int *pRc){
 static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   int ii;
   char *zQuery = 0;
+  char *zCol = 0;
   char *zNew;
   int nArg = 0;
   const char *zSep = "WHERE";
@@ -817,10 +846,11 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
     }
   }
 
-  zQuery = sqlite3_mprintf("SELECT rowid, * FROM %Q", pVtab->zTableName);
-  if( !zQuery ){
-    return SQLITE_NOMEM;
-  }
+  zCol = echoSelectList(pVtab, pIdxInfo);
+  if( !zCol ) return SQLITE_NOMEM;
+  zQuery = sqlite3_mprintf("SELECT rowid%z FROM %Q", zCol, pVtab->zTableName);
+  if( !zQuery ) return SQLITE_NOMEM;
+
   for(ii=0; ii<pIdxInfo->nConstraint; ii++){
     const struct sqlite3_index_constraint *pConstraint;
     struct sqlite3_index_constraint_usage *pUsage;
@@ -848,7 +878,20 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
         case SQLITE_INDEX_CONSTRAINT_GE:
           zOp = ">="; break;
         case SQLITE_INDEX_CONSTRAINT_MATCH:
+          /* Purposely translate the MATCH operator into a LIKE, which
+          ** will be used by the next block of code to construct a new
+          ** query.  It should also be noted here that the next block
+          ** of code requires the first letter of this operator to be
+          ** in upper-case to trigger the special MATCH handling (i.e.
+          ** wrapping the bound parameter with literal '%'s).
+          */
           zOp = "LIKE"; break;
+        case SQLITE_INDEX_CONSTRAINT_LIKE:
+          zOp = "like"; break;
+        case SQLITE_INDEX_CONSTRAINT_GLOB:
+          zOp = "glob"; break;
+        case SQLITE_INDEX_CONSTRAINT_REGEXP:
+          zOp = "regexp"; break;
       }
       if( zOp[0]=='L' ){
         zNew = sqlite3_mprintf(" %s %s LIKE (SELECT '%%'||?||'%%')",