Fossil SCM
Minor tweaks to the aux-schema management logic.
Commit
a7caaea55981c62f1a55be5b74c5dde4938f3428
Parent
2a715a89a005397…
2 files changed
+2
-2
+1
-1
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1117,11 +1117,11 @@ | ||
| 1117 | 1117 | |
| 1118 | 1118 | /* |
| 1119 | 1119 | ** Return TRUE if the schema is out-of-date |
| 1120 | 1120 | */ |
| 1121 | 1121 | int db_schema_is_outofdate(void){ |
| 1122 | - g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'"); | |
| 1122 | + if( g.zAuxSchema==0 ) g.zAuxSchema = db_get("aux-schema",""); | |
| 1123 | 1123 | return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0 |
| 1124 | 1124 | || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0; |
| 1125 | 1125 | } |
| 1126 | 1126 | |
| 1127 | 1127 | /* |
| @@ -1141,11 +1141,11 @@ | ||
| 1141 | 1141 | g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD; |
| 1142 | 1142 | #endif |
| 1143 | 1143 | fossil_warning("incorrect repository schema version: " |
| 1144 | 1144 | "current repository schema version is \"%s\" " |
| 1145 | 1145 | "but need versions between \"%s\" and \"%s\".", |
| 1146 | - db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX); | |
| 1146 | + g.zAuxSchema, AUX_SCHEMA_MIN, AUX_SCHEMA_MAX); | |
| 1147 | 1147 | fossil_fatal("run \"fossil rebuild\" to fix this problem"); |
| 1148 | 1148 | } |
| 1149 | 1149 | } |
| 1150 | 1150 | |
| 1151 | 1151 | |
| 1152 | 1152 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1117,11 +1117,11 @@ | |
| 1117 | |
| 1118 | /* |
| 1119 | ** Return TRUE if the schema is out-of-date |
| 1120 | */ |
| 1121 | int db_schema_is_outofdate(void){ |
| 1122 | g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'"); |
| 1123 | return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0 |
| 1124 | || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0; |
| 1125 | } |
| 1126 | |
| 1127 | /* |
| @@ -1141,11 +1141,11 @@ | |
| 1141 | g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD; |
| 1142 | #endif |
| 1143 | fossil_warning("incorrect repository schema version: " |
| 1144 | "current repository schema version is \"%s\" " |
| 1145 | "but need versions between \"%s\" and \"%s\".", |
| 1146 | db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX); |
| 1147 | fossil_fatal("run \"fossil rebuild\" to fix this problem"); |
| 1148 | } |
| 1149 | } |
| 1150 | |
| 1151 | |
| 1152 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1117,11 +1117,11 @@ | |
| 1117 | |
| 1118 | /* |
| 1119 | ** Return TRUE if the schema is out-of-date |
| 1120 | */ |
| 1121 | int db_schema_is_outofdate(void){ |
| 1122 | if( g.zAuxSchema==0 ) g.zAuxSchema = db_get("aux-schema",""); |
| 1123 | return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0 |
| 1124 | || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0; |
| 1125 | } |
| 1126 | |
| 1127 | /* |
| @@ -1141,11 +1141,11 @@ | |
| 1141 | g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD; |
| 1142 | #endif |
| 1143 | fossil_warning("incorrect repository schema version: " |
| 1144 | "current repository schema version is \"%s\" " |
| 1145 | "but need versions between \"%s\" and \"%s\".", |
| 1146 | g.zAuxSchema, AUX_SCHEMA_MIN, AUX_SCHEMA_MAX); |
| 1147 | fossil_fatal("run \"fossil rebuild\" to fix this problem"); |
| 1148 | } |
| 1149 | } |
| 1150 | |
| 1151 | |
| 1152 |
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1781,11 +1781,11 @@ | ||
| 1781 | 1781 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "%d", |
| 1782 | 1782 | uuid_to_rid(p->zBaseline,1)); |
| 1783 | 1783 | }else{ |
| 1784 | 1784 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "NULL"); |
| 1785 | 1785 | } |
| 1786 | - if( g.zAuxSchema==0 ) (void)db_schema_is_outofdate(); | |
| 1786 | + (void)db_schema_is_outofdate(); /* Make sure g.zAuxSchema is initialized */ | |
| 1787 | 1787 | for(i=0; i<p->nParent; i++){ |
| 1788 | 1788 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1789 | 1789 | if( strcmp(g.zAuxSchema,"2014-11-24 20:35")>=0 ){ |
| 1790 | 1790 | /* Support for PLINK.BASEID added on 2014-11-24 */ |
| 1791 | 1791 | db_multi_exec( |
| 1792 | 1792 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1781,11 +1781,11 @@ | |
| 1781 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "%d", |
| 1782 | uuid_to_rid(p->zBaseline,1)); |
| 1783 | }else{ |
| 1784 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "NULL"); |
| 1785 | } |
| 1786 | if( g.zAuxSchema==0 ) (void)db_schema_is_outofdate(); |
| 1787 | for(i=0; i<p->nParent; i++){ |
| 1788 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1789 | if( strcmp(g.zAuxSchema,"2014-11-24 20:35")>=0 ){ |
| 1790 | /* Support for PLINK.BASEID added on 2014-11-24 */ |
| 1791 | db_multi_exec( |
| 1792 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1781,11 +1781,11 @@ | |
| 1781 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "%d", |
| 1782 | uuid_to_rid(p->zBaseline,1)); |
| 1783 | }else{ |
| 1784 | sqlite3_snprintf(sizeof(zBaseId), zBaseId, "NULL"); |
| 1785 | } |
| 1786 | (void)db_schema_is_outofdate(); /* Make sure g.zAuxSchema is initialized */ |
| 1787 | for(i=0; i<p->nParent; i++){ |
| 1788 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1789 | if( strcmp(g.zAuxSchema,"2014-11-24 20:35")>=0 ){ |
| 1790 | /* Support for PLINK.BASEID added on 2014-11-24 */ |
| 1791 | db_multi_exec( |
| 1792 |