Fossil SCM

Incorporate the official release of SQLite version 3.26.0

drh 2018-12-01 13:00 trunk
Commit e0a6ff0adb3da82864dc84db32933fff4b877b27932b7a964c5d3f980b9b20f3
Parent 572574d1a70a224…
2 files changed +10 -10 +3 -3
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+10 -10
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
11621162
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11631163
 ** [sqlite_version()] and [sqlite_source_id()].
11641164
 */
11651165
 #define SQLITE_VERSION "3.26.0"
11661166
 #define SQLITE_VERSION_NUMBER 3026000
1167
-#define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771"
1167
+#define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9"
11681168
11691169
 /*
11701170
 ** CAPI3REF: Run-Time Library Version Numbers
11711171
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11721172
 **
@@ -4670,11 +4670,11 @@
46704670
 **
46714671
 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
46724672
 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
46734673
 ** representation of the SQL statement should be calculated and then
46744674
 ** associated with the prepared statement, which can be obtained via
4675
-** the [sqlite3_normalized_sql()] interface. The semantics used to
4675
+** the [sqlite3_normalized_sql()] interface.)^ The semantics used to
46764676
 ** normalize a SQL statement are unspecified and subject to change.
46774677
 ** At a minimum, literal values will be replaced with suitable
46784678
 ** placeholders.
46794679
 ** </dl>
46804680
 */
@@ -10462,11 +10462,11 @@
1046210462
 int iLevel; /* Level of current node or entry */
1046310463
 int mxLevel; /* The largest iLevel value in the tree */
1046410464
 sqlite3_int64 iRowid; /* Rowid for current entry */
1046510465
 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
1046610466
 int eParentWithin; /* Visibility of parent node */
10467
- int eWithin; /* OUT: Visiblity */
10467
+ int eWithin; /* OUT: Visibility */
1046810468
 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
1046910469
 /* The following fields are only available in 3.8.11 and later */
1047010470
 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
1047110471
 };
1047210472
@@ -183917,19 +183917,19 @@
183917183917
 }
183918183918
 }
183919183919
183920183920
 #define GEOPOLY_PI 3.1415926535897932385
183921183921
183922
-/* Fast approximation for cosine(X) for X between -0.5*pi and 2*pi
183922
+/* Fast approximation for sine(X) for X between -0.5*pi and 2*pi
183923183923
 */
