Add some extended sqlite v2 error codes. Also update sqlite3 to the latest one.

SquiLu-ext/sq_sqlite3.cpp

@@ -2309,9 +2309,39 @@ extern "C" {
         INT_CONST(v,SQLITE_OPEN_SUBLATIN_NA_LIKE);
 
         INT_CONST(v,SQLITE_OK);
-        INT_CONST(v,SQLITE_INTERRUPT);
+        INT_CONST(v,SQLITE_BUSY);
+        INT_CONST(v,SQLITE_DONE);
         INT_CONST(v,SQLITE_DETERMINISTIC);
-
+        INT_CONST(v,SQLITE_ERROR);
+        INT_CONST(v,SQLITE_INTERRUPT);
+        INT_CONST(v,SQLITE_MISUSE);
+        INT_CONST(v,SQLITE_ROW);
+        INT_CONST(v,SQLITE_LOCKED_SHAREDCACHE);
+        INT_CONST(v,SQLITE_BUSY_RECOVERY);
+        INT_CONST(v,SQLITE_BUSY_SNAPSHOT);
+        INT_CONST(v,SQLITE_CANTOPEN_NOTEMPDIR);
+        INT_CONST(v,SQLITE_CANTOPEN_ISDIR);
+        INT_CONST(v,SQLITE_CANTOPEN_FULLPATH);
+        INT_CONST(v,SQLITE_CANTOPEN_CONVPATH);
+        INT_CONST(v,SQLITE_CORRUPT_VTAB);
+        INT_CONST(v,SQLITE_READONLY_RECOVERY);
+        INT_CONST(v,SQLITE_READONLY_CANTLOCK);
+        INT_CONST(v,SQLITE_READONLY_ROLLBACK);
+        INT_CONST(v,SQLITE_READONLY_DBMOVED);
+        INT_CONST(v,SQLITE_ABORT_ROLLBACK);
+        INT_CONST(v,SQLITE_CONSTRAINT_CHECK);
+        INT_CONST(v,SQLITE_CONSTRAINT_COMMITHOOK);
+        INT_CONST(v,SQLITE_CONSTRAINT_FOREIGNKEY);
+        INT_CONST(v,SQLITE_CONSTRAINT_FUNCTION);
+        INT_CONST(v,SQLITE_CONSTRAINT_NOTNULL);
+        INT_CONST(v,SQLITE_CONSTRAINT_PRIMARYKEY);
+        INT_CONST(v,SQLITE_CONSTRAINT_TRIGGER);
+        INT_CONST(v,SQLITE_CONSTRAINT_UNIQUE);
+        INT_CONST(v,SQLITE_CONSTRAINT_VTAB);
+        INT_CONST(v,SQLITE_CONSTRAINT_ROWID);
+        INT_CONST(v,SQLITE_NOTICE_RECOVER_WAL);
+        INT_CONST(v,SQLITE_NOTICE_RECOVER_ROLLBACK);
+        INT_CONST(v,SQLITE_WARNING_AUTOINDEX);
         //push sqlite3_NULL as a member
         sq_pushstring(v, nullName,-1);
         sq_pushobject(v, sqlite3_NULL);
@@ -2325,8 +2355,8 @@ extern "C" {
         sq_insert_reg_funcs(v, sq_sqlite3_stmt_methods);
 
         INT_CONST(v,SQLITE_OK);
-        INT_CONST(v,SQLITE_ROW);
         INT_CONST(v,SQLITE_DONE);
+        INT_CONST(v,SQLITE_ROW);
         INT_CONST(v,AS_STRING_ALWAYS);
         INT_CONST(v,NULL_AS_EMPTY_STR);
         INT_CONST(v,WITH_COL_NAMES);

SquiLu-ext/sqlite3.c

@@ -224,7 +224,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.8.6"
 #define SQLITE_VERSION_NUMBER 3008006
-#define SQLITE_SOURCE_ID      "2014-06-30 19:28:57 f925e9baafea625f63105f8013abb3807b418379"
+#define SQLITE_SOURCE_ID      "2014-07-03 12:18:22 0cc0230ae9cfc9760fd8ef2c25e82576b052dbeb"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -84524,7 +84524,16 @@ static void initAvgEq(Index *pIdx){
     IndexSample *aSample = pIdx->aSample;
     IndexSample *pFinal = &aSample[pIdx->nSample-1];
     int iCol;
-    for(iCol=0; iCol<pIdx->nKeyCol; iCol++){
+    int nCol = 1;
+    if( pIdx->nSampleCol>1 ){
+      /* If this is stat4 data, then calculate aAvgEq[] values for all
+      ** sample columns except the last. The last is always set to 1, as
+      ** once the trailing PK fields are considered all index keys are
+      ** unique.  */
+      nCol = pIdx->nSampleCol-1;
+      pIdx->aAvgEq[nCol] = 1;
+    }
+    for(iCol=0; iCol<nCol; iCol++){
       int i;                    /* Used to iterate through samples */
       tRowcnt sumEq = 0;        /* Sum of the nEq values */
       tRowcnt nSum = 0;         /* Number of terms contributing to sumEq */
@@ -84547,7 +84556,6 @@ static void initAvgEq(Index *pIdx){
       }
       if( avgEq==0 ) avgEq = 1;
       pIdx->aAvgEq[iCol] = avgEq;
-      if( pIdx->nSampleCol==1 ) break;
     }
   }
 }
@@ -84606,7 +84614,6 @@ static int loadStatTbl(
 
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
     int nIdxCol = 1;              /* Number of columns in stat4 records */
-    int nAvgCol = 1;              /* Number of entries in Index.aAvgEq */
 
     char *zIndex;   /* Index name */
     Index *pIdx;    /* Pointer to the index object */
@@ -84624,13 +84631,17 @@ static int loadStatTbl(
     ** loaded from the stat4 table. In this case ignore stat3 data.  */
     if( pIdx==0 || pIdx->nSample ) continue;
     if( bStat3==0 ){
-      nIdxCol = pIdx->nKeyCol+1;
-      nAvgCol = pIdx->nKeyCol;
+      assert( !HasRowid(pIdx->pTable) || pIdx->nColumn==pIdx->nKeyCol+1 );
+      if( !HasRowid(pIdx->pTable) && IsPrimaryKeyIndex(pIdx) ){
+        nIdxCol = pIdx->nKeyCol;
+      }else{
+        nIdxCol = pIdx->nColumn;
+      }
     }
     pIdx->nSampleCol = nIdxCol;
     nByte = sizeof(IndexSample) * nSample;
     nByte += sizeof(tRowcnt) * nIdxCol * 3 * nSample;
-    nByte += nAvgCol * sizeof(tRowcnt);     /* Space for Index.aAvgEq[] */
+    nByte += nIdxCol * sizeof(tRowcnt);     /* Space for Index.aAvgEq[] */
 
     pIdx->aSample = sqlite3DbMallocZero(db, nByte);
     if( pIdx->aSample==0 ){
@@ -84638,7 +84649,7 @@ static int loadStatTbl(
       return SQLITE_NOMEM;
     }
     pSpace = (tRowcnt*)&pIdx->aSample[nSample];
-    pIdx->aAvgEq = pSpace; pSpace += nAvgCol;
+    pIdx->aAvgEq = pSpace; pSpace += nIdxCol;
     for(i=0; i<nSample; i++){
       pIdx->aSample[i].anEq = pSpace; pSpace += nIdxCol;
       pIdx->aSample[i].anLt = pSpace; pSpace += nIdxCol;
@@ -112384,7 +112395,7 @@ static void whereKeyStats(
       iUpper = i>=pIdx->nSample ? nRow0 : aSample[i].anLt[iCol];
       iLower = aSample[i-1].anEq[iCol] + aSample[i-1].anLt[iCol];
     }
-    aStat[1] = (pIdx->nKeyCol>iCol ? pIdx->aAvgEq[iCol] : 1);
+    aStat[1] = pIdx->aAvgEq[iCol];
     if( iLower>=iUpper ){
       iGap = 0;
     }else{
@@ -127724,7 +127735,7 @@ SQLITE_PRIVATE int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr);
 SQLITE_PRIVATE int sqlite3Fts3InitTok(sqlite3*, Fts3Hash *);
 
 /* fts3_unicode2.c (functions generated by parsing unicode text files) */
-#ifdef SQLITE_ENABLE_FTS4_UNICODE61
+#ifndef SQLITE_DISABLE_FTS3_UNICODE
 SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int, int);
 SQLITE_PRIVATE int sqlite3FtsUnicodeIsalnum(int);
 SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int);
@@ -131194,7 +131205,7 @@ static void hashDestroy(void *p){
 */
 SQLITE_PRIVATE void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
 SQLITE_PRIVATE void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
-#ifdef SQLITE_ENABLE_FTS4_UNICODE61
+#ifndef SQLITE_DISABLE_FTS3_UNICODE
 SQLITE_PRIVATE void sqlite3Fts3UnicodeTokenizer(sqlite3_tokenizer_module const**ppModule);
 #endif
 #ifdef SQLITE_ENABLE_ICU
@@ -131224,7 +131235,7 @@ SQLITE_PRIVATE int sqlite3Fts3Init(sqlite3 *db){
   sqlite3Fts3IcuTokenizerModule(&pIcu);
 #endif
 
-#ifdef SQLITE_ENABLE_FTS4_UNICODE61
+#ifdef SQLITE_ENABLE_FTS3_UNICODE
   sqlite3Fts3UnicodeTokenizer(&pUnicode);
 #endif
 
@@ -131253,7 +131264,7 @@ SQLITE_PRIVATE int sqlite3Fts3Init(sqlite3 *db){
     if( sqlite3Fts3HashInsert(pHash, "simple", 7, (void *)pSimple)
      || sqlite3Fts3HashInsert(pHash, "porter", 7, (void *)pPorter) 
      || sqlite3Fts3HashInsert(pHash, "sublatin", 9, (void *)pSubLatin)
-#ifdef SQLITE_ENABLE_FTS4_UNICODE61
+#ifdef SQLITE_ENABLE_FTS3_UNICODE
      || sqlite3Fts3HashInsert(pHash, "unicode61", 10, (void *)pUnicode) 
 #endif
 #ifdef SQLITE_ENABLE_ICU
@@ -144854,7 +144865,7 @@ SQLITE_PRIVATE void sqlite3Fts3SubLatinTokenizerModule(
 ** Implementation of the "unicode" full-text-search tokenizer.
 */
 
-#ifdef SQLITE_ENABLE_FTS4_UNICODE61
+#ifndef SQLITE_DISABLE_FTS3_UNICODE
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
@@ -145229,7 +145240,7 @@ SQLITE_PRIVATE void sqlite3Fts3UnicodeTokenizer(sqlite3_tokenizer_module const *
 }
 
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
-#endif /* ifndef SQLITE_ENABLE_FTS4_UNICODE61 */
+#endif /* ifndef SQLITE_DISABLE_FTS3_UNICODE */
 
 /************** End of fts3_unicode.c ****************************************/
 /************** Begin file fts3_unicode2.c ***********************************/
@@ -145250,7 +145261,7 @@ SQLITE_PRIVATE void sqlite3Fts3UnicodeTokenizer(sqlite3_tokenizer_module const *
 ** DO NOT EDIT THIS MACHINE GENERATED FILE.
 */
 
-#if defined(SQLITE_ENABLE_FTS4_UNICODE61)
+#ifndef SQLITE_DISABLE_FTS3_UNICODE
 #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
 
 /* #include <assert.h> */
@@ -145597,7 +145608,7 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int c, int bRemoveDiacritic){
   return ret;
 }
 #endif /* defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4) */
-#endif /* !defined(SQLITE_ENABLE_FTS4_UNICODE61) */
+#endif /* !defined(SQLITE_DISABLE_FTS3_UNICODE) */
 
 /************** End of fts3_unicode2.c ***************************************/
 /************** Begin file rtree.c *******************************************/

SquiLu-ext/sqlite3.h

@@ -109,7 +109,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.8.6"
 #define SQLITE_VERSION_NUMBER 3008006
-#define SQLITE_SOURCE_ID      "2014-06-30 19:28:57 f925e9baafea625f63105f8013abb3807b418379"
+#define SQLITE_SOURCE_ID      "2014-07-03 12:18:22 0cc0230ae9cfc9760fd8ef2c25e82576b052dbeb"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers