Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 15:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

try fix sql

Browse Source
This commit is contained in:
dignifiedquire
2019-11-27 01:06:00 +01:00
parent f0ad11a8f9
commit 10925bd5e1
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/job.rs
View File

@@ -758,11 +758,18 @@ fn job_perform(context: &Context, thread: ThreadExecutor, probe_network: bool) {
// processing for first-try and after backoff-timeouts: // processing for first-try and after backoff-timeouts:
// process jobs in the order they were added. // process jobs in the order they were added.
format!( format!(
"SELECT j.id, j.action, j.foreign_id, j.param, j.added_timestamp, j.desired_timestamp, j.tries \ "SELECT \
j.id AS id, \
j.action AS action, \
j.foreign_id AS foreign_id, \
j.param AS param, \
j.added_timestamp AS added_timestamp, \
j.desired_timestamp AS desired_timestamp, \
j.tries AS tries \
FROM jobs j \ FROM jobs j \
LEFT JOIN msgs m\ LEFT JOIN msgs m\
WHERE j.thread=? AND j.desired_timestamp<=? \ WHERE j.thread=? AND j.desired_timestamp<=? \
((j.foreign_id NOT NULL AND m.server_folder=?) {} \ ((j.foreign_id IS NOT NULL AND m.server_folder=?) {} \
ORDER BY j.action DESC, j.added_timestamp;", ORDER BY j.action DESC, j.added_timestamp;",
fallback fallback
) )
@@ -772,11 +779,17 @@ fn job_perform(context: &Context, thread: ThreadExecutor, probe_network: bool) {
// in the order of their backoff-times. // in the order of their backoff-times.
format!( format!(
"SELECT \ "SELECT \
j.id, j.action, j.foreign_id, j.param, j.added_timestamp, j.desired_timestamp, j.tries \ j.id AS id, \
j.action AS action, \
j.foreign_id AS foreign_id, \
j.param AS param, \
j.added_timestamp AS added_timestamp, \
j.desired_timestamp AS desired_timestamp, \
j.tries AS tries \
FROM jobs j \ FROM jobs j \
LEFT JOIN msgs m \ LEFT JOIN msgs m \
WHERE j.thread=? AND j.tries>0 AND \ WHERE j.thread=? AND j.tries>0 AND \
((j.foreign_id NOT NULL AND m.server_folder=?) {} \ ((j.foreign_id IS NOT NULL AND m.server_folder=?) {} \
ORDER BY j.desired_timestamp, j.action DESC;", ORDER BY j.desired_timestamp, j.action DESC;",
fallback fallback
) )