Fossil SCM
Fix a conflict when syncing forum posts.
Commit
8a980fde215683c7abc39d2f57a3aa308c35b6154428cb83fe96219a2f4de016
Parent
7ca68af0b861cff…
1 file changed
+1
-1
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -2529,11 +2529,11 @@ | ||
| 2529 | 2529 | schema_forum(); |
| 2530 | 2530 | froot = p->zThreadRoot ? uuid_to_rid(p->zThreadRoot, 1) : rid; |
| 2531 | 2531 | fprev = p->nParent ? uuid_to_rid(p->azParent[0],1) : 0; |
| 2532 | 2532 | firt = p->zInReplyTo ? uuid_to_rid(p->zInReplyTo,1) : 0; |
| 2533 | 2533 | db_multi_exec( |
| 2534 | - "INSERT INTO forumpost(fpid,froot,fprev,firt,fmtime)" | |
| 2534 | + "REPLACE INTO forumpost(fpid,froot,fprev,firt,fmtime)" | |
| 2535 | 2535 | "VALUES(%d,%d,nullif(%d,0),nullif(%d,0),%.17g)", |
| 2536 | 2536 | p->rid, froot, fprev, firt, p->rDate |
| 2537 | 2537 | ); |
| 2538 | 2538 | if( firt==0 ){ |
| 2539 | 2539 | /* This is the start of a new thread, either the initial entry |
| 2540 | 2540 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -2529,11 +2529,11 @@ | |
| 2529 | schema_forum(); |
| 2530 | froot = p->zThreadRoot ? uuid_to_rid(p->zThreadRoot, 1) : rid; |
| 2531 | fprev = p->nParent ? uuid_to_rid(p->azParent[0],1) : 0; |
| 2532 | firt = p->zInReplyTo ? uuid_to_rid(p->zInReplyTo,1) : 0; |
| 2533 | db_multi_exec( |
| 2534 | "INSERT INTO forumpost(fpid,froot,fprev,firt,fmtime)" |
| 2535 | "VALUES(%d,%d,nullif(%d,0),nullif(%d,0),%.17g)", |
| 2536 | p->rid, froot, fprev, firt, p->rDate |
| 2537 | ); |
| 2538 | if( firt==0 ){ |
| 2539 | /* This is the start of a new thread, either the initial entry |
| 2540 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -2529,11 +2529,11 @@ | |
| 2529 | schema_forum(); |
| 2530 | froot = p->zThreadRoot ? uuid_to_rid(p->zThreadRoot, 1) : rid; |
| 2531 | fprev = p->nParent ? uuid_to_rid(p->azParent[0],1) : 0; |
| 2532 | firt = p->zInReplyTo ? uuid_to_rid(p->zInReplyTo,1) : 0; |
| 2533 | db_multi_exec( |
| 2534 | "REPLACE INTO forumpost(fpid,froot,fprev,firt,fmtime)" |
| 2535 | "VALUES(%d,%d,nullif(%d,0),nullif(%d,0),%.17g)", |
| 2536 | p->rid, froot, fprev, firt, p->rDate |
| 2537 | ); |
| 2538 | if( firt==0 ){ |
| 2539 | /* This is the start of a new thread, either the initial entry |
| 2540 |