Fossil SCM

Update the built-in SQLite to version 3.17.0

jan.nijtmans 2017-02-14 15:35 trunk
Commit 616d2873f0c56cd302b44b79d8fc167835356e2e
Parent ffd261abfb84855…
3 files changed +6 -5 +1 -1 +5
~ src/sqlite3.c ~ src/sqlite3.h ~ www/changes.wiki
M src/sqlite3.c
+6 -5
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -397,11 +397,11 @@
397397
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
398398
 ** [sqlite_version()] and [sqlite_source_id()].
399399
 */
400400
 #define SQLITE_VERSION "3.17.0"
401401
 #define SQLITE_VERSION_NUMBER 3017000
402
-#define SQLITE_SOURCE_ID "2017-02-09 17:12:22 798fb9d70d2e5f95e64237b04d6692360133381a"
402
+#define SQLITE_SOURCE_ID "2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c"
403403
404404
 /*
405405
 ** CAPI3REF: Run-Time Library Version Numbers
406406
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
407407
 **
@@ -23838,11 +23838,11 @@
2383823838
 SQLITE_PRIVATE void sqlite3MemoryBarrier(void){
2383923839
 #if defined(SQLITE_MEMORY_BARRIER)
2384023840
 SQLITE_MEMORY_BARRIER;
2384123841
 #elif defined(__GNUC__)
2384223842
 __sync_synchronize();
23843
-#elif MSCV_VERSION>=1300
23843
+#elif MSVC_VERSION>=1300
2384423844
 _ReadWriteBarrier();
2384523845
 #elif defined(MemoryBarrier)
2384623846
 MemoryBarrier();
2384723847
 #endif
2384823848
 }
@@ -58556,11 +58556,11 @@
5855658556
 */
5855758557
 #if SQLITE_BYTEORDER==4321
5855858558
 # define get2byteAligned(x) (*(u16*)(x))
5855958559
 #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4008000
5856058560
 # define get2byteAligned(x) __builtin_bswap16(*(u16*)(x))
58561
-#elif SQLITE_BYTEORDER==1234 && MSCV_VERSION>=1300
58561
+#elif SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
5856258562
 # define get2byteAligned(x) _byteswap_ushort(*(u16*)(x))
5856358563
 #else
5856458564
 # define get2byteAligned(x) ((x)[0]<<8 | (x)[1])
5856558565
 #endif
5856658566
@@ -90696,11 +90696,11 @@
9069690696
 aff = sqlite3ExprAffinity(pExpr->pLeft);
9069790697
 if( pExpr->pRight ){
9069890698
 aff = sqlite3CompareAffinity(pExpr->pRight, aff);
9069990699
 }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
9070090700
 aff = sqlite3CompareAffinity(pExpr->x.pSelect->pEList->a[0].pExpr, aff);
90701
- }else if( NEVER(aff==0) ){
90701
+ }else if( aff==0 ){
9070290702
 aff = SQLITE_AFF_BLOB;
9070390703
 }
9070490704
 return aff;
9070590705
 }
