Fossil SCM

Merge baseline-in-plink enhancements that allow operation with older aux-schema format without having to rebuild.

drh 2014-11-28 14:48 UTC DBP-workflow merge
Commit 47162426494e60fd7365c5c4a3ec9ca2663a9231
Parent 9c0d5cd895dcb9d…
8 files changed +1 -1 +8 -8 +8 -8 +2 -1 +15 -4 +1 -1 +2 -1 +2 -1
~ src/clone.c ~ src/db.c ~ src/db.c ~ src/main.c ~ src/manifest.c ~ src/rebuild.c ~ src/schema.c ~ src/schema.c
M src/clone.c
+1 -1
--- src/clone.c
+++ src/clone.c
@@ -164,11 +164,11 @@
164164
 db_begin_transaction();
165165
 db_record_repository_filename(g.argv[3]);
166166
 db_initial_setup(0, 0, zDefaultUser, 0);
167167
 user_select();
168168
 db_set("content-schema", CONTENT_SCHEMA, 0);
169
- db_set("aux-schema", AUX_SCHEMA, 0);
169
+ db_set("aux-schema", AUX_SCHEMA_MAX, 0);
170170
 db_set("rebuilt", get_version(), 0);
171171
 remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
172172
 url_remember();
173173
 if( g.zSSLIdentity!=0 ){
174174
 /* If the --ssl-identity option was specified, store it as a setting */
175175
--- src/clone.c
+++ src/clone.c
@@ -164,11 +164,11 @@
164 db_begin_transaction();
165 db_record_repository_filename(g.argv[3]);
166 db_initial_setup(0, 0, zDefaultUser, 0);
167 user_select();
168 db_set("content-schema", CONTENT_SCHEMA, 0);
169 db_set("aux-schema", AUX_SCHEMA, 0);
170 db_set("rebuilt", get_version(), 0);
171 remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
172 url_remember();
173 if( g.zSSLIdentity!=0 ){
174 /* If the --ssl-identity option was specified, store it as a setting */
175
--- src/clone.c
+++ src/clone.c
@@ -164,11 +164,11 @@
164 db_begin_transaction();
165 db_record_repository_filename(g.argv[3]);
166 db_initial_setup(0, 0, zDefaultUser, 0);
167 user_select();
168 db_set("content-schema", CONTENT_SCHEMA, 0);
169 db_set("aux-schema", AUX_SCHEMA_MAX, 0);
170 db_set("rebuilt", get_version(), 0);
171 remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
172 url_remember();
173 if( g.zSSLIdentity!=0 ){
174 /* If the --ssl-identity option was specified, store it as a setting */
175
M src/db.c
+8 -8
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
11601160
11611161
 /*
11621162
 ** Return TRUE if the schema is out-of-date
11631163
 */
11641164
 int db_schema_is_outofdate(void){
1165
- return db_exists("SELECT 1 FROM config"
1166
- " WHERE name='aux-schema'"
1167
- " AND value<>%Q", AUX_SCHEMA);
1165
+ g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'");
1166
+ return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0
1167
+ || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0;
11681168
 }
11691169
11701170
 /*
11711171
 ** Return true if the database is writeable
11721172
 */
@@ -1181,14 +1181,14 @@
11811181
 void db_verify_schema(void){
11821182
 if( db_schema_is_outofdate() ){
11831183
 #ifdef FOSSIL_ENABLE_JSON
11841184
 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
11851185
 #endif
1186
- fossil_warning("incorrect repository schema version");
1187
- fossil_warning("your repository has schema version \"%s\" "
1188
- "but this binary expects version \"%s\"",
1189
- db_get("aux-schema",0), AUX_SCHEMA);
1186
+ fossil_warning("incorrect repository schema version: "
1187
+ "current repository schema version is \"%s\" "
1188
+ "but need versions between \"%s\" and \"%s\".",
1189
+ db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX);
11901190
 fossil_fatal("run \"fossil rebuild\" to fix this problem");
11911191
 }
11921192
 }
11931193
11941194
@@ -1436,11 +1436,11 @@
14361436
 char *zDate;
14371437
 Blob hash;
14381438
 Blob manifest;
14391439
14401440
 db_set("content-schema", CONTENT_SCHEMA, 0);
1441
- db_set("aux-schema", AUX_SCHEMA, 0);
1441
+ db_set("aux-schema", AUX_SCHEMA_MAX, 0);
14421442
 db_set("rebuilt", get_version(), 0);
14431443
 if( makeServerCodes ){
14441444
 db_setup_server_and_project_codes(0);
14451445
 }
14461446
 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
14471447
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
1160
1161 /*
1162 ** Return TRUE if the schema is out-of-date
1163 */
1164 int db_schema_is_outofdate(void){
1165 return db_exists("SELECT 1 FROM config"
1166 " WHERE name='aux-schema'"
1167 " AND value<>%Q", AUX_SCHEMA);
1168 }
1169
1170 /*
1171 ** Return true if the database is writeable
1172 */
@@ -1181,14 +1181,14 @@
1181 void db_verify_schema(void){
1182 if( db_schema_is_outofdate() ){
1183 #ifdef FOSSIL_ENABLE_JSON
1184 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
1185 #endif
1186 fossil_warning("incorrect repository schema version");
1187 fossil_warning("your repository has schema version \"%s\" "
1188 "but this binary expects version \"%s\"",
1189 db_get("aux-schema",0), AUX_SCHEMA);
1190 fossil_fatal("run \"fossil rebuild\" to fix this problem");
1191 }
1192 }
1193
1194
@@ -1436,11 +1436,11 @@
1436 char *zDate;
1437 Blob hash;
1438 Blob manifest;
1439
1440 db_set("content-schema", CONTENT_SCHEMA, 0);
1441 db_set("aux-schema", AUX_SCHEMA, 0);
1442 db_set("rebuilt", get_version(), 0);
1443 if( makeServerCodes ){
1444 db_setup_server_and_project_codes(0);
1445 }
1446 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1447
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
1160
1161 /*
1162 ** Return TRUE if the schema is out-of-date
1163 */
1164 int db_schema_is_outofdate(void){
1165 g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'");
1166 return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0
1167 || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0;
1168 }
1169
1170 /*
1171 ** Return true if the database is writeable
1172 */
@@ -1181,14 +1181,14 @@
1181 void db_verify_schema(void){
1182 if( db_schema_is_outofdate() ){
1183 #ifdef FOSSIL_ENABLE_JSON
1184 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
1185 #endif
1186 fossil_warning("incorrect repository schema version: "
1187 "current repository schema version is \"%s\" "
1188 "but need versions between \"%s\" and \"%s\".",
1189 db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX);
1190 fossil_fatal("run \"fossil rebuild\" to fix this problem");
1191 }
1192 }
1193
1194
@@ -1436,11 +1436,11 @@
1436 char *zDate;
1437 Blob hash;
1438 Blob manifest;
1439
1440 db_set("content-schema", CONTENT_SCHEMA, 0);
1441 db_set("aux-schema", AUX_SCHEMA_MAX, 0);
1442 db_set("rebuilt", get_version(), 0);
1443 if( makeServerCodes ){
1444 db_setup_server_and_project_codes(0);
1445 }
1446 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1447
M src/db.c
+8 -8
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
11601160
11611161
 /*
11621162
 ** Return TRUE if the schema is out-of-date
11631163
 */
11641164
 int db_schema_is_outofdate(void){
1165
- return db_exists("SELECT 1 FROM config"
1166
- " WHERE name='aux-schema'"
1167
- " AND value<>%Q", AUX_SCHEMA);
1165
+ g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'");
1166
+ return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0
1167
+ || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0;
11681168
 }
11691169
11701170
 /*
11711171
 ** Return true if the database is writeable
11721172
 */
@@ -1181,14 +1181,14 @@
11811181
 void db_verify_schema(void){
11821182
 if( db_schema_is_outofdate() ){
11831183
 #ifdef FOSSIL_ENABLE_JSON
11841184
 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
11851185
 #endif
1186
- fossil_warning("incorrect repository schema version");
1187
- fossil_warning("your repository has schema version \"%s\" "
1188
- "but this binary expects version \"%s\"",
1189
- db_get("aux-schema",0), AUX_SCHEMA);
1186
+ fossil_warning("incorrect repository schema version: "
1187
+ "current repository schema version is \"%s\" "
1188
+ "but need versions between \"%s\" and \"%s\".",
1189
+ db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX);
11901190
 fossil_fatal("run \"fossil rebuild\" to fix this problem");
11911191
 }
11921192
 }
11931193
11941194
@@ -1436,11 +1436,11 @@
14361436
 char *zDate;
14371437
 Blob hash;
14381438
 Blob manifest;
14391439
14401440
 db_set("content-schema", CONTENT_SCHEMA, 0);
1441
- db_set("aux-schema", AUX_SCHEMA, 0);
1441
+ db_set("aux-schema", AUX_SCHEMA_MAX, 0);
14421442
 db_set("rebuilt", get_version(), 0);
14431443
 if( makeServerCodes ){
14441444
 db_setup_server_and_project_codes(0);
14451445
 }
14461446
 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
14471447
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
1160
1161 /*
1162 ** Return TRUE if the schema is out-of-date
1163 */
1164 int db_schema_is_outofdate(void){
1165 return db_exists("SELECT 1 FROM config"
1166 " WHERE name='aux-schema'"
1167 " AND value<>%Q", AUX_SCHEMA);
1168 }
1169
1170 /*
1171 ** Return true if the database is writeable
1172 */
@@ -1181,14 +1181,14 @@
1181 void db_verify_schema(void){
1182 if( db_schema_is_outofdate() ){
1183 #ifdef FOSSIL_ENABLE_JSON
1184 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
1185 #endif
1186 fossil_warning("incorrect repository schema version");
1187 fossil_warning("your repository has schema version \"%s\" "
1188 "but this binary expects version \"%s\"",
1189 db_get("aux-schema",0), AUX_SCHEMA);
1190 fossil_fatal("run \"fossil rebuild\" to fix this problem");
1191 }
1192 }
1193
1194
@@ -1436,11 +1436,11 @@
1436 char *zDate;
1437 Blob hash;
1438 Blob manifest;
1439
1440 db_set("content-schema", CONTENT_SCHEMA, 0);
1441 db_set("aux-schema", AUX_SCHEMA, 0);
1442 db_set("rebuilt", get_version(), 0);
1443 if( makeServerCodes ){
1444 db_setup_server_and_project_codes(0);
1445 }
1446 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1447
--- src/db.c
+++ src/db.c
@@ -1160,13 +1160,13 @@
1160
1161 /*
1162 ** Return TRUE if the schema is out-of-date
1163 */
1164 int db_schema_is_outofdate(void){
1165 g.zAuxSchema = db_text(0, "SELECT value FROM config WHERE name='aux-schema'");
1166 return strcmp(g.zAuxSchema,AUX_SCHEMA_MIN)<0
1167 || strcmp(g.zAuxSchema,AUX_SCHEMA_MAX)>0;
1168 }
1169
1170 /*
1171 ** Return true if the database is writeable
1172 */
@@ -1181,14 +1181,14 @@
1181 void db_verify_schema(void){
1182 if( db_schema_is_outofdate() ){
1183 #ifdef FOSSIL_ENABLE_JSON
1184 g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
1185 #endif
1186 fossil_warning("incorrect repository schema version: "
1187 "current repository schema version is \"%s\" "
1188 "but need versions between \"%s\" and \"%s\".",
1189 db_get("aux-schema",0), AUX_SCHEMA_MIN, AUX_SCHEMA_MAX);
1190 fossil_fatal("run \"fossil rebuild\" to fix this problem");
1191 }
1192 }
1193
1194
@@ -1436,11 +1436,11 @@
1436 char *zDate;
1437 Blob hash;
1438 Blob manifest;
1439
1440 db_set("content-schema", CONTENT_SCHEMA, 0);
1441 db_set("aux-schema", AUX_SCHEMA_MAX, 0);
1442 db_set("rebuilt", get_version(), 0);
1443 if( makeServerCodes ){
1444 db_setup_server_and_project_codes(0);
1445 }
1446 if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1447
M src/main.c
+2 -1
--- src/main.c
+++ src/main.c
@@ -125,10 +125,11 @@
125125
 const char *zErrlog; /* Log errors to this file, if not NULL */
126126
 int isConst; /* True if the output is unchanging & cacheable */
127127
 const char *zVfsName; /* The VFS to use for database connections */
128128
 sqlite3 *db; /* The connection to the databases */
129129
 sqlite3 *dbConfig; /* Separate connection for global_config table */
130
+ char *zAuxSchema; /* Main repository aux-schema */
130131
 int useAttach; /* True if global_config is attached to repository */
131132
 const char *zConfigDbName;/* Path of the config database. NULL if not open */
132133
 sqlite3_int64 now; /* Seconds since 1970 */
133134
 int repositoryOpen; /* True if the main repository database is open */
134135
 char *zRepositoryOption; /* Most recent cached repository option value */
@@ -969,11 +970,11 @@
969970
 const char *zRc;
970971
 #endif
971972
 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
972973
 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
973974
 fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid());
974
- fossil_print("Schema version %s\n", AUX_SCHEMA);
975
+ fossil_print("Schema version %s\n", AUX_SCHEMA_MAX);
975976
 #if defined(FOSSIL_ENABLE_MINIZ)
976977
 fossil_print("miniz %s, loaded %s\n", MZ_VERSION, mz_version());
977978
 #else
978979
 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
979980
 #endif
980981
--- src/main.c
+++ src/main.c
@@ -125,10 +125,11 @@
125 const char *zErrlog; /* Log errors to this file, if not NULL */
126 int isConst; /* True if the output is unchanging & cacheable */
127 const char *zVfsName; /* The VFS to use for database connections */
128 sqlite3 *db; /* The connection to the databases */
129 sqlite3 *dbConfig; /* Separate connection for global_config table */
 
130 int useAttach; /* True if global_config is attached to repository */
131 const char *zConfigDbName;/* Path of the config database. NULL if not open */
132 sqlite3_int64 now; /* Seconds since 1970 */
133 int repositoryOpen; /* True if the main repository database is open */
134 char *zRepositoryOption; /* Most recent cached repository option value */
@@ -969,11 +970,11 @@
969 const char *zRc;
970 #endif
971 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
972 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
973 fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid());
974 fossil_print("Schema version %s\n", AUX_SCHEMA);
975 #if defined(FOSSIL_ENABLE_MINIZ)
976 fossil_print("miniz %s, loaded %s\n", MZ_VERSION, mz_version());
977 #else
978 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
979 #endif
980
--- src/main.c
+++ src/main.c
@@ -125,10 +125,11 @@
125 const char *zErrlog; /* Log errors to this file, if not NULL */
126 int isConst; /* True if the output is unchanging & cacheable */
127 const char *zVfsName; /* The VFS to use for database connections */
128 sqlite3 *db; /* The connection to the databases */
129 sqlite3 *dbConfig; /* Separate connection for global_config table */
130 char *zAuxSchema; /* Main repository aux-schema */
131 int useAttach; /* True if global_config is attached to repository */
132 const char *zConfigDbName;/* Path of the config database. NULL if not open */
133 sqlite3_int64 now; /* Seconds since 1970 */
134 int repositoryOpen; /* True if the main repository database is open */
135 char *zRepositoryOption; /* Most recent cached repository option value */
@@ -969,11 +970,11 @@
970 const char *zRc;
971 #endif
972 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
973 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
974 fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid());
975 fossil_print("Schema version %s\n", AUX_SCHEMA_MAX);
976 #if defined(FOSSIL_ENABLE_MINIZ)
977 fossil_print("miniz %s, loaded %s\n", MZ_VERSION, mz_version());
978 #else
979 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
980 #endif
981
M src/manifest.c
+15 -4
--- src/manifest.c
+++ src/manifest.c
@@ -1781,16 +1781,27 @@
17811781
 sqlite3_snprintf(sizeof(zBaseId), zBaseId, "%d",
17821782
 uuid_to_rid(p->zBaseline,1));
