From a31a5a3cf1022422dddb2ded80507f0dfa6abdfc Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 23 Oct 2025 22:14:40 +0000 Subject: [PATCH] fork fix --- ...2bbc4718cbb8ad6e2f13eae6b14f129d12936.json | 138 ------------------ ...b21270131e9e93ca10d195664e7e5a774fe9e.json | 92 ------------ ...153c43903f929ae5d62fbba12610f89c36d55.json | 2 +- ...ec152d4ee52b58f208f2fa1639eaa448c6ad.json} | 4 +- ...b087805dad2b6fb1aa194ac2a2026fa24ecd0.json | 121 --------------- backend/windmill-api/src/workspaces.rs | 42 +++--- 6 files changed, 25 insertions(+), 374 deletions(-) delete mode 100644 backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json delete mode 100644 backend/.sqlx/query-1a54356c1e1353950bf6ab1d25ab21270131e9e93ca10d195664e7e5a774fe9e.json rename backend/.sqlx/{query-5a9deb187b43fde22c4d32629bc030d2fe256d647a0422ba40dfe15a513dc04d.json => query-5c72e6e4102039c4426e8eb47d86ec152d4ee52b58f208f2fa1639eaa448c6ad.json} (64%) delete mode 100644 backend/.sqlx/query-e64f7044c74e96c2338580562f6b087805dad2b6fb1aa194ac2a2026fa24ecd0.json diff --git a/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json b/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json deleted file mode 100644 index 60d2cfdc01..0000000000 --- a/backend/.sqlx/query-0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "select hash, tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout, has_preprocessor, on_behalf_of_email, created_by, path from script where hash = $1 AND workspace_id = $2", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "hash", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "tag", - "type_info": "Varchar" - }, - { - "ordinal": 2, - "name": "concurrency_key", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "concurrent_limit", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "concurrency_time_window_s", - "type_info": "Int4" - }, - { - "ordinal": 5, - "name": "cache_ttl", - "type_info": "Int4" - }, - { - "ordinal": 6, - "name": "language: ScriptLang", - "type_info": { - "Custom": { - "name": "script_lang", - "kind": { - "Enum": [ - "python3", - "deno", - "go", - "bash", - "postgresql", - "nativets", - "bun", - "mysql", - "bigquery", - "snowflake", - "graphql", - "powershell", - "mssql", - "php", - "bunnative", - "rust", - "ansible", - "csharp", - "oracledb", - "nu", - "java", - "duckdb", - "ruby" - ] - } - } - } - }, - { - "ordinal": 7, - "name": "dedicated_worker", - "type_info": "Bool" - }, - { - "ordinal": 8, - "name": "priority", - "type_info": "Int2" - }, - { - "ordinal": 9, - "name": "delete_after_use", - "type_info": "Bool" - }, - { - "ordinal": 10, - "name": "timeout", - "type_info": "Int4" - }, - { - "ordinal": 11, - "name": "has_preprocessor", - "type_info": "Bool" - }, - { - "ordinal": 12, - "name": "on_behalf_of_email", - "type_info": "Text" - }, - { - "ordinal": 13, - "name": "created_by", - "type_info": "Varchar" - }, - { - "ordinal": 14, - "name": "path", - "type_info": "Varchar" - } - ], - "parameters": { - "Left": [ - "Int8", - "Text" - ] - }, - "nullable": [ - false, - true, - true, - true, - true, - true, - false, - true, - true, - true, - true, - true, - true, - false, - false - ] - }, - "hash": "0937e25e89959447e7cb1816c112bbc4718cbb8ad6e2f13eae6b14f129d12936" -} diff --git a/backend/.sqlx/query-1a54356c1e1353950bf6ab1d25ab21270131e9e93ca10d195664e7e5a774fe9e.json b/backend/.sqlx/query-1a54356c1e1353950bf6ab1d25ab21270131e9e93ca10d195664e7e5a774fe9e.json deleted file mode 100644 index 9462f9b48b..0000000000 --- a/backend/.sqlx/query-1a54356c1e1353950bf6ab1d25ab21270131e9e93ca10d195664e7e5a774fe9e.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO script (workspace_id, hash, path, parent_hashes, summary, description, content, created_by, schema, is_template, extra_perms, lock, language, kind, tag, draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, delete_after_use, timeout, concurrency_key, visible_to_runner_only, no_main_func, codebase, has_preprocessor, on_behalf_of_email, schema_validation, assets) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::text::json, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34)", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Int8", - "Varchar", - "Int8Array", - "Text", - "Text", - "Text", - "Varchar", - "Text", - "Bool", - "Jsonb", - "Text", - { - "Custom": { - "name": "script_lang", - "kind": { - "Enum": [ - "python3", - "deno", - "go", - "bash", - "postgresql", - "nativets", - "bun", - "mysql", - "bigquery", - "snowflake", - "graphql", - "powershell", - "mssql", - "php", - "bunnative", - "rust", - "ansible", - "csharp", - "oracledb", - "nu", - "java", - "duckdb", - "ruby" - ] - } - } - }, - { - "Custom": { - "name": "script_kind", - "kind": { - "Enum": [ - "script", - "trigger", - "failure", - "command", - "approval", - "preprocessor" - ] - } - } - }, - "Varchar", - "Bool", - "VarcharArray", - "Int4", - "Int4", - "Int4", - "Bool", - "Bool", - "Int2", - "Bool", - "Bool", - "Int4", - "Varchar", - "Bool", - "Bool", - "Varchar", - "Bool", - "Text", - "Bool", - "Jsonb" - ] - }, - "nullable": [] - }, - "hash": "1a54356c1e1353950bf6ab1d25ab21270131e9e93ca10d195664e7e5a774fe9e" -} diff --git a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json index 36ddb8ab9f..713ccb9dd3 100644 --- a/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json +++ b/backend/.sqlx/query-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json @@ -15,7 +15,7 @@ ] }, "nullable": [ - true + null ] }, "hash": "5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55" diff --git a/backend/.sqlx/query-5a9deb187b43fde22c4d32629bc030d2fe256d647a0422ba40dfe15a513dc04d.json b/backend/.sqlx/query-5c72e6e4102039c4426e8eb47d86ec152d4ee52b58f208f2fa1639eaa448c6ad.json similarity index 64% rename from backend/.sqlx/query-5a9deb187b43fde22c4d32629bc030d2fe256d647a0422ba40dfe15a513dc04d.json rename to backend/.sqlx/query-5c72e6e4102039c4426e8eb47d86ec152d4ee52b58f208f2fa1639eaa448c6ad.json index 7aef978d6e..3458d1068e 100644 --- a/backend/.sqlx/query-5a9deb187b43fde22c4d32629bc030d2fe256d647a0422ba40dfe15a513dc04d.json +++ b/backend/.sqlx/query-5c72e6e4102039c4426e8eb47d86ec152d4ee52b58f208f2fa1639eaa448c6ad.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO app_script (app, hash, lock, code, code_sha256)\n VALUES ($1, $2, $3, $4, $5)", + "query": "INSERT INTO app_script (app, hash, lock, code, code_sha256)\n VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING", "describe": { "columns": [], "parameters": { @@ -14,5 +14,5 @@ }, "nullable": [] }, - "hash": "5a9deb187b43fde22c4d32629bc030d2fe256d647a0422ba40dfe15a513dc04d" + "hash": "5c72e6e4102039c4426e8eb47d86ec152d4ee52b58f208f2fa1639eaa448c6ad" } diff --git a/backend/.sqlx/query-e64f7044c74e96c2338580562f6b087805dad2b6fb1aa194ac2a2026fa24ecd0.json b/backend/.sqlx/query-e64f7044c74e96c2338580562f6b087805dad2b6fb1aa194ac2a2026fa24ecd0.json deleted file mode 100644 index 4caab26834..0000000000 --- a/backend/.sqlx/query-e64f7044c74e96c2338580562f6b087805dad2b6fb1aa194ac2a2026fa24ecd0.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "select hash, tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, timeout, on_behalf_of_email, created_by FROM script\n WHERE path = $1 AND workspace_id = $2 AND archived = false AND (lock IS NOT NULL OR $3 = false)\n ORDER BY created_at DESC LIMIT 1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "hash", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "tag", - "type_info": "Varchar" - }, - { - "ordinal": 2, - "name": "concurrency_key", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "concurrent_limit", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "concurrency_time_window_s", - "type_info": "Int4" - }, - { - "ordinal": 5, - "name": "cache_ttl", - "type_info": "Int4" - }, - { - "ordinal": 6, - "name": "language: ScriptLang", - "type_info": { - "Custom": { - "name": "script_lang", - "kind": { - "Enum": [ - "python3", - "deno", - "go", - "bash", - "postgresql", - "nativets", - "bun", - "mysql", - "bigquery", - "snowflake", - "graphql", - "powershell", - "mssql", - "php", - "bunnative", - "rust", - "ansible", - "csharp", - "oracledb", - "nu", - "java", - "duckdb", - "ruby" - ] - } - } - } - }, - { - "ordinal": 7, - "name": "dedicated_worker", - "type_info": "Bool" - }, - { - "ordinal": 8, - "name": "priority", - "type_info": "Int2" - }, - { - "ordinal": 9, - "name": "timeout", - "type_info": "Int4" - }, - { - "ordinal": 10, - "name": "on_behalf_of_email", - "type_info": "Text" - }, - { - "ordinal": 11, - "name": "created_by", - "type_info": "Varchar" - } - ], - "parameters": { - "Left": [ - "Text", - "Text", - "Bool" - ] - }, - "nullable": [ - false, - true, - true, - true, - true, - true, - false, - true, - true, - true, - true, - false - ] - }, - "hash": "e64f7044c74e96c2338580562f6b087805dad2b6fb1aa194ac2a2026fa24ecd0" -} diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs index 345ff73086..2b7fbfc93a 100644 --- a/backend/windmill-api/src/workspaces.rs +++ b/backend/windmill-api/src/workspaces.rs @@ -2768,30 +2768,32 @@ async fn clone_apps( app_id_mapping.insert(app.id, new_app_id); } - // Clone app versions - let app_versions = sqlx::query!( - "SELECT app_id, value, created_by, created_at, raw_app + { + // Clone app versions + let app_versions = sqlx::query!( + "SELECT app_id, value, created_by, created_at, raw_app FROM app_version WHERE app_id = ANY(SELECT id FROM app WHERE workspace_id = $1) ORDER BY app_id, created_at", - source_workspace_id - ) - .fetch_all(&mut **tx) - .await?; + source_workspace_id + ) + .fetch_all(&mut **tx) + .await?; - for version in app_versions { - if let Some(&new_app_id) = app_id_mapping.get(&version.app_id) { - sqlx::query!( - "INSERT INTO app_version (app_id, value, created_by, created_at, raw_app) + for version in app_versions { + if let Some(&new_app_id) = app_id_mapping.get(&version.app_id) { + sqlx::query!( + "INSERT INTO app_version (app_id, value, created_by, created_at, raw_app) VALUES ($1, $2, $3, $4, $5)", - new_app_id, - version.value, - version.created_by, - version.created_at, - version.raw_app, - ) - .execute(&mut **tx) - .await?; + new_app_id, + version.value, + version.created_by, + version.created_at, + version.raw_app, + ) + .execute(&mut **tx) + .await?; + } } } @@ -2830,7 +2832,7 @@ async fn clone_apps( sqlx::query!( "INSERT INTO app_script (app, hash, lock, code, code_sha256) - VALUES ($1, $2, $3, $4, $5)", + VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING", new_app_id, new_hash, app_script.lock,