From 41a7fbb80f1dc483330edf911deefc450ff5989e Mon Sep 17 00:00:00 2001 From: Lucas Abel <22837557+uael@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:02:44 +0100 Subject: [PATCH] fix: disable `flow_version_lite` in dedicated workers (#4800) --- ...b3b9db088f6e51bea5e74a494c4e9f4c3b78e.json | 23 +++++++++++++++++++ .../windmill-worker/src/dedicated_worker.rs | 4 +--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 backend/.sqlx/query-bbce3e1eae78c48409d4204cd6cb3b9db088f6e51bea5e74a494c4e9f4c3b78e.json diff --git a/backend/.sqlx/query-bbce3e1eae78c48409d4204cd6cb3b9db088f6e51bea5e74a494c4e9f4c3b78e.json b/backend/.sqlx/query-bbce3e1eae78c48409d4204cd6cb3b9db088f6e51bea5e74a494c4e9f4c3b78e.json new file mode 100644 index 0000000000..99c00632c5 --- /dev/null +++ b/backend/.sqlx/query-bbce3e1eae78c48409d4204cd6cb3b9db088f6e51bea5e74a494c4e9f4c3b78e.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT flow_version.value AS \"value!: sqlx::types::Json>\" \n FROM flow \n LEFT JOIN flow_version \n ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]\n WHERE flow.path = $1 AND flow.workspace_id = $2", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "value!: sqlx::types::Json>", + "type_info": "Jsonb" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "bbce3e1eae78c48409d4204cd6cb3b9db088f6e51bea5e74a494c4e9f4c3b78e" +} diff --git a/backend/windmill-worker/src/dedicated_worker.rs b/backend/windmill-worker/src/dedicated_worker.rs index 5a7c9023c9..05f23a2bc6 100644 --- a/backend/windmill-worker/src/dedicated_worker.rs +++ b/backend/windmill-worker/src/dedicated_worker.rs @@ -460,12 +460,10 @@ pub async fn create_dedicated_worker_map( if let Some(flow_path) = _wp.path.strip_prefix("flow/") { is_flow_worker = true; let value = sqlx::query_scalar!( - "SELECT coalesce(flow_version_lite.value, flow_version.value) AS \"value!: sqlx::types::Json>\" + "SELECT flow_version.value AS \"value!: sqlx::types::Json>\" FROM flow LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)] - LEFT JOIN flow_version_lite - ON flow_version_lite.id = flow_version.id WHERE flow.path = $1 AND flow.workspace_id = $2", flow_path, _wp.workspace_id