Fossil SCM

Update the built-in SQLite to version 3.23.0 final.

drh 2018-04-02 11:15 trunk
Commit 699cefc88e698cff16e5dd41dc3ed14e43f675d23b68efa2f38113529681278c
Parent 21780aef9a48339…
2 files changed +7 -7 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+7 -7
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
11471147
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11481148
 ** [sqlite_version()] and [sqlite_source_id()].
11491149
 */
11501150
 #define SQLITE_VERSION "3.23.0"
11511151
 #define SQLITE_VERSION_NUMBER 3023000
1152
-#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
1152
+#define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2"
11531153
11541154
 /*
11551155
 ** CAPI3REF: Run-Time Library Version Numbers
11561156
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11571157
 **
@@ -123988,11 +123988,10 @@
123988123988
 ExprList *pOrderBy = pSub->pOrderBy;
123989123989
 for(i=0; i<pOrderBy->nExpr; i++){
123990123990
 pOrderBy->a[i].u.x.iOrderByCol = 0;
123991123991
 }
123992123992
 assert( pParent->pOrderBy==0 );
123993
- assert( pSub->pPrior==0 );
123994123993
 pParent->pOrderBy = pOrderBy;
123995123994
 pSub->pOrderBy = 0;
123996123995
 }
123997123996
 pWhere = sqlite3ExprDup(db, pSub->pWhere, 0);
123998123997
 if( isLeftJoin>0 ){
@@ -132880,22 +132879,23 @@
132880132879
 if( iLoop<3 && (pTerm->wtFlags & TERM_VARSELECT) ){
132881132880
 if( iNext==0 ) iNext = 3;
132882132881
 continue;
132883132882
 }
132884132883
132885
- if( pTerm->wtFlags & TERM_LIKECOND ){
132884
+ if( (pTerm->wtFlags & TERM_LIKECOND)!=0 ){
132886132885
 /* If the TERM_LIKECOND flag is set, that means that the range search
132887132886
 ** is sufficient to guarantee that the LIKE operator is true, so we
132888132887
 ** can skip the call to the like(A,B) function. But this only works
132889132888
 ** for strings. So do not skip the call to the function on the pass
132890132889
 ** that compares BLOBs. */
132891132890
 #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
132892132891
 continue;
132893132892
 #else
132894132893
 u32 x = pLevel->iLikeRepCntr;
132895
- assert( x>0 );
132896
- skipLikeAddr = sqlite3VdbeAddOp1(v, (x&1)?OP_IfNot:OP_If, (int)(x>>1));
132894
+ if( x>0 ){
132895
+ skipLikeAddr = sqlite3VdbeAddOp1(v, (x&1)?OP_IfNot:OP_If,(int)(x>>1));
132896
+ }
132897132897
 VdbeCoverage(v);
132898132898
 #endif
132899132899
 }
132900132900
 #ifdef WHERETRACE_ENABLED /* 0xffff */
132901132901
 if( sqlite3WhereTrace ){
@@ -205557,11 +205557,11 @@
205557205557
 int nArg, /* Number of args */
205558205558
 sqlite3_value **apUnused /* Function arguments */
205559205559
 ){
205560205560
 assert( nArg==0 );
205561205561
 UNUSED_PARAM2(nArg, apUnused);
205562
- sqlite3_result_text(pCtx, "fts5: 2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda", -1, SQLITE_TRANSIENT);
205562
+ sqlite3_result_text(pCtx, "fts5: 2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2", -1, SQLITE_TRANSIENT);
205563205563
 }