17831783
 }else{
17841784
 sqlite3_snprintf(sizeof(zBaseId), zBaseId, "NULL");
17851785
 }
1786
+ if( g.zAuxSchema==0 ) (void)db_schema_is_outofdate();
17861787
 for(i=0; i<p->nParent; i++){
17871788
 int pid = uuid_to_rid(p->azParent[i], 1);
1788
- db_multi_exec(
1789
- "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)"
1790
- "VALUES(%d, %d, %d, %.17g, %s)",
1791
- pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/);
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
+ "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)"
1793
+ "VALUES(%d, %d, %d, %.17g, %s)",
1794
+ pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/);
1795
+ }else{
1796
+ /* Continue to work with older schema to avoid an unnecessary
1797
+ ** rebuild */
1798
+ db_multi_exec(
1799
+ "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
1800
+ "VALUES(%d, %d, %d, %.17g)",
1801
+ pid, rid, i==0, p->rDate);
1802
+ }
17921803
 if( i==0 ){
17931804
 add_mlink(pid, 0, rid, p);
17941805
 parentid = pid;
17951806
 }
17961807
 }
17971808
--- src/manifest.c
+++ src/manifest.c
@@ -1781,16 +1781,27 @@
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 for(i=0; i<p->nParent; i++){
1787 int pid = uuid_to_rid(p->azParent[i], 1);
1788 db_multi_exec(
1789 "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)"
1790 "VALUES(%d, %d, %d, %.17g, %s)",
1791 pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/);
 
 
 
 
 
 
 
 
 
 
1792 if( i==0 ){
1793 add_mlink(pid, 0, rid, p);
1794 parentid = pid;
1795 }
1796 }
1797
--- src/manifest.c
+++ src/manifest.c
@@ -1781,16 +1781,27 @@
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 "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)"
1793 "VALUES(%d, %d, %d, %.17g, %s)",
1794 pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/);
1795 }else{
1796 /* Continue to work with older schema to avoid an unnecessary
1797 ** rebuild */
1798 db_multi_exec(
1799 "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
1800 "VALUES(%d, %d, %d, %.17g)",
1801 pid, rid, i==0, p->rDate);
1802 }
1803 if( i==0 ){
1804 add_mlink(pid, 0, rid, p);
1805 parentid = pid;
1806 }
1807 }
1808
M src/rebuild.c
+1 -1
--- src/rebuild.c
+++ src/rebuild.c
@@ -591,11 +591,11 @@
591591
 reconstruct_private_table();
