Fossil SCM
Correct SELECT to not exclude added files, i.e. files not present in the blob table
Commit
45e2e3e968c72f1edd4895fafa198c10e2e07db4
Parent
61da77525f0a1e3…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -151,15 +151,15 @@ | ||
| 151 | 151 | if( flags & C_ALL ){ |
| 152 | 152 | /* Start with a list of all managed files. */ |
| 153 | 153 | blob_append_sql(&sql, |
| 154 | 154 | "SELECT pathname, %s as mtime, %s as size, deleted, chnged, rid," |
| 155 | 155 | " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed" |
| 156 | - " FROM vfile, blob USING (rid)" | |
| 156 | + " FROM vfile LEFT JOIN blob USING (rid)" | |
| 157 | 157 | " WHERE is_selected(id)%s", |
| 158 | 158 | flags & C_MTIME ? "datetime(checkin_mtime(:vid, rid), " |
| 159 | 159 | "'unixepoch', toLocal())" : "''" /*safe-for-%s*/, |
| 160 | - flags & C_SIZE ? "blob.size" : "0" /*safe-for-%s*/, | |
| 160 | + flags & C_SIZE ? "coalesce(blob.size, 0)" : "0" /*safe-for-%s*/, | |
| 161 | 161 | blob_sql_text(&where)); |
| 162 | 162 | |
| 163 | 163 | /* Exclude unchanged files unless requested. */ |
| 164 | 164 | if( !(flags & C_UNCHANGED) ){ |
| 165 | 165 | blob_append_sql(&sql, |
| 166 | 166 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -151,15 +151,15 @@ | |
| 151 | if( flags & C_ALL ){ |
| 152 | /* Start with a list of all managed files. */ |
| 153 | blob_append_sql(&sql, |
| 154 | "SELECT pathname, %s as mtime, %s as size, deleted, chnged, rid," |
| 155 | " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed" |
| 156 | " FROM vfile, blob USING (rid)" |
| 157 | " WHERE is_selected(id)%s", |
| 158 | flags & C_MTIME ? "datetime(checkin_mtime(:vid, rid), " |
| 159 | "'unixepoch', toLocal())" : "''" /*safe-for-%s*/, |
| 160 | flags & C_SIZE ? "blob.size" : "0" /*safe-for-%s*/, |
| 161 | blob_sql_text(&where)); |
| 162 | |
| 163 | /* Exclude unchanged files unless requested. */ |
| 164 | if( !(flags & C_UNCHANGED) ){ |
| 165 | blob_append_sql(&sql, |
| 166 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -151,15 +151,15 @@ | |
| 151 | if( flags & C_ALL ){ |
| 152 | /* Start with a list of all managed files. */ |
| 153 | blob_append_sql(&sql, |
| 154 | "SELECT pathname, %s as mtime, %s as size, deleted, chnged, rid," |
| 155 | " coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed" |
| 156 | " FROM vfile LEFT JOIN blob USING (rid)" |
| 157 | " WHERE is_selected(id)%s", |
| 158 | flags & C_MTIME ? "datetime(checkin_mtime(:vid, rid), " |
| 159 | "'unixepoch', toLocal())" : "''" /*safe-for-%s*/, |
| 160 | flags & C_SIZE ? "coalesce(blob.size, 0)" : "0" /*safe-for-%s*/, |
| 161 | blob_sql_text(&where)); |
| 162 | |
| 163 | /* Exclude unchanged files unless requested. */ |
| 164 | if( !(flags & C_UNCHANGED) ){ |
| 165 | blob_append_sql(&sql, |
| 166 |