183924
-static double geopolyCosine(double r){
183924
+static double geopolySine(double r){
183925183925
 assert( r>=-0.5*GEOPOLY_PI && r<=2.0*GEOPOLY_PI );
183926183926
 if( r>=1.5*GEOPOLY_PI ){
183927183927
 r -= 2.0*GEOPOLY_PI;
183928183928
 }
183929183929
 if( r>=0.5*GEOPOLY_PI ){
183930
- return -geopolyCosine(r-GEOPOLY_PI);
183930
+ return -geopolySine(r-GEOPOLY_PI);
183931183931
 }else{
183932183932
 double r2 = r*r;
183933183933
 double r3 = r2*r;
183934183934
 double r5 = r3*r2;
183935183935
 return 0.9996949*r - 0.1656700*r3 + 0.0075134*r5;
@@ -183966,12 +183966,12 @@
183966183966
 p->hdr[1] = 0;
183967183967
 p->hdr[2] = (n>>8)&0xff;
183968183968
 p->hdr[3] = n&0xff;
183969183969
 for(i=0; i<n; i++){
183970183970
 double rAngle = 2.0*GEOPOLY_PI*i/n;
183971
- p->a[i*2] = x - r*geopolyCosine(rAngle-0.5*GEOPOLY_PI);
183972
- p->a[i*2+1] = y + r*geopolyCosine(rAngle);
183971
+ p->a[i*2] = x - r*geopolySine(rAngle-0.5*GEOPOLY_PI);
183972
+ p->a[i*2+1] = y + r*geopolySine(rAngle);
183973183973
 }
183974183974
 sqlite3_result_blob(context, p->hdr, 4+8*n, SQLITE_TRANSIENT);
183975183975
 sqlite3_free(p);
183976183976
 }
183977183977
@@ -215794,11 +215794,11 @@
215794215794
 int nArg, /* Number of args */
215795215795
 sqlite3_value **apUnused /* Function arguments */
215796215796
 ){
215797215797
 assert( nArg==0 );
215798215798
 UNUSED_PARAM2(nArg, apUnused);
215799
- sqlite3_result_text(pCtx, "fts5: 2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771", -1, SQLITE_TRANSIENT);
215799
+ sqlite3_result_text(pCtx, "fts5: 2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9", -1, SQLITE_TRANSIENT);
215800215800
 }
215801215801
215802215802
 /*
215803215803
 ** Return true if zName is the extension on one of the shadow tables used
215804215804
 ** by this module.
@@ -220524,10 +220524,10 @@
220524220524
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
220525220525
220526220526
 /************** End of stmt.c ************************************************/
220527220527
 #if __LINE__!=220527
220528220528
 #undef SQLITE_SOURCE_ID
220529
-#define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a7alt2"
220529
+#define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238alt2"
220530220530
 #endif
220531220531
 /* Return the source-id for this library */
220532220532
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
220533220533
 /************************** End of sqlite3.c ******************************/
220534220534
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.26.0"
1166 #define SQLITE_VERSION_NUMBER 3026000
1167 #define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -4670,11 +4670,11 @@
4670 **
4671 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
4672 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
4673 ** representation of the SQL statement should be calculated and then
4674 ** associated with the prepared statement, which can be obtained via
4675 ** the [sqlite3_normalized_sql()] interface. The semantics used to
4676 ** normalize a SQL statement are unspecified and subject to change.
4677 ** At a minimum, literal values will be replaced with suitable
4678 ** placeholders.
4679 ** </dl>
4680 */
@@ -10462,11 +10462,11 @@
10462 int iLevel; /* Level of current node or entry */
10463 int mxLevel; /* The largest iLevel value in the tree */
10464 sqlite3_int64 iRowid; /* Rowid for current entry */
10465 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
10466 int eParentWithin; /* Visibility of parent node */
10467 int eWithin; /* OUT: Visiblity */
10468 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
10469 /* The following fields are only available in 3.8.11 and later */
10470 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
10471 };
10472
@@ -183917,19 +183917,19 @@
183917 }
183918 }
183919
183920 #define GEOPOLY_PI 3.1415926535897932385
183921
183922 /* Fast approximation for cosine(X) for X between -0.5*pi and 2*pi
183923 */
183924 static double geopolyCosine(double r){
183925 assert( r>=-0.5*GEOPOLY_PI && r<=2.0*GEOPOLY_PI );
183926 if( r>=1.5*GEOPOLY_PI ){
183927 r -= 2.0*GEOPOLY_PI;
183928 }
183929 if( r>=0.5*GEOPOLY_PI ){
183930 return -geopolyCosine(r-GEOPOLY_PI);
183931 }else{
183932 double r2 = r*r;
183933 double r3 = r2*r;
183934 double r5 = r3*r2;
183935 return 0.9996949*r - 0.1656700*r3 + 0.0075134*r5;
@@ -183966,12 +183966,12 @@
183966 p->hdr[1] = 0;
183967 p->hdr[2] = (n>>8)&0xff;
183968 p->hdr[3] = n&0xff;
183969 for(i=0; i<n; i++){
183970 double rAngle = 2.0*GEOPOLY_PI*i/n;
183971 p->a[i*2] = x - r*geopolyCosine(rAngle-0.5*GEOPOLY_PI);
183972 p->a[i*2+1] = y + r*geopolyCosine(rAngle);
183973 }
183974 sqlite3_result_blob(context, p->hdr, 4+8*n, SQLITE_TRANSIENT);
183975 sqlite3_free(p);
183976 }
183977
@@ -215794,11 +215794,11 @@
215794 int nArg, /* Number of args */
215795 sqlite3_value **apUnused /* Function arguments */
215796 ){
215797 assert( nArg==0 );
215798 UNUSED_PARAM2(nArg, apUnused);
215799 sqlite3_result_text(pCtx, "fts5: 2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771", -1, SQLITE_TRANSIENT);
215800 }
215801
215802 /*
215803 ** Return true if zName is the extension on one of the shadow tables used
215804 ** by this module.
@@ -220524,10 +220524,10 @@
220524 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
220525
220526 /************** End of stmt.c ************************************************/
220527 #if __LINE__!=220527
220528 #undef SQLITE_SOURCE_ID
220529 #define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a7alt2"
220530 #endif
220531 /* Return the source-id for this library */
220532 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
220533 /************************** End of sqlite3.c ******************************/
220534
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.26.0"
1166 #define SQLITE_VERSION_NUMBER 3026000
1167 #define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -4670,11 +4670,11 @@
4670 **
4671 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
4672 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
4673 ** representation of the SQL statement should be calculated and then
4674 ** associated with the prepared statement, which can be obtained via
4675 ** the [sqlite3_normalized_sql()] interface.)^ The semantics used to
4676 ** normalize a SQL statement are unspecified and subject to change.
4677 ** At a minimum, literal values will be replaced with suitable
4678 ** placeholders.
4679 ** </dl>
4680 */
@@ -10462,11 +10462,11 @@
10462 int iLevel; /* Level of current node or entry */
10463 int mxLevel; /* The largest iLevel value in the tree */
10464 sqlite3_int64 iRowid; /* Rowid for current entry */
10465 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
10466 int eParentWithin; /* Visibility of parent node */
10467 int eWithin; /* OUT: Visibility */
10468 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
10469 /* The following fields are only available in 3.8.11 and later */
10470 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
10471 };
10472
@@ -183917,19 +183917,19 @@
183917 }
183918 }
183919
183920 #define GEOPOLY_PI 3.1415926535897932385
183921
183922 /* Fast approximation for sine(X) for X between -0.5*pi and 2*pi
183923 */
183924 static double geopolySine(double r){
183925 assert( r>=-0.5*GEOPOLY_PI && r<=2.0*GEOPOLY_PI );
183926 if( r>=1.5*GEOPOLY_PI ){
183927 r -= 2.0*GEOPOLY_PI;
183928 }
183929 if( r>=0.5*GEOPOLY_PI ){
183930 return -geopolySine(r-GEOPOLY_PI);
183931 }else{
183932 double r2 = r*r;
183933 double r3 = r2*r;
183934 double r5 = r3*r2;
183935 return 0.9996949*r - 0.1656700*r3 + 0.0075134*r5;
@@ -183966,12 +183966,12 @@
183966 p->hdr[1] = 0;
183967 p->hdr[2] = (n>>8)&0xff;
183968 p->hdr[3] = n&0xff;
183969 for(i=0; i<n; i++){
183970 double rAngle = 2.0*GEOPOLY_PI*i/n;
183971 p->a[i*2] = x - r*geopolySine(rAngle-0.5*GEOPOLY_PI);
183972 p->a[i*2+1] = y + r*geopolySine(rAngle);
183973 }
183974 sqlite3_result_blob(context, p->hdr, 4+8*n, SQLITE_TRANSIENT);
183975 sqlite3_free(p);
183976 }
183977
@@ -215794,11 +215794,11 @@
215794 int nArg, /* Number of args */
215795 sqlite3_value **apUnused /* Function arguments */
215796 ){
215797 assert( nArg==0 );
215798 UNUSED_PARAM2(nArg, apUnused);
215799 sqlite3_result_text(pCtx, "fts5: 2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9", -1, SQLITE_TRANSIENT);
215800 }
215801
215802 /*
215803 ** Return true if zName is the extension on one of the shadow tables used
215804 ** by this module.
@@ -220524,10 +220524,10 @@
220524 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
220525
220526 /************** End of stmt.c ************************************************/
220527 #if __LINE__!=220527
220528 #undef SQLITE_SOURCE_ID
220529 #define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238alt2"
220530 #endif
220531 /* Return the source-id for this library */
220532 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
220533 /************************** End of sqlite3.c ******************************/
220534
M src/sqlite3.h
+3 -3
--- 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.26.0"
127127
 #define SQLITE_VERSION_NUMBER 3026000