205564205564
205565205565
 static int fts5Init(sqlite3 *db){
205566205566
 static const sqlite3_module fts5Mod = {
205567205567
 /* iVersion */ 2,
@@ -209829,10 +209829,10 @@
209829209829
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209830209830
209831209831
 /************** End of stmt.c ************************************************/
209832209832
 #if __LINE__!=209832
209833209833
 #undef SQLITE_SOURCE_ID
209834
-#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2alt2"
209834
+#define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98falt2"
209835209835
 #endif
209836209836
 /* Return the source-id for this library */
209837209837
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209838209838
 /************************** End of sqlite3.c ******************************/
209839209839
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.23.0"
1151 #define SQLITE_VERSION_NUMBER 3023000
1152 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -123988,11 +123988,10 @@
123988 ExprList *pOrderBy = pSub->pOrderBy;
123989 for(i=0; i<pOrderBy->nExpr; i++){
123990 pOrderBy->a[i].u.x.iOrderByCol = 0;
123991 }
123992 assert( pParent->pOrderBy==0 );
123993 assert( pSub->pPrior==0 );
123994 pParent->pOrderBy = pOrderBy;
123995 pSub->pOrderBy = 0;
123996 }
123997 pWhere = sqlite3ExprDup(db, pSub->pWhere, 0);
123998 if( isLeftJoin>0 ){
@@ -132880,22 +132879,23 @@
132880 if( iLoop<3 && (pTerm->wtFlags & TERM_VARSELECT) ){
132881 if( iNext==0 ) iNext = 3;
132882 continue;
132883 }
132884
132885 if( pTerm->wtFlags & TERM_LIKECOND ){
132886 /* If the TERM_LIKECOND flag is set, that means that the range search
132887 ** is sufficient to guarantee that the LIKE operator is true, so we
132888 ** can skip the call to the like(A,B) function. But this only works
132889 ** for strings. So do not skip the call to the function on the pass
132890 ** that compares BLOBs. */
132891 #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
132892 continue;
132893 #else
132894 u32 x = pLevel->iLikeRepCntr;
132895 assert( x>0 );
132896 skipLikeAddr = sqlite3VdbeAddOp1(v, (x&1)?OP_IfNot:OP_If, (int)(x>>1));
 
132897 VdbeCoverage(v);
132898 #endif
132899 }
132900 #ifdef WHERETRACE_ENABLED /* 0xffff */
132901 if( sqlite3WhereTrace ){
@@ -205557,11 +205557,11 @@
205557 int nArg, /* Number of args */
205558 sqlite3_value **apUnused /* Function arguments */
205559 ){
205560 assert( nArg==0 );
205561 UNUSED_PARAM2(nArg, apUnused);
205562 sqlite3_result_text(pCtx, "fts5: 2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda", -1, SQLITE_TRANSIENT);
205563 }
205564
205565 static int fts5Init(sqlite3 *db){
205566 static const sqlite3_module fts5Mod = {
205567 /* iVersion */ 2,
@@ -209829,10 +209829,10 @@
209829 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209830
209831 /************** End of stmt.c ************************************************/
209832 #if __LINE__!=209832
209833 #undef SQLITE_SOURCE_ID
209834 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2alt2"
209835 #endif
209836 /* Return the source-id for this library */
209837 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209838 /************************** End of sqlite3.c ******************************/
209839
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.23.0"
1151 #define SQLITE_VERSION_NUMBER 3023000
1152 #define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -123988,11 +123988,10 @@
123988 ExprList *pOrderBy = pSub->pOrderBy;
123989 for(i=0; i<pOrderBy->nExpr; i++){
123990 pOrderBy->a[i].u.x.iOrderByCol = 0;
123991 }
123992 assert( pParent->pOrderBy==0 );
 
123993 pParent->pOrderBy = pOrderBy;
123994 pSub->pOrderBy = 0;
123995 }
123996 pWhere = sqlite3ExprDup(db, pSub->pWhere, 0);
123997 if( isLeftJoin>0 ){
@@ -132880,22 +132879,23 @@
132879 if( iLoop<3 && (pTerm->wtFlags & TERM_VARSELECT) ){
132880 if( iNext==0 ) iNext = 3;
132881 continue;
132882 }
132883
132884 if( (pTerm->wtFlags & TERM_LIKECOND)!=0 ){
132885 /* If the TERM_LIKECOND flag is set, that means that the range search
132886 ** is sufficient to guarantee that the LIKE operator is true, so we
132887 ** can skip the call to the like(A,B) function. But this only works
132888 ** for strings. So do not skip the call to the function on the pass
132889 ** that compares BLOBs. */
132890 #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
132891 continue;
132892 #else
132893 u32 x = pLevel->iLikeRepCntr;
132894 if( x>0 ){
132895 skipLikeAddr = sqlite3VdbeAddOp1(v, (x&1)?OP_IfNot:OP_If,(int)(x>>1));
132896 }
132897 VdbeCoverage(v);
132898 #endif
132899 }
132900 #ifdef WHERETRACE_ENABLED /* 0xffff */
132901 if( sqlite3WhereTrace ){
@@ -205557,11 +205557,11 @@
205557 int nArg, /* Number of args */
205558 sqlite3_value **apUnused /* Function arguments */
205559 ){
205560 assert( nArg==0 );
205561 UNUSED_PARAM2(nArg, apUnused);
205562 sqlite3_result_text(pCtx, "fts5: 2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2", -1, SQLITE_TRANSIENT);
205563 }
205564
205565 static int fts5Init(sqlite3 *db){
205566 static const sqlite3_module fts5Mod = {
205567 /* iVersion */ 2,
@@ -209829,10 +209829,10 @@
209829 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209830
209831 /************** End of stmt.c ************************************************/
209832 #if __LINE__!=209832
209833 #undef SQLITE_SOURCE_ID
209834 #define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98falt2"
209835 #endif
209836 /* Return the source-id for this library */
209837 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209838 /************************** End of sqlite3.c ******************************/
209839
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126126
 #define SQLITE_VERSION "3.23.0"
127127
 #define SQLITE_VERSION_NUMBER 3023000
128
-#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
128
+#define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.23.0"
127 #define SQLITE_VERSION_NUMBER 3023000
128 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.23.0"
127 #define SQLITE_VERSION_NUMBER 3023000
128 #define SQLITE_SOURCE_ID "2018-04-02 11:04:16 736b53f57f70b23172c30880186dce7ad9baa3b74e3838cae5847cffb98f5cd2"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button