592592
 db_multi_exec(
593593
 "REPLACE INTO config(name,value,mtime) VALUES('content-schema',%Q,now());"
594594
 "REPLACE INTO config(name,value,mtime) VALUES('aux-schema',%Q,now());"
595595
 "REPLACE INTO config(name,value,mtime) VALUES('rebuilt',%Q,now());",
596
- CONTENT_SCHEMA, AUX_SCHEMA, get_version()
596
+ CONTENT_SCHEMA, AUX_SCHEMA_MAX, get_version()
597597
 );
598598
 if( errCnt && !forceFlag ){
599599
 fossil_print(
600600
 "%d errors. Rolling back changes. Use --force to force a commit.\n",
601601
 errCnt
602602
--- src/rebuild.c
+++ src/rebuild.c
@@ -591,11 +591,11 @@
591 reconstruct_private_table();
592 db_multi_exec(
593 "REPLACE INTO config(name,value,mtime) VALUES('content-schema',%Q,now());"
594 "REPLACE INTO config(name,value,mtime) VALUES('aux-schema',%Q,now());"
595 "REPLACE INTO config(name,value,mtime) VALUES('rebuilt',%Q,now());",
596 CONTENT_SCHEMA, AUX_SCHEMA, get_version()
597 );
598 if( errCnt && !forceFlag ){
599 fossil_print(
600 "%d errors. Rolling back changes. Use --force to force a commit.\n",
601 errCnt
602
--- src/rebuild.c
+++ src/rebuild.c
@@ -591,11 +591,11 @@
591 reconstruct_private_table();
592 db_multi_exec(
593 "REPLACE INTO config(name,value,mtime) VALUES('content-schema',%Q,now());"
594 "REPLACE INTO config(name,value,mtime) VALUES('aux-schema',%Q,now());"
595 "REPLACE INTO config(name,value,mtime) VALUES('rebuilt',%Q,now());",
596 CONTENT_SCHEMA, AUX_SCHEMA_MAX, get_version()
597 );
598 if( errCnt && !forceFlag ){
599 fossil_print(
600 "%d errors. Rolling back changes. Use --force to force a commit.\n",
601 errCnt
602
M src/schema.c
+2 -1
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
4444
 ** a date) which can change frequently. When the content schema changes,
4545
 ** we have to execute special procedures to update the schema. When
4646
 ** the aux schema changes, all we need to do is rebuild the database.
4747
 */
4848
 #define CONTENT_SCHEMA "2"
49
-#define AUX_SCHEMA "2014-11-24 20:35"
49
+#define AUX_SCHEMA_MIN "2011-04-25 19:50"
50
+#define AUX_SCHEMA_MAX "2014-11-24 20:35"
5051
5152
 #endif /* INTERFACE */
5253
5354
5455
 /*
5556
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
44 ** a date) which can change frequently. When the content schema changes,
45 ** we have to execute special procedures to update the schema. When
46 ** the aux schema changes, all we need to do is rebuild the database.
47 */
48 #define CONTENT_SCHEMA "2"
49 #define AUX_SCHEMA "2014-11-24 20:35"
 
50
51 #endif /* INTERFACE */
52
53
54 /*
55
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
44 ** a date) which can change frequently. When the content schema changes,
45 ** we have to execute special procedures to update the schema. When
46 ** the aux schema changes, all we need to do is rebuild the database.
47 */
48 #define CONTENT_SCHEMA "2"
49 #define AUX_SCHEMA_MIN "2011-04-25 19:50"
50 #define AUX_SCHEMA_MAX "2014-11-24 20:35"
51
52 #endif /* INTERFACE */
53
54
55 /*
56
M src/schema.c
+2 -1
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
4444
 ** a date) which can change frequently. When the content schema changes,
4545
 ** we have to execute special procedures to update the schema. When
4646
 ** the aux schema changes, all we need to do is rebuild the database.
4747
 */
4848
 #define CONTENT_SCHEMA "2"
49
-#define AUX_SCHEMA "2014-11-24 20:35"
49
+#define AUX_SCHEMA_MIN "2011-04-25 19:50"
50
+#define AUX_SCHEMA_MAX "2014-11-24 20:35"
5051
5152
 #endif /* INTERFACE */
5253
5354
5455
 /*
5556
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
44 ** a date) which can change frequently. When the content schema changes,
45 ** we have to execute special procedures to update the schema. When
46 ** the aux schema changes, all we need to do is rebuild the database.
47 */
48 #define CONTENT_SCHEMA "2"
49 #define AUX_SCHEMA "2014-11-24 20:35"
 
50
51 #endif /* INTERFACE */
52
53
54 /*
55
--- src/schema.c
+++ src/schema.c
@@ -44,11 +44,12 @@
44 ** a date) which can change frequently. When the content schema changes,
45 ** we have to execute special procedures to update the schema. When
46 ** the aux schema changes, all we need to do is rebuild the database.
47 */
48 #define CONTENT_SCHEMA "2"
49 #define AUX_SCHEMA_MIN "2011-04-25 19:50"
50 #define AUX_SCHEMA_MAX "2014-11-24 20:35"
51
52 #endif /* INTERFACE */
53
54
55 /*
56

Keyboard Shortcuts

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