128
-#define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771"
128
+#define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
@@ -3631,11 +3631,11 @@
36313631
 **
36323632
 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
36333633
 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
36343634
 ** representation of the SQL statement should be calculated and then
36353635
 ** associated with the prepared statement, which can be obtained via
3636
-** the [sqlite3_normalized_sql()] interface. The semantics used to
3636
+** the [sqlite3_normalized_sql()] interface.)^ The semantics used to
36373637
 ** normalize a SQL statement are unspecified and subject to change.
36383638
 ** At a minimum, literal values will be replaced with suitable
36393639
 ** placeholders.
36403640
 ** </dl>
36413641
 */
@@ -9423,11 +9423,11 @@
94239423
 int iLevel; /* Level of current node or entry */
94249424
 int mxLevel; /* The largest iLevel value in the tree */
94259425
 sqlite3_int64 iRowid; /* Rowid for current entry */
94269426
 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
94279427
 int eParentWithin; /* Visibility of parent node */
9428
- int eWithin; /* OUT: Visiblity */
9428
+ int eWithin; /* OUT: Visibility */
94299429
 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
94309430
 /* The following fields are only available in 3.8.11 and later */
94319431
 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
94329432
 };
94339433
94349434
--- 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.26.0"
127 #define SQLITE_VERSION_NUMBER 3026000
128 #define SQLITE_SOURCE_ID "2018-11-28 11:49:46 b53a9a3dc6b0422a102b245451769b0cd8c0d67090fefabf7cb3a65137a73771"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
@@ -3631,11 +3631,11 @@
3631 **
3632 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
3633 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
3634 ** representation of the SQL statement should be calculated and then
3635 ** associated with the prepared statement, which can be obtained via
3636 ** the [sqlite3_normalized_sql()] interface. The semantics used to
3637 ** normalize a SQL statement are unspecified and subject to change.
3638 ** At a minimum, literal values will be replaced with suitable
3639 ** placeholders.
3640 ** </dl>
3641 */
@@ -9423,11 +9423,11 @@
9423 int iLevel; /* Level of current node or entry */
9424 int mxLevel; /* The largest iLevel value in the tree */
9425 sqlite3_int64 iRowid; /* Rowid for current entry */
9426 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
9427 int eParentWithin; /* Visibility of parent node */
9428 int eWithin; /* OUT: Visiblity */
9429 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
9430 /* The following fields are only available in 3.8.11 and later */
9431 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
9432 };
9433
9434
--- 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.26.0"
127 #define SQLITE_VERSION_NUMBER 3026000
128 #define SQLITE_SOURCE_ID "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
@@ -3631,11 +3631,11 @@
3631 **
3632 ** [[SQLITE_PREPARE_NORMALIZE]] ^(<dt>SQLITE_PREPARE_NORMALIZE</dt>
3633 ** <dd>The SQLITE_PREPARE_NORMALIZE flag indicates that a normalized
3634 ** representation of the SQL statement should be calculated and then
3635 ** associated with the prepared statement, which can be obtained via
3636 ** the [sqlite3_normalized_sql()] interface.)^ The semantics used to
3637 ** normalize a SQL statement are unspecified and subject to change.
3638 ** At a minimum, literal values will be replaced with suitable
3639 ** placeholders.
3640 ** </dl>
3641 */
@@ -9423,11 +9423,11 @@
9423 int iLevel; /* Level of current node or entry */
9424 int mxLevel; /* The largest iLevel value in the tree */
9425 sqlite3_int64 iRowid; /* Rowid for current entry */
9426 sqlite3_rtree_dbl rParentScore; /* Score of parent node */
9427 int eParentWithin; /* Visibility of parent node */
9428 int eWithin; /* OUT: Visibility */
9429 sqlite3_rtree_dbl rScore; /* OUT: Write the score here */
9430 /* The following fields are only available in 3.8.11 and later */
9431 sqlite3_value **apSqlParam; /* Original SQL values of parameters */
9432 };
9433
9434

Keyboard Shortcuts

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