Fossil SCM
Fix the 'rebuild' command by adding the missing columns to the schema.
Commit
cb3421c493b959e79d3d0158879ee91847205dee4d0eaa56a8c772c17dea9f44
Parent
d1b0ccf1571158d…
2 files changed
+2
-1
+5
M
src/db.c
+2
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3230,11 +3230,12 @@ | ||
| 3230 | 3230 | ** repository file from which to copy the initial settings. When a template |
| 3231 | 3231 | ** repository is used, almost all of the settings accessible from the setup |
| 3232 | 3232 | ** page, either directly or indirectly, will be copied. Normal users and |
| 3233 | 3233 | ** their associated permissions will not be copied; however, the system |
| 3234 | 3234 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 3235 | -** associated permissions will be copied. | |
| 3235 | +** associated permissions will be copied. In case of SQL errors, rebuild the | |
| 3236 | +** template repository and try again. | |
| 3236 | 3237 | ** |
| 3237 | 3238 | ** Options: |
| 3238 | 3239 | ** --template FILE Copy settings from repository file |
| 3239 | 3240 | ** -A|--admin-user USERNAME Select given USERNAME as admin user |
| 3240 | 3241 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 3241 | 3242 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3230,11 +3230,12 @@ | |
| 3230 | ** repository file from which to copy the initial settings. When a template |
| 3231 | ** repository is used, almost all of the settings accessible from the setup |
| 3232 | ** page, either directly or indirectly, will be copied. Normal users and |
| 3233 | ** their associated permissions will not be copied; however, the system |
| 3234 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 3235 | ** associated permissions will be copied. |
| 3236 | ** |
| 3237 | ** Options: |
| 3238 | ** --template FILE Copy settings from repository file |
| 3239 | ** -A|--admin-user USERNAME Select given USERNAME as admin user |
| 3240 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 3241 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3230,11 +3230,12 @@ | |
| 3230 | ** repository file from which to copy the initial settings. When a template |
| 3231 | ** repository is used, almost all of the settings accessible from the setup |
| 3232 | ** page, either directly or indirectly, will be copied. Normal users and |
| 3233 | ** their associated permissions will not be copied; however, the system |
| 3234 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 3235 | ** associated permissions will be copied. In case of SQL errors, rebuild the |
| 3236 | ** template repository and try again. |
| 3237 | ** |
| 3238 | ** Options: |
| 3239 | ** --template FILE Copy settings from repository file |
| 3240 | ** -A|--admin-user USERNAME Select given USERNAME as admin user |
| 3241 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 3242 |
+5
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -140,10 +140,15 @@ | ||
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /* Do the fossil-2.0 updates to the schema. (2017-02-28) |
| 143 | 143 | */ |
| 144 | 144 | rebuild_schema_update_2_0(); |
| 145 | + | |
| 146 | + /* Add the user.jx and reportfmt.jx columns if they are missing. (2022-11-18) | |
| 147 | + */ | |
| 148 | + user_update_user_table(); | |
| 149 | + report_update_reportfmt_table(); | |
| 145 | 150 | } |
| 146 | 151 | |
| 147 | 152 | /* |
| 148 | 153 | ** Update the repository schema for Fossil version 2.0. (2017-02-28) |
| 149 | 154 | ** (1) Change the CHECK constraint on BLOB.UUID so that the length |
| 150 | 155 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -140,10 +140,15 @@ | |
| 140 | } |
| 141 | |
| 142 | /* Do the fossil-2.0 updates to the schema. (2017-02-28) |
| 143 | */ |
| 144 | rebuild_schema_update_2_0(); |
| 145 | } |
| 146 | |
| 147 | /* |
| 148 | ** Update the repository schema for Fossil version 2.0. (2017-02-28) |
| 149 | ** (1) Change the CHECK constraint on BLOB.UUID so that the length |
| 150 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -140,10 +140,15 @@ | |
| 140 | } |
| 141 | |
| 142 | /* Do the fossil-2.0 updates to the schema. (2017-02-28) |
| 143 | */ |
| 144 | rebuild_schema_update_2_0(); |
| 145 | |
| 146 | /* Add the user.jx and reportfmt.jx columns if they are missing. (2022-11-18) |
| 147 | */ |
| 148 | user_update_user_table(); |
| 149 | report_update_reportfmt_table(); |
| 150 | } |
| 151 | |
| 152 | /* |
| 153 | ** Update the repository schema for Fossil version 2.0. (2017-02-28) |
| 154 | ** (1) Change the CHECK constraint on BLOB.UUID so that the length |
| 155 |