diff --git a/backend/sqlx-data.json b/backend/sqlx-data.json index 0f95e41119..8436ec7266 100644 --- a/backend/sqlx-data.json +++ b/backend/sqlx-data.json @@ -604,112 +604,6 @@ }, "query": "SELECT * FROM workspace LIMIT $1 OFFSET $2" }, - "15e143ab2dc6368238849beb3ee3969cd601b060b5d58d9831e6be7008156d26": { - "describe": { - "columns": [ - { - "name": "workspace_id", - "ordinal": 0, - "type_info": "Varchar" - }, - { - "name": "path", - "ordinal": 1, - "type_info": "Varchar" - }, - { - "name": "edited_by", - "ordinal": 2, - "type_info": "Varchar" - }, - { - "name": "edited_at", - "ordinal": 3, - "type_info": "Timestamptz" - }, - { - "name": "schedule", - "ordinal": 4, - "type_info": "Varchar" - }, - { - "name": "enabled", - "ordinal": 5, - "type_info": "Bool" - }, - { - "name": "script_path", - "ordinal": 6, - "type_info": "Varchar" - }, - { - "name": "args", - "ordinal": 7, - "type_info": "Jsonb" - }, - { - "name": "extra_perms", - "ordinal": 8, - "type_info": "Jsonb" - }, - { - "name": "is_flow", - "ordinal": 9, - "type_info": "Bool" - }, - { - "name": "email", - "ordinal": 10, - "type_info": "Varchar" - }, - { - "name": "error", - "ordinal": 11, - "type_info": "Text" - }, - { - "name": "timezone", - "ordinal": 12, - "type_info": "Varchar" - }, - { - "name": "on_failure", - "ordinal": 13, - "type_info": "Varchar" - }, - { - "name": "jobs", - "ordinal": 14, - "type_info": "JsonArray" - } - ], - "nullable": [ - false, - false, - false, - false, - false, - false, - false, - true, - false, - false, - false, - true, - false, - true, - null - ], - "parameters": { - "Left": [ - "Text", - "Int8", - "Int8" - ] - } - }, - "query": "SELECT schedule.*, t.jobs FROM schedule, LATERAL ( SELECT ARRAY (SELECT json_build_object('id', id, 'success', success, 'duration_ms', duration_ms) FROM completed_job WHERE\n completed_job.schedule_path = schedule_path AND schedule.workspace_id = completed_job.workspace_id AND parent_job IS NULL ORDER BY created_at DESC LIMIT 20) AS jobs ) t\n WHERE schedule.workspace_id = $1 ORDER BY schedule.edited_at desc LIMIT $2 OFFSET $3" - }, "163f00eb8b1a489d5f382cdba22a5744e88a8e6f1532d7cb02af560f5f5d49f7": { "describe": { "columns": [ @@ -6319,6 +6213,112 @@ }, "query": "SELECT * FROM group_ WHERE name = $1 AND workspace_id = $2" }, + "dc4316a8646dc642ed12c12d8673aa1ed44c551b3174c49655defacdf49880c7": { + "describe": { + "columns": [ + { + "name": "workspace_id", + "ordinal": 0, + "type_info": "Varchar" + }, + { + "name": "path", + "ordinal": 1, + "type_info": "Varchar" + }, + { + "name": "edited_by", + "ordinal": 2, + "type_info": "Varchar" + }, + { + "name": "edited_at", + "ordinal": 3, + "type_info": "Timestamptz" + }, + { + "name": "schedule", + "ordinal": 4, + "type_info": "Varchar" + }, + { + "name": "enabled", + "ordinal": 5, + "type_info": "Bool" + }, + { + "name": "script_path", + "ordinal": 6, + "type_info": "Varchar" + }, + { + "name": "args", + "ordinal": 7, + "type_info": "Jsonb" + }, + { + "name": "extra_perms", + "ordinal": 8, + "type_info": "Jsonb" + }, + { + "name": "is_flow", + "ordinal": 9, + "type_info": "Bool" + }, + { + "name": "email", + "ordinal": 10, + "type_info": "Varchar" + }, + { + "name": "error", + "ordinal": 11, + "type_info": "Text" + }, + { + "name": "timezone", + "ordinal": 12, + "type_info": "Varchar" + }, + { + "name": "on_failure", + "ordinal": 13, + "type_info": "Varchar" + }, + { + "name": "jobs", + "ordinal": 14, + "type_info": "JsonArray" + } + ], + "nullable": [ + false, + false, + false, + false, + false, + false, + false, + true, + false, + false, + false, + true, + false, + true, + null + ], + "parameters": { + "Left": [ + "Text", + "Int8", + "Int8" + ] + } + }, + "query": "SELECT schedule.*, t.jobs FROM schedule, LATERAL ( SELECT ARRAY (SELECT json_build_object('id', id, 'success', success, 'duration_ms', duration_ms) FROM completed_job WHERE\n completed_job.schedule_path = schedule.path AND schedule.workspace_id = completed_job.workspace_id AND parent_job IS NULL ORDER BY created_at DESC LIMIT 20) AS jobs ) t\n WHERE schedule.workspace_id = $1 ORDER BY schedule.edited_at desc LIMIT $2 OFFSET $3" + }, "dcf9e4087732c830278603a47eb1efe99bea1f2ad8770ed3f7dee349b6ec7a3e": { "describe": { "columns": [], diff --git a/backend/windmill-api/src/schedule.rs b/backend/windmill-api/src/schedule.rs index cba7d480ff..63ba795127 100644 --- a/backend/windmill-api/src/schedule.rs +++ b/backend/windmill-api/src/schedule.rs @@ -261,7 +261,7 @@ async fn list_schedule_with_jobs( let (per_page, offset) = paginate(pagination); let rows = sqlx::query_as!(ScheduleWJobs, "SELECT schedule.*, t.jobs FROM schedule, LATERAL ( SELECT ARRAY (SELECT json_build_object('id', id, 'success', success, 'duration_ms', duration_ms) FROM completed_job WHERE - completed_job.schedule_path = schedule_path AND schedule.workspace_id = completed_job.workspace_id AND parent_job IS NULL ORDER BY created_at DESC LIMIT 20) AS jobs ) t + completed_job.schedule_path = schedule.path AND schedule.workspace_id = completed_job.workspace_id AND parent_job IS NULL ORDER BY created_at DESC LIMIT 20) AS jobs ) t WHERE schedule.workspace_id = $1 ORDER BY schedule.edited_at desc LIMIT $2 OFFSET $3", w_id, per_page as i64,