9070690706
@@ -129637,10 +129637,11 @@
129637129637
 if( pIdx ){
129638129638
 int j = iColumn;
129639129639
 iColumn = pIdx->aiColumn[j];
129640129640
 if( iColumn==XN_EXPR ){
129641129641
 pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
129642
+ pScan->zCollName = pIdx->azColl[j];
129642129643
 }else if( iColumn==pIdx->pTable->iPKey ){
129643129644
 iColumn = XN_ROWID;
129644129645
 }else if( iColumn>=0 ){
129645129646
 pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
129646129647
 pScan->zCollName = pIdx->azColl[j];
@@ -197538,11 +197539,11 @@
197538197539
 int nArg, /* Number of args */
197539197540
 sqlite3_value **apUnused /* Function arguments */
197540197541
 ){
197541197542
 assert( nArg==0 );
197542197543
 UNUSED_PARAM2(nArg, apUnused);
197543
- sqlite3_result_text(pCtx, "fts5: 2017-02-08 19:12:36 1afec5758b624e6a066d4e7ef50695095e9d7ff1", -1, SQLITE_TRANSIENT);
197544
+ sqlite3_result_text(pCtx, "fts5: 2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c", -1, SQLITE_TRANSIENT);
197544197545
 }
197545197546
197546197547
 static int fts5Init(sqlite3 *db){
197547197548
 static const sqlite3_module fts5Mod = {
197548197549
 /* iVersion */ 2,
197549197550
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -397,11 +397,11 @@
397 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
398 ** [sqlite_version()] and [sqlite_source_id()].
399 */
400 #define SQLITE_VERSION "3.17.0"
401 #define SQLITE_VERSION_NUMBER 3017000
402 #define SQLITE_SOURCE_ID "2017-02-09 17:12:22 798fb9d70d2e5f95e64237b04d6692360133381a"
403
404 /*
405 ** CAPI3REF: Run-Time Library Version Numbers
406 ** KEYWORDS: sqlite3_version sqlite3_sourceid
407 **
@@ -23838,11 +23838,11 @@
23838 SQLITE_PRIVATE void sqlite3MemoryBarrier(void){
23839 #if defined(SQLITE_MEMORY_BARRIER)
23840 SQLITE_MEMORY_BARRIER;
23841 #elif defined(__GNUC__)
23842 __sync_synchronize();
23843 #elif MSCV_VERSION>=1300
23844 _ReadWriteBarrier();
23845 #elif defined(MemoryBarrier)
23846 MemoryBarrier();
23847 #endif
23848 }
@@ -58556,11 +58556,11 @@
58556 */
58557 #if SQLITE_BYTEORDER==4321
58558 # define get2byteAligned(x) (*(u16*)(x))
58559 #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4008000
58560 # define get2byteAligned(x) __builtin_bswap16(*(u16*)(x))
58561 #elif SQLITE_BYTEORDER==1234 && MSCV_VERSION>=1300
58562 # define get2byteAligned(x) _byteswap_ushort(*(u16*)(x))
58563 #else
58564 # define get2byteAligned(x) ((x)[0]<<8 | (x)[1])
58565 #endif
58566
@@ -90696,11 +90696,11 @@
90696 aff = sqlite3ExprAffinity(pExpr->pLeft);
90697 if( pExpr->pRight ){
90698 aff = sqlite3CompareAffinity(pExpr->pRight, aff);
90699 }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
90700 aff = sqlite3CompareAffinity(pExpr->x.pSelect->pEList->a[0].pExpr, aff);
90701 }else if( NEVER(aff==0) ){
90702 aff = SQLITE_AFF_BLOB;
90703 }
90704 return aff;
90705 }
90706
@@ -129637,10 +129637,11 @@
129637 if( pIdx ){
129638 int j = iColumn;
129639 iColumn = pIdx->aiColumn[j];
129640 if( iColumn==XN_EXPR ){
129641 pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
 
129642 }else if( iColumn==pIdx->pTable->iPKey ){
129643 iColumn = XN_ROWID;
129644 }else if( iColumn>=0 ){
129645 pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
129646 pScan->zCollName = pIdx->azColl[j];
@@ -197538,11 +197539,11 @@
197538 int nArg, /* Number of args */
197539 sqlite3_value **apUnused /* Function arguments */
197540 ){
197541 assert( nArg==0 );
197542 UNUSED_PARAM2(nArg, apUnused);
197543 sqlite3_result_text(pCtx, "fts5: 2017-02-08 19:12:36 1afec5758b624e6a066d4e7ef50695095e9d7ff1", -1, SQLITE_TRANSIENT);
197544 }
197545
197546 static int fts5Init(sqlite3 *db){
197547 static const sqlite3_module fts5Mod = {
197548 /* iVersion */ 2,
197549
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -397,11 +397,11 @@
397 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
398 ** [sqlite_version()] and [sqlite_source_id()].
399 */
400 #define SQLITE_VERSION "3.17.0"
401 #define SQLITE_VERSION_NUMBER 3017000
402 #define SQLITE_SOURCE_ID "2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c"
403
404 /*
405 ** CAPI3REF: Run-Time Library Version Numbers
406 ** KEYWORDS: sqlite3_version sqlite3_sourceid
407 **
@@ -23838,11 +23838,11 @@
23838 SQLITE_PRIVATE void sqlite3MemoryBarrier(void){
23839 #if defined(SQLITE_MEMORY_BARRIER)
23840 SQLITE_MEMORY_BARRIER;
23841 #elif defined(__GNUC__)
23842 __sync_synchronize();
23843 #elif MSVC_VERSION>=1300
23844 _ReadWriteBarrier();
23845 #elif defined(MemoryBarrier)
23846 MemoryBarrier();
23847 #endif
23848 }
@@ -58556,11 +58556,11 @@
58556 */
58557 #if SQLITE_BYTEORDER==4321
58558 # define get2byteAligned(x) (*(u16*)(x))
58559 #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4008000
58560 # define get2byteAligned(x) __builtin_bswap16(*(u16*)(x))
58561 #elif SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
58562 # define get2byteAligned(x) _byteswap_ushort(*(u16*)(x))
58563 #else
58564 # define get2byteAligned(x) ((x)[0]<<8 | (x)[1])
58565 #endif
58566
@@ -90696,11 +90696,11 @@
90696 aff = sqlite3ExprAffinity(pExpr->pLeft);
90697 if( pExpr->pRight ){
90698 aff = sqlite3CompareAffinity(pExpr->pRight, aff);
90699 }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
90700 aff = sqlite3CompareAffinity(pExpr->x.pSelect->pEList->a[0].pExpr, aff);
90701 }else if( aff==0 ){
90702 aff = SQLITE_AFF_BLOB;
90703 }
90704 return aff;
90705 }
90706
@@ -129637,10 +129637,11 @@
129637 if( pIdx ){
129638 int j = iColumn;
129639 iColumn = pIdx->aiColumn[j];
129640 if( iColumn==XN_EXPR ){
129641 pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
129642 pScan->zCollName = pIdx->azColl[j];
129643 }else if( iColumn==pIdx->pTable->iPKey ){
129644 iColumn = XN_ROWID;
129645 }else if( iColumn>=0 ){
129646 pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
129647 pScan->zCollName = pIdx->azColl[j];
@@ -197538,11 +197539,11 @@
197539 int nArg, /* Number of args */
197540 sqlite3_value **apUnused /* Function arguments */
197541 ){
197542 assert( nArg==0 );
197543 UNUSED_PARAM2(nArg, apUnused);
197544 sqlite3_result_text(pCtx, "fts5: 2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c", -1, SQLITE_TRANSIENT);
197545 }
197546
197547 static int fts5Init(sqlite3 *db){
197548 static const sqlite3_module fts5Mod = {
197549 /* iVersion */ 2,
197550
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121121
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122122
 ** [sqlite_version()] and [sqlite_source_id()].
123123
 */
124124
 #define SQLITE_VERSION "3.17.0"
125125
 #define SQLITE_VERSION_NUMBER 3017000
126
-#define SQLITE_SOURCE_ID "2017-02-09 17:12:22 798fb9d70d2e5f95e64237b04d6692360133381a"
126
+#define SQLITE_SOURCE_ID "2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c"
127127
128128
 /*
129129
 ** CAPI3REF: Run-Time Library Version Numbers
130130
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
131131
 **
132132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.17.0"
125 #define SQLITE_VERSION_NUMBER 3017000
126 #define SQLITE_SOURCE_ID "2017-02-09 17:12:22 798fb9d70d2e5f95e64237b04d6692360133381a"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version sqlite3_sourceid
131 **
132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.17.0"
125 #define SQLITE_VERSION_NUMBER 3017000
126 #define SQLITE_SOURCE_ID "2017-02-13 16:02:40 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version sqlite3_sourceid
131 **
132
M www/changes.wiki
+5
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,7 +1,12 @@
11
 <title>Change Log</title>
22
3
+<a name='v1_38'></a>
4
+<h2>Changes for Version 1.38 (2017-??-??)</h2>
5
+
6
+ * Update the built-in SQLite to version 3.17.0.
7
+
38
 <a name='v1_37'></a>
49
 <h2>Changes for Version 1.37 (2017-01-16)</h2>
510
611
 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
712
 this technote] for more information. To get the checkboxes to look as
813
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,7 +1,12 @@
1 <title>Change Log</title>
2
 
 
 
 
 
3 <a name='v1_37'></a>
4 <h2>Changes for Version 1.37 (2017-01-16)</h2>
5
6 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
7 this technote] for more information. To get the checkboxes to look as
8
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,7 +1,12 @@
1 <title>Change Log</title>
2
3 <a name='v1_38'></a>
4 <h2>Changes for Version 1.38 (2017-??-??)</h2>
5
6 * Update the built-in SQLite to version 3.17.0.
7
8 <a name='v1_37'></a>
9 <h2>Changes for Version 1.37 (2017-01-16)</h2>
10
11 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
12 this technote] for more information. To get the checkboxes to look as
13

Keyboard Shortcuts

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