Fossil SCM
Minor comment changes.
Commit
e2a73756c5bbbc1a8d9f5d7b1f1c3e21be35d7034e058249e1804cdddb747818
Parent
b03652382a32774…
1 file changed
+6
-5
M
src/db.c
+6
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1481,12 +1481,12 @@ | ||
| 1481 | 1481 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 1482 | 1482 | db_open_or_attach(zDbName, "localdb"); |
| 1483 | 1483 | |
| 1484 | 1484 | /* Check to see if the checkout database has the lastest schema changes. |
| 1485 | 1485 | ** The most recent schema change (2019-01-19) is the addition of the |
| 1486 | - ** vmerge.mhash field. If the schema has that one column, assume | |
| 1487 | - ** everything else is up-to-date. | |
| 1486 | + ** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash | |
| 1487 | + ** column, assume everything else is up-to-date. | |
| 1488 | 1488 | */ |
| 1489 | 1489 | if( db_table_has_column("localdb","vmerge","mhash") ){ |
| 1490 | 1490 | return 1; /* This is a checkout database with the latest schema */ |
| 1491 | 1491 | } |
| 1492 | 1492 | |
| @@ -1519,13 +1519,14 @@ | ||
| 1519 | 1519 | if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){ |
| 1520 | 1520 | db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0"); |
| 1521 | 1521 | } |
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | - /* The design of the vmerge table changed on 2019-01-19, adding the mhash | |
| 1525 | - ** column and changing the UNIQUE index. However, we must ahve the | |
| 1526 | - ** repository database at hand in order to do the migration, so that | |
| 1524 | + /* The design of the checkout database changed on 2019-01-19, adding the mhash | |
| 1525 | + ** column to vfile and vmerge and changing the UNIQUE index on vmerge into | |
| 1526 | + ** a PRIMARY KEY that includes the new mhash column. However, we must have | |
| 1527 | + ** the repository database at hand in order to do the migration, so that | |
| 1527 | 1528 | ** step is deferred. */ |
| 1528 | 1529 | return 1; |
| 1529 | 1530 | } |
| 1530 | 1531 | |
| 1531 | 1532 | /* |
| 1532 | 1533 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1481,12 +1481,12 @@ | |
| 1481 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 1482 | db_open_or_attach(zDbName, "localdb"); |
| 1483 | |
| 1484 | /* Check to see if the checkout database has the lastest schema changes. |
| 1485 | ** The most recent schema change (2019-01-19) is the addition of the |
| 1486 | ** vmerge.mhash field. If the schema has that one column, assume |
| 1487 | ** everything else is up-to-date. |
| 1488 | */ |
| 1489 | if( db_table_has_column("localdb","vmerge","mhash") ){ |
| 1490 | return 1; /* This is a checkout database with the latest schema */ |
| 1491 | } |
| 1492 | |
| @@ -1519,13 +1519,14 @@ | |
| 1519 | if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){ |
| 1520 | db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0"); |
| 1521 | } |
| 1522 | } |
| 1523 | |
| 1524 | /* The design of the vmerge table changed on 2019-01-19, adding the mhash |
| 1525 | ** column and changing the UNIQUE index. However, we must ahve the |
| 1526 | ** repository database at hand in order to do the migration, so that |
| 1527 | ** step is deferred. */ |
| 1528 | return 1; |
| 1529 | } |
| 1530 | |
| 1531 | /* |
| 1532 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1481,12 +1481,12 @@ | |
| 1481 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 1482 | db_open_or_attach(zDbName, "localdb"); |
| 1483 | |
| 1484 | /* Check to see if the checkout database has the lastest schema changes. |
| 1485 | ** The most recent schema change (2019-01-19) is the addition of the |
| 1486 | ** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash |
| 1487 | ** column, assume everything else is up-to-date. |
| 1488 | */ |
| 1489 | if( db_table_has_column("localdb","vmerge","mhash") ){ |
| 1490 | return 1; /* This is a checkout database with the latest schema */ |
| 1491 | } |
| 1492 | |
| @@ -1519,13 +1519,14 @@ | |
| 1519 | if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){ |
| 1520 | db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0"); |
| 1521 | } |
| 1522 | } |
| 1523 | |
| 1524 | /* The design of the checkout database changed on 2019-01-19, adding the mhash |
| 1525 | ** column to vfile and vmerge and changing the UNIQUE index on vmerge into |
| 1526 | ** a PRIMARY KEY that includes the new mhash column. However, we must have |
| 1527 | ** the repository database at hand in order to do the migration, so that |
| 1528 | ** step is deferred. */ |
| 1529 | return 1; |
| 1530 | } |
| 1531 | |
| 1532 | /* |
| 1533 |