Update the spellfix virtual table so that all OOM errors are reported out

to the application.

FossilOrigin-Name: 573770f5a66fa4d708931b30350149eb739da607

diff --git a/manifest b/manifest
index 20486b8f7eab5814178c9363e52914bec646be5c..25c6e732c0edd9888a5b9374e21855846ba54420 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_DISABLE_FTS4_DEFERRED\scompile\stime\soption.
-D 2012-08-20T17:24:48.768
+C Update\sthe\sspellfix\svirtual\stable\sso\sthat\sall\sOOM\serrors\sare\sreported\sout\nto\sthe\sapplication.
+D 2012-08-21T17:44:05.685
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
-F src/test_spellfix.c deab0f9caf853d2ddbee7c4a680ad27621adf1bf
+F src/test_spellfix.c fa83c9b4c4bdd1d41be4ad1e9241bf5a4fc9190f
 F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
@@ -1011,7 +1011,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P be1faadebd9464f1c7d4cc26104f219ed35384b8
-R 9d3902f63cfac6bb8ee3fe0483a0e736
-U dan
-Z a16ab6913bdfea9d4fad9944795f8c23
+P e799222f3b8246e65657a758437914ece7069ba9
+R 5e828b4451d9abd5424b5fdb18a303b8
+U drh
+Z 86d779defb1a86a95d6cf62943de67e6

diff --git a/manifest.uuid b/manifest.uuid
index 61af4bab2b45433bf05ac131eab79080255a3732..4aa121d156a13579729794d9decee3517ed55bc4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e799222f3b8246e65657a758437914ece7069ba9
\ No newline at end of file
+573770f5a66fa4d708931b30350149eb739da607
\ No newline at end of file

diff --git a/src/test_spellfix.c b/src/test_spellfix.c
index ec73b0b3cf08659d50b1b2cb06ede65822956802..68247fed0fa6a3725ad4a64c39065123760b6257 100644 (file)
--- a/src/test_spellfix.c
+++ b/src/test_spellfix.c
@@ -2508,15 +2508,17 @@ static int spellfix1Filter(
 */
 static int spellfix1Next(sqlite3_vtab_cursor *cur){
   spellfix1_cursor *pCur = (spellfix1_cursor *)cur;
+  int rc = SQLITE_OK;
   if( pCur->iRow < pCur->nRow ){
     if( pCur->pFullScan ){
-      int rc = sqlite3_step(pCur->pFullScan);
+      rc = sqlite3_step(pCur->pFullScan);
       if( rc!=SQLITE_ROW ) pCur->iRow = pCur->nRow;
+      if( rc==SQLITE_ROW || rc==SQLITE_DONE ) rc = SQLITE_OK;
     }else{
       pCur->iRow++;
     }
   }
-  return SQLITE_OK;
+  return rc;
 }
 
 /*
@@ -2773,25 +2775,35 @@ static sqlite3_module spellfix1Module = {
 ** Register the various functions and the virtual table.
 */
 static int spellfix1Register(sqlite3 *db){
-  int nErr = 0;
+  int rc = SQLITE_OK;
   int i;
-  nErr += sqlite3_create_function(db, "spellfix1_translit", 1, SQLITE_UTF8, 0,
+  rc = sqlite3_create_function(db, "spellfix1_translit", 1, SQLITE_UTF8, 0,
                                   transliterateSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "spellfix1_editdist", 2, SQLITE_UTF8, 0,
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "spellfix1_editdist", 2, SQLITE_UTF8, 0,
                                   editdistSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "spellfix1_phonehash", 1, SQLITE_UTF8, 0,
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "spellfix1_phonehash", 1, SQLITE_UTF8, 0,
                                   phoneticHashSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "spellfix1_scriptcode", 1, SQLITE_UTF8, 0,
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "spellfix1_scriptcode", 1, SQLITE_UTF8, 0,
                                   scriptCodeSqlFunc, 0, 0);
-  nErr += sqlite3_create_module(db, "spellfix1", &spellfix1Module, 0);
-  nErr += editDist3Install(db);
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_module(db, "spellfix1", &spellfix1Module, 0);
+  }
+  if( rc==SQLITE_OK ){
+    rc = editDist3Install(db);
+  }
 
   /* Verify sanity of the translit[] table */
   for(i=0; i<sizeof(translit)/sizeof(translit[0])-1; i++){
     assert( translit[i].cFrom<translit[i+1].cFrom );
   }
 
-  return nErr ? SQLITE_ERROR : SQLITE_OK;
+  return rc;
 }
 
 #if SQLITE_CORE || defined(SQLITE_TEST)