Fossil

Check-in [44644d43dc]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Corrected a JSON-mode result code when db rebuild is required.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | json
Files: files | file ages | folders
SHA1: 44644d43dc946ef139b691408686753f49df7a36
User & Date: stephan 2011-09-29 21:55:56.021
Context
2011-09-29
21:57
Removed the json warnings bitset crap. Still not sure i like the warnings mechanism at all. check-in: 9fe06e2fda user: stephan tags: json
21:55
Corrected a JSON-mode result code when db rebuild is required. check-in: 44644d43dc user: stephan tags: json
17:03
minor jsonp tweaks. Added some test code for it in the demo app, but there is still some jsonp disconnect between the two AJAJ layers, and i may need to consolidate them to work around it. check-in: f48b687a9a user: stephan tags: json
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/db.c.
951
952
953
954
955
956
957

958
959
960
961
962
963
964

/*
** Verify that the repository schema is correct.  If it is not correct,
** issue a fatal error and die.
*/
void db_verify_schema(void){
  if( db_schema_is_outofdate() ){

    fossil_warning("incorrect repository schema version");
    fossil_warning("your repository has schema version \"%s\" "
          "but this binary expects version \"%s\"",
          db_get("aux-schema",0), AUX_SCHEMA);
    fossil_fatal("run \"fossil rebuild\" to fix this problem");
  }
}







>







951
952
953
954
955
956
957
958
959
960
961
962
963
964
965

/*
** Verify that the repository schema is correct.  If it is not correct,
** issue a fatal error and die.
*/
void db_verify_schema(void){
  if( db_schema_is_outofdate() ){
    g.json.resultCode = FSL_JSON_E_DB_NEEDS_REBUILD;
    fossil_warning("incorrect repository schema version");
    fossil_warning("your repository has schema version \"%s\" "
          "but this binary expects version \"%s\"",
          db_get("aux-schema",0), AUX_SCHEMA);
    fossil_fatal("run \"fossil rebuild\" to fix this problem");
  }
}