Add tests to restore coverage of fts5_main.c.

FossilOrigin-Name: 681edd08ab7024ddcd6447a64d8aad581b47b039481b697d91d26e6c6660f373

ext/fts5/fts5_tcl.c

@@ -890,15 +890,17 @@ static int f5tTokenizerCreate(
 
 static void f5tTokenizerDelete(Fts5Tokenizer *p){
   F5tTokenizerInstance *pInst = (F5tTokenizerInstance*)p;
-  if( pInst->pParent ){
-    if( pInst->pModule->parent_v2.xDelete ){
-      pInst->pModule->parent_v2.xDelete(pInst->pParent);
-    }else{
-      pInst->pModule->parent.xDelete(pInst->pParent);
+  if( pInst ){
+    if( pInst->pParent ){
+      if( pInst->pModule->parent_v2.xDelete ){
+        pInst->pModule->parent_v2.xDelete(pInst->pParent);
+      }else{
+        pInst->pModule->parent.xDelete(pInst->pParent);
+      }
     }
+    Tcl_DecrRefCount(pInst->pScript);
+    ckfree((char *)pInst);
   }
-  Tcl_DecrRefCount(pInst->pScript);
-  ckfree((char *)pInst);
 }
 
 
@@ -1146,6 +1148,7 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
   F5tTokenizerModule *pMod;
   int rc = SQLITE_OK;
   int bV2 = 0;                    /* True to use _v2 API */
+  int iVersion = 2;               /* Value for _v2.iVersion */
   const char *zParent = 0;        /* Name of parent tokenizer, if any */
   int ii = 0;
 
@@ -1157,7 +1160,7 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
   /* Parse any options. Set stack variables bV2 and zParent. */
   for(ii=1; ii<objc-3; ii++){
     int iOpt = 0;
-    const char *azOpt[] = { "-v2", "-parent", 0 };
+    const char *azOpt[] = { "-v2", "-parent", "-version", 0 };
     if( Tcl_GetIndexFromObj(interp, objv[ii], azOpt, "OPTION", 0, &iOpt) ){
       return TCL_ERROR;
     }
@@ -1177,6 +1180,19 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
         zParent = Tcl_GetString(objv[ii]);
         break;
       }
+      case 2: /* -version */ {
+        ii++;
+        if( ii==objc-3 ){
+          Tcl_AppendResult(
+              interp, "option requires an argument: -version", (char*)0
+          );
+          return TCL_ERROR;
+        }
+        if( Tcl_GetIntFromObj(interp, objv[ii], &iVersion) ){
+          return TCL_ERROR;
+        }
+        break;
+      }
       default:
         assert( 0 );
         break;
@@ -1201,9 +1217,13 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
       rc = pApi->xFindTokenizer_v2(pApi, zParent, &pMod->pParentCtx, &pParent);
       if( rc==SQLITE_OK ){
         memcpy(&pMod->parent_v2, pParent, sizeof(fts5_tokenizer_v2));
+        pMod->parent_v2.xDelete(0);
       }
     }else{
       rc = pApi->xFindTokenizer(pApi, zParent, &pMod->pParentCtx,&pMod->parent);
+      if( rc==SQLITE_OK ){
+        pMod->parent.xDelete(0);
+      }
     }
   }
 
@@ -1218,7 +1238,7 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
     }else{
       fts5_tokenizer_v2 t2;
       memset(&t2, 0, sizeof(t2));
-      t2.iVersion = 2;
+      t2.iVersion = iVersion;
       t2.xCreate = f5tTokenizerCreate;
       t2.xTokenize = f5tTokenizerTokenize_v2;
       t2.xDelete = f5tTokenizerDelete;

ext/fts5/test/fts5faultI.test

@@ -20,7 +20,9 @@ ifcapable !fts5 {
   return
 }
 
-set ::testprefix fts5faultH
+set ::testprefix fts5faultI
+
+if 0 {
 
 do_execsql_test 1.0 {
   PRAGMA encoding = utf16;
@@ -146,5 +148,59 @@ do_faultsim_test 6 -faults oom* -prep {
   faultsim_test_result {0 {}}
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 7.0 {
+  CREATE VIRTUAL TABLE w1 USING fts5(a);
+  INSERT INTO w1 VALUES('one two three');
+  INSERT INTO w1 VALUES('three two one');
+  DELETE FROM w1_content WHERE rowid=1;
+}
+
+faultsim_save_and_close
+
+do_faultsim_test 7 -faults oom* -prep {
+  faultsim_restore_and_reopen
+  db eval { SELECT * FROM w1 }
+} -body {
+  execsql {
+    PRAGMA integrity_check;
+  }
+} -test {
+}
+}
+#-------------------------------------------------------------------------
+reset_db
+fts5_tclnum_register db
+fts5_aux_test_functions db
+
+do_execsql_test 2.0 {
+  CREATE VIRTUAL TABLE ft USING fts5(
+      x, tokenize = "tclnum query", detail=columns
+  );
+  INSERT INTO ft VALUES('one two three i ii iii');
+  INSERT INTO ft VALUES('four five six iv v vi');
+  INSERT INTO ft VALUES('eight nine ten viii ix x');
+} {}
+
+do_faultsim_test 8.1 -faults oom* -prep {
+} -body {
+  execsql {
+    SELECT fts5_test_collist (ft) FROM ft('one two');
+  }
+} -test {
+  faultsim_test_result {0 {{0.0 1.0}}} {1 {SQL logic error}} {1 SQLITE_NOMEM}
+}
+
+do_faultsim_test 8.2 -faults oom* -prep {
+} -body {
+  execsql {
+    SELECT rowid FROM ft('one two') ORDER BY rank;
+  }
+} -test {
+  faultsim_test_result {0 1} {1 {SQL logic error}} {1 SQLITE_NOMEM}
+}
+
+
 finish_test
 

ext/fts5/test/fts5locale.test

@@ -521,5 +521,14 @@ do_catchsql_test 11.2 {
   SELECT fts5_columnlocale(x1, 1) FROM x1('two');
 } {1 SQLITE_RANGE}
 
+#-------------------------------------------------------------------------
+#
+reset_db
+do_test 12.0 {
+  list [catch {
+    sqlite3_fts5_create_tokenizer -v2 -version 3 db tcl tcl_create
+  } msg] $msg
+} {1 {error in fts5_api.xCreateTokenizer_v2()}}
+
 finish_test
 

ext/fts5/test/fts5misc.test

@@ -591,5 +591,27 @@ do_execsql_test 21.2 {
   PRAGMA integrity_check
 } {ok}
 
+breakpoint
+sqlite3_db_config db DEFENSIVE 1
+do_execsql_test 21.3 {
+  CREATE TABLE xyz_notashadow(x, y);
+  DROP TABLE xyz_notashadow;
+}
+sqlite3_db_config db DEFENSIVE 0
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 22.0 {
+  SELECT fts5(NULL);
+} {{}}
+do_execsql_test 22.1 {
+  SELECT count(*) FROM (
+    SELECT fts5_source_id()
+  )
+} {1}
+execsql_pp {
+  SELECT fts5_source_id()
+}
+
 finish_test