Fossil SCM
s/prevUuid/parent/ for json payload properties, for consistency.
Commit
23aba0e4a371275168da748dcfb353efe537e29b
Parent
77e36ef611f65ff…
1 file changed
+2
-2
+2
-2
| --- src/json_timeline.c | ||
| +++ src/json_timeline.c | ||
| @@ -305,11 +305,11 @@ | ||
| 305 | 305 | #else |
| 306 | 306 | "SELECT (pid==0) AS isnew," |
| 307 | 307 | " (fid==0) AS isdel," |
| 308 | 308 | " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," |
| 309 | 309 | " (SELECT uuid FROM blob WHERE rid=fid) as uuid," |
| 310 | - " (SELECT uuid FROM blob WHERE rid=pid) as prevUuid" | |
| 310 | + " (SELECT uuid FROM blob WHERE rid=pid) as parent" | |
| 311 | 311 | " FROM mlink" |
| 312 | 312 | " WHERE mid=%d AND pid!=fid" |
| 313 | 313 | " ORDER BY name /*sort*/", |
| 314 | 314 | #endif |
| 315 | 315 | rid |
| @@ -326,11 +326,11 @@ | ||
| 326 | 326 | } |
| 327 | 327 | cson_array_append( rows, rowV ); |
| 328 | 328 | cson_object_set(row, "name", json_new_string(db_column_text(&q,2))); |
| 329 | 329 | cson_object_set(row, "uuid", json_new_string(db_column_text(&q,3))); |
| 330 | 330 | if(!isNew){ |
| 331 | - cson_object_set(row, "prevUuid", json_new_string(db_column_text(&q,4))); | |
| 331 | + cson_object_set(row, "parent", json_new_string(db_column_text(&q,4))); | |
| 332 | 332 | } |
| 333 | 333 | cson_object_set(row, "state", |
| 334 | 334 | json_new_string(isNew |
| 335 | 335 | ? "added" |
| 336 | 336 | : (isDel |
| 337 | 337 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -305,11 +305,11 @@ | |
| 305 | #else |
| 306 | "SELECT (pid==0) AS isnew," |
| 307 | " (fid==0) AS isdel," |
| 308 | " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," |
| 309 | " (SELECT uuid FROM blob WHERE rid=fid) as uuid," |
| 310 | " (SELECT uuid FROM blob WHERE rid=pid) as prevUuid" |
| 311 | " FROM mlink" |
| 312 | " WHERE mid=%d AND pid!=fid" |
| 313 | " ORDER BY name /*sort*/", |
| 314 | #endif |
| 315 | rid |
| @@ -326,11 +326,11 @@ | |
| 326 | } |
| 327 | cson_array_append( rows, rowV ); |
| 328 | cson_object_set(row, "name", json_new_string(db_column_text(&q,2))); |
| 329 | cson_object_set(row, "uuid", json_new_string(db_column_text(&q,3))); |
| 330 | if(!isNew){ |
| 331 | cson_object_set(row, "prevUuid", json_new_string(db_column_text(&q,4))); |
| 332 | } |
| 333 | cson_object_set(row, "state", |
| 334 | json_new_string(isNew |
| 335 | ? "added" |
| 336 | : (isDel |
| 337 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -305,11 +305,11 @@ | |
| 305 | #else |
| 306 | "SELECT (pid==0) AS isnew," |
| 307 | " (fid==0) AS isdel," |
| 308 | " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," |
| 309 | " (SELECT uuid FROM blob WHERE rid=fid) as uuid," |
| 310 | " (SELECT uuid FROM blob WHERE rid=pid) as parent" |
| 311 | " FROM mlink" |
| 312 | " WHERE mid=%d AND pid!=fid" |
| 313 | " ORDER BY name /*sort*/", |
| 314 | #endif |
| 315 | rid |
| @@ -326,11 +326,11 @@ | |
| 326 | } |
| 327 | cson_array_append( rows, rowV ); |
| 328 | cson_object_set(row, "name", json_new_string(db_column_text(&q,2))); |
| 329 | cson_object_set(row, "uuid", json_new_string(db_column_text(&q,3))); |
| 330 | if(!isNew){ |
| 331 | cson_object_set(row, "parent", json_new_string(db_column_text(&q,4))); |
| 332 | } |
| 333 | cson_object_set(row, "state", |
| 334 | json_new_string(isNew |
| 335 | ? "added" |
| 336 | : (isDel |
| 337 |