Fossil SCM

Update the built-in SQLite to include the change that makes "main" an acceptable alias for the primary database, even if the primary database has been renamed to "repository" or "localdb".

drh 2016-12-24 19:38 trunk
Commit 0d28198d0394ab8e590afc3f29444ed610925704
Parent 277774b49e810b8…
2 files changed +7 -11 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+7 -11
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381381
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382382
 ** [sqlite_version()] and [sqlite_source_id()].
383383
 */
384384
 #define SQLITE_VERSION "3.16.0"
385385
 #define SQLITE_VERSION_NUMBER 3016000
386
-#define SQLITE_SOURCE_ID "2016-12-23 16:05:22 2940661b8c014b94973e05c44f1b1f4f443dbdd3"
386
+#define SQLITE_SOURCE_ID "2016-12-24 19:37:16 2f481b854f04bec546eb172d1b6dbc88067d3fda"
387387
388388
 /*
389389
 ** CAPI3REF: Run-Time Library Version Numbers
390390
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
391391
 **
@@ -99545,11 +99545,14 @@
9954599545
 SQLITE_PRIVATE int sqlite3FindDbName(sqlite3 *db, const char *zName){
9954699546
 int i = -1; /* Database number */
9954799547
 if( zName ){
9954899548
 Db *pDb;
9954999549
 for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
99550
- if( 0==sqlite3StrICmp(pDb->zDbSName, zName) ) break;
99550
+ if( 0==sqlite3_stricmp(pDb->zDbSName, zName) ) break;
99551
+ /* "main" is always an acceptable alias for the primary database
99552
+ ** even if it has been renamed using SQLITE_DBCONFIG_MAINDBNAME. */
99553
+ if( i==0 && 0==sqlite3_stricmp("main", zName) ) break;
9955199554
 }
9955299555
 }
9955399556
 return i;
9955499557
 }
9955599558
@@ -142803,19 +142806,12 @@
142803142806
142804142807
 /*
142805142808
 ** Return the Btree pointer identified by zDbName. Return NULL if not found.
142806142809
 */
142807142810
 SQLITE_PRIVATE Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){
142808
- int i;
142809
- for(i=0; i<db->nDb; i++){
142810
- if( db->aDb[i].pBt
142811
- && (zDbName==0 || sqlite3StrICmp(zDbName, db->aDb[i].zDbSName)==0)
142812
- ){
142813
- return db->aDb[i].pBt;
142814
- }
142815
- }
142816
- return 0;
142811
+ int iDb = zDbName ? sqlite3FindDbName(db, zDbName) : 0;
142812
+ return iDb<0 ? 0 : db->aDb[iDb].pBt;
142817142813
 }
142818142814
142819142815
 /*
142820142816
 ** Return the filename of the database associated with a database
142821142817
 ** connection.
142822142818
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.16.0"
385 #define SQLITE_VERSION_NUMBER 3016000
386 #define SQLITE_SOURCE_ID "2016-12-23 16:05:22 2940661b8c014b94973e05c44f1b1f4f443dbdd3"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version sqlite3_sourceid
391 **
@@ -99545,11 +99545,14 @@
99545 SQLITE_PRIVATE int sqlite3FindDbName(sqlite3 *db, const char *zName){
99546 int i = -1; /* Database number */
99547 if( zName ){
99548 Db *pDb;
99549 for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
99550 if( 0==sqlite3StrICmp(pDb->zDbSName, zName) ) break;
 
 
 
99551 }
99552 }
99553 return i;
99554 }
99555
@@ -142803,19 +142806,12 @@
142803
142804 /*
142805 ** Return the Btree pointer identified by zDbName. Return NULL if not found.
142806 */
142807 SQLITE_PRIVATE Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){
142808 int i;
142809 for(i=0; i<db->nDb; i++){
142810 if( db->aDb[i].pBt
142811 && (zDbName==0 || sqlite3StrICmp(zDbName, db->aDb[i].zDbSName)==0)
142812 ){
142813 return db->aDb[i].pBt;
142814 }
142815 }
142816 return 0;
142817 }
142818
142819 /*
142820 ** Return the filename of the database associated with a database
142821 ** connection.
142822
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.16.0"
385 #define SQLITE_VERSION_NUMBER 3016000
386 #define SQLITE_SOURCE_ID "2016-12-24 19:37:16 2f481b854f04bec546eb172d1b6dbc88067d3fda"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version sqlite3_sourceid
391 **
@@ -99545,11 +99545,14 @@
99545 SQLITE_PRIVATE int sqlite3FindDbName(sqlite3 *db, const char *zName){
99546 int i = -1; /* Database number */
99547 if( zName ){
99548 Db *pDb;
99549 for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
99550 if( 0==sqlite3_stricmp(pDb->zDbSName, zName) ) break;
99551 /* "main" is always an acceptable alias for the primary database
99552 ** even if it has been renamed using SQLITE_DBCONFIG_MAINDBNAME. */
99553 if( i==0 && 0==sqlite3_stricmp("main", zName) ) break;
99554 }
99555 }
99556 return i;
99557 }
99558
@@ -142803,19 +142806,12 @@
142806
142807 /*
142808 ** Return the Btree pointer identified by zDbName. Return NULL if not found.
142809 */
142810 SQLITE_PRIVATE Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){
142811 int iDb = zDbName ? sqlite3FindDbName(db, zDbName) : 0;
142812 return iDb<0 ? 0 : db->aDb[iDb].pBt;
 
 
 
 
 
 
 
142813 }
142814
142815 /*
142816 ** Return the filename of the database associated with a database
142817 ** connection.
142818
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.16.0"
125125
 #define SQLITE_VERSION_NUMBER 3016000
126
-#define SQLITE_SOURCE_ID "2016-12-23 16:05:22 2940661b8c014b94973e05c44f1b1f4f443dbdd3"
126
+#define SQLITE_SOURCE_ID "2016-12-24 19:37:16 2f481b854f04bec546eb172d1b6dbc88067d3fda"
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.16.0"
125 #define SQLITE_VERSION_NUMBER 3016000
126 #define SQLITE_SOURCE_ID "2016-12-23 16:05:22 2940661b8c014b94973e05c44f1b1f4f443dbdd3"
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.16.0"
125 #define SQLITE_VERSION_NUMBER 3016000
126 #define SQLITE_SOURCE_ID "2016-12-24 19:37:16 2f481b854f04bec546eb172d1b6dbc88067d3fda"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version sqlite3_sourceid
131 **
132

Keyboard Shortcuts

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