Fossil SCM
Correction to the previous check-in.
Commit
a24f14900ddb50c1fb8540dcfdb53696d409cced411fc090be9b821b7cc80081
Parent
14959bc587effbd…
1 file changed
+3
-3
+3
-3
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -1296,17 +1296,17 @@ | ||
| 1296 | 1296 | zType = "ERROR"; |
| 1297 | 1297 | } |
| 1298 | 1298 | blob_init(&sql, 0, 0); |
| 1299 | 1299 | blob_append_sql(&sql, |
| 1300 | 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | - "VALUES(%Q,%Q,%d,%Q,%d,%d,%Q,%d,%Q,%d,%Q)", | |
| 1301 | + "VALUES(%Q,%Q,%d,%Q,iff(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", | |
| 1302 | 1302 | /* op */ zType, |
| 1303 | 1303 | /* fnp */ zFnp, |
| 1304 | 1304 | /* ridp */ ridp, |
| 1305 | 1305 | /* fn */ zName, |
| 1306 | - /* ridv */ chnged==0 ? ridv : 0, | |
| 1307 | - /* sz */ chnged!=0 ? sz : 0, | |
| 1306 | + /* ridv */ chnged==0, ridv, | |
| 1307 | + /* sz */ chnged!=0, sz, | |
| 1308 | 1308 | /* fnm */ zFnm, |
| 1309 | 1309 | /* ridm */ ridm, |
| 1310 | 1310 | /* fnr */ zName, |
| 1311 | 1311 | /* nc */ nc, |
| 1312 | 1312 | /* msg */ zErrMsg |
| 1313 | 1313 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1296,17 +1296,17 @@ | |
| 1296 | zType = "ERROR"; |
| 1297 | } |
| 1298 | blob_init(&sql, 0, 0); |
| 1299 | blob_append_sql(&sql, |
| 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | "VALUES(%Q,%Q,%d,%Q,%d,%d,%Q,%d,%Q,%d,%Q)", |
| 1302 | /* op */ zType, |
| 1303 | /* fnp */ zFnp, |
| 1304 | /* ridp */ ridp, |
| 1305 | /* fn */ zName, |
| 1306 | /* ridv */ chnged==0 ? ridv : 0, |
| 1307 | /* sz */ chnged!=0 ? sz : 0, |
| 1308 | /* fnm */ zFnm, |
| 1309 | /* ridm */ ridm, |
| 1310 | /* fnr */ zName, |
| 1311 | /* nc */ nc, |
| 1312 | /* msg */ zErrMsg |
| 1313 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1296,17 +1296,17 @@ | |
| 1296 | zType = "ERROR"; |
| 1297 | } |
| 1298 | blob_init(&sql, 0, 0); |
| 1299 | blob_append_sql(&sql, |
| 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | "VALUES(%Q,%Q,%d,%Q,iff(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", |
| 1302 | /* op */ zType, |
| 1303 | /* fnp */ zFnp, |
| 1304 | /* ridp */ ridp, |
| 1305 | /* fn */ zName, |
| 1306 | /* ridv */ chnged==0, ridv, |
| 1307 | /* sz */ chnged!=0, sz, |
| 1308 | /* fnm */ zFnm, |
| 1309 | /* ridm */ ridm, |
| 1310 | /* fnr */ zName, |
| 1311 | /* nc */ nc, |
| 1312 | /* msg */ zErrMsg |
| 1313 |