From 82dcb711ca46635683f51dfab9a67204662ddab9 Mon Sep 17 00:00:00 2001 From: hugocasa Date: Fri, 12 Sep 2025 21:31:08 +0200 Subject: [PATCH] fix(backend): email trigger fix build (#6602) * fix(backend): email trigger fix build * update ref --- ...1f7f387f5055c47f493271d26731336257384.json | 10 +-- ...d8635198a4144a3415121800f5df52b2a133f.json | 54 -------------- ...ee4d6a023109e5dcfee7009a25ddf5db5e28d.json | 52 -------------- ...153c43903f929ae5d62fbba12610f89c36d55.json | 2 +- ...a0be238fb16daacb3464bbcf47ca2e21bdaae.json | 3 +- ...7e25e46a37c50a9d1a6eca5a277fb58a2e7b4.json | 70 ++++++++++++++++++ ...04e38ab8474849e0cacb3be1443d7f3265d30.json | 3 +- ...2f5f7f7f57390a0e4b6e7cad45c9147fd6356.json | 72 +++++++++++++++++++ ...18eeeccdd4b7e14a0c0077af9d978f99ae899.json | 3 +- ...bf749ad1d4381fa3b9df8b5bf534f9c13692e.json | 3 +- backend/ee-repo-ref.txt | 2 +- .../windmill-api/src/triggers/http/handler.rs | 1 - 12 files changed, 157 insertions(+), 118 deletions(-) delete mode 100644 backend/.sqlx/query-23fb2099fe211c9c5388f28097ed8635198a4144a3415121800f5df52b2a133f.json delete mode 100644 backend/.sqlx/query-3700706bb0408d6593be7f15f8aee4d6a023109e5dcfee7009a25ddf5db5e28d.json create mode 100644 backend/.sqlx/query-668edc2f84eccf5db6b8daa3ed97e25e46a37c50a9d1a6eca5a277fb58a2e7b4.json create mode 100644 backend/.sqlx/query-bbd51f4f0a8bb2db5d6b634f2d32f5f7f7f57390a0e4b6e7cad45c9147fd6356.json diff --git a/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json b/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json index e7ed0aee65..d29a18c691 100644 --- a/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json +++ b/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json @@ -46,11 +46,11 @@ ] }, "nullable": [ - false, - false, - false, - false, - false, + true, + true, + true, + true, + true, true, true ] diff --git a/backend/.sqlx/query-23fb2099fe211c9c5388f28097ed8635198a4144a3415121800f5df52b2a133f.json b/backend/.sqlx/query-23fb2099fe211c9c5388f28097ed8635198a4144a3415121800f5df52b2a133f.json deleted file mode 100644 index 629531be93..0000000000 --- a/backend/.sqlx/query-23fb2099fe211c9c5388f28097ed8635198a4144a3415121800f5df52b2a133f.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT script_path, is_flow, workspace_id, edited_by, email, path FROM email_trigger WHERE workspace_id = $1 AND local_part = $2 AND (workspaced_local_part = TRUE OR $3 IS TRUE)", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "script_path", - "type_info": "Varchar" - }, - { - "ordinal": 1, - "name": "is_flow", - "type_info": "Bool" - }, - { - "ordinal": 2, - "name": "workspace_id", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "edited_by", - "type_info": "Varchar" - }, - { - "ordinal": 4, - "name": "email", - "type_info": "Varchar" - }, - { - "ordinal": 5, - "name": "path", - "type_info": "Varchar" - } - ], - "parameters": { - "Left": [ - "Text", - "Text", - "Bool" - ] - }, - "nullable": [ - false, - false, - false, - false, - false, - false - ] - }, - "hash": "23fb2099fe211c9c5388f28097ed8635198a4144a3415121800f5df52b2a133f" -} diff --git a/backend/.sqlx/query-3700706bb0408d6593be7f15f8aee4d6a023109e5dcfee7009a25ddf5db5e28d.json b/backend/.sqlx/query-3700706bb0408d6593be7f15f8aee4d6a023109e5dcfee7009a25ddf5db5e28d.json deleted file mode 100644 index 8ccffb9455..0000000000 --- a/backend/.sqlx/query-3700706bb0408d6593be7f15f8aee4d6a023109e5dcfee7009a25ddf5db5e28d.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT script_path, is_flow, workspace_id, edited_by, email, path FROM email_trigger WHERE local_part = $1 AND workspaced_local_part = FALSE", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "script_path", - "type_info": "Varchar" - }, - { - "ordinal": 1, - "name": "is_flow", - "type_info": "Bool" - }, - { - "ordinal": 2, - "name": "workspace_id", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "edited_by", - "type_info": "Varchar" - }, - { - "ordinal": 4, - "name": "email", - "type_info": "Varchar" - }, - { - "ordinal": 5, - "name": "path", - "type_info": "Varchar" - } - ], - "parameters": { - "Left": [ - "Text" - ] - }, - "nullable": [ - false, - false, - false, - false, - false, - false - ] - }, - "hash": "3700706bb0408d6593be7f15f8aee4d6a023109e5dcfee7009a25ddf5db5e28d" -} 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-615d832a452a6c64de50cd0efada0be238fb16daacb3464bbcf47ca2e21bdaae.json b/backend/.sqlx/query-615d832a452a6c64de50cd0efada0be238fb16daacb3464bbcf47ca2e21bdaae.json index fca8d2b883..da8704fe30 100644 --- a/backend/.sqlx/query-615d832a452a6c64de50cd0efada0be238fb16daacb3464bbcf47ca2e21bdaae.json +++ b/backend/.sqlx/query-615d832a452a6c64de50cd0efada0be238fb16daacb3464bbcf47ca2e21bdaae.json @@ -29,7 +29,8 @@ "postgres", "sqs", "mqtt", - "gcp" + "gcp", + "default_email" ] } } diff --git a/backend/.sqlx/query-668edc2f84eccf5db6b8daa3ed97e25e46a37c50a9d1a6eca5a277fb58a2e7b4.json b/backend/.sqlx/query-668edc2f84eccf5db6b8daa3ed97e25e46a37c50a9d1a6eca5a277fb58a2e7b4.json new file mode 100644 index 0000000000..7520bc8879 --- /dev/null +++ b/backend/.sqlx/query-668edc2f84eccf5db6b8daa3ed97e25e46a37c50a9d1a6eca5a277fb58a2e7b4.json @@ -0,0 +1,70 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT \n script_path, \n is_flow, \n workspace_id, \n edited_by, \n email, \n path, \n error_handler_path as \"error_handler_path: _\", \n error_handler_args as \"error_handler_args: _\", \n retry as \"retry: _\" \n FROM email_trigger \n WHERE local_part = $1 \n AND workspaced_local_part = FALSE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "script_path", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "is_flow", + "type_info": "Bool" + }, + { + "ordinal": 2, + "name": "workspace_id", + "type_info": "Varchar" + }, + { + "ordinal": 3, + "name": "edited_by", + "type_info": "Varchar" + }, + { + "ordinal": 4, + "name": "email", + "type_info": "Varchar" + }, + { + "ordinal": 5, + "name": "path", + "type_info": "Varchar" + }, + { + "ordinal": 6, + "name": "error_handler_path: _", + "type_info": "Varchar" + }, + { + "ordinal": 7, + "name": "error_handler_args: _", + "type_info": "Jsonb" + }, + { + "ordinal": 8, + "name": "retry: _", + "type_info": "Jsonb" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + true, + true, + true + ] + }, + "hash": "668edc2f84eccf5db6b8daa3ed97e25e46a37c50a9d1a6eca5a277fb58a2e7b4" +} diff --git a/backend/.sqlx/query-ac9037b8adce156b95390a0ffac04e38ab8474849e0cacb3be1443d7f3265d30.json b/backend/.sqlx/query-ac9037b8adce156b95390a0ffac04e38ab8474849e0cacb3be1443d7f3265d30.json index 4896bdeae1..df39f8f868 100644 --- a/backend/.sqlx/query-ac9037b8adce156b95390a0ffac04e38ab8474849e0cacb3be1443d7f3265d30.json +++ b/backend/.sqlx/query-ac9037b8adce156b95390a0ffac04e38ab8474849e0cacb3be1443d7f3265d30.json @@ -29,7 +29,8 @@ "postgres", "sqs", "mqtt", - "gcp" + "gcp", + "default_email" ] } } diff --git a/backend/.sqlx/query-bbd51f4f0a8bb2db5d6b634f2d32f5f7f7f57390a0e4b6e7cad45c9147fd6356.json b/backend/.sqlx/query-bbd51f4f0a8bb2db5d6b634f2d32f5f7f7f57390a0e4b6e7cad45c9147fd6356.json new file mode 100644 index 0000000000..ab4e5e5d36 --- /dev/null +++ b/backend/.sqlx/query-bbd51f4f0a8bb2db5d6b634f2d32f5f7f7f57390a0e4b6e7cad45c9147fd6356.json @@ -0,0 +1,72 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT \n script_path, \n is_flow, \n workspace_id, \n edited_by, \n email, \n path, \n error_handler_path as \"error_handler_path: _\", \n error_handler_args as \"error_handler_args: _\", \n retry as \"retry: _\" \n FROM email_trigger \n WHERE workspace_id = $1 \n AND local_part = $2 \n AND (workspaced_local_part = TRUE OR $3 IS TRUE)\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "script_path", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "is_flow", + "type_info": "Bool" + }, + { + "ordinal": 2, + "name": "workspace_id", + "type_info": "Varchar" + }, + { + "ordinal": 3, + "name": "edited_by", + "type_info": "Varchar" + }, + { + "ordinal": 4, + "name": "email", + "type_info": "Varchar" + }, + { + "ordinal": 5, + "name": "path", + "type_info": "Varchar" + }, + { + "ordinal": 6, + "name": "error_handler_path: _", + "type_info": "Varchar" + }, + { + "ordinal": 7, + "name": "error_handler_args: _", + "type_info": "Jsonb" + }, + { + "ordinal": 8, + "name": "retry: _", + "type_info": "Jsonb" + } + ], + "parameters": { + "Left": [ + "Text", + "Text", + "Bool" + ] + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + true, + true, + true + ] + }, + "hash": "bbd51f4f0a8bb2db5d6b634f2d32f5f7f7f57390a0e4b6e7cad45c9147fd6356" +} diff --git a/backend/.sqlx/query-db7b39335049f7b5fbb1ba2b99618eeeccdd4b7e14a0c0077af9d978f99ae899.json b/backend/.sqlx/query-db7b39335049f7b5fbb1ba2b99618eeeccdd4b7e14a0c0077af9d978f99ae899.json index 5cb129c672..1b48864951 100644 --- a/backend/.sqlx/query-db7b39335049f7b5fbb1ba2b99618eeeccdd4b7e14a0c0077af9d978f99ae899.json +++ b/backend/.sqlx/query-db7b39335049f7b5fbb1ba2b99618eeeccdd4b7e14a0c0077af9d978f99ae899.json @@ -23,7 +23,8 @@ "postgres", "sqs", "mqtt", - "gcp" + "gcp", + "default_email" ] } } diff --git a/backend/.sqlx/query-dcaf17a826e8f4cba4145abcf72bf749ad1d4381fa3b9df8b5bf534f9c13692e.json b/backend/.sqlx/query-dcaf17a826e8f4cba4145abcf72bf749ad1d4381fa3b9df8b5bf534f9c13692e.json index a86bfa2b3e..95b23e62bf 100644 --- a/backend/.sqlx/query-dcaf17a826e8f4cba4145abcf72bf749ad1d4381fa3b9df8b5bf534f9c13692e.json +++ b/backend/.sqlx/query-dcaf17a826e8f4cba4145abcf72bf749ad1d4381fa3b9df8b5bf534f9c13692e.json @@ -22,7 +22,8 @@ "postgres", "sqs", "mqtt", - "gcp" + "gcp", + "default_email" ] } } diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 4cab2903fb..a7a242511a 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -8d3c5d3bdf03b43d6f4b4ede30ab276354874724 \ No newline at end of file +7d665414b89d2de81a5d2a731a04e250537095f4 \ No newline at end of file diff --git a/backend/windmill-api/src/triggers/http/handler.rs b/backend/windmill-api/src/triggers/http/handler.rs index 890f44531f..93dfe3bb49 100644 --- a/backend/windmill-api/src/triggers/http/handler.rs +++ b/backend/windmill-api/src/triggers/http/handler.rs @@ -1006,7 +1006,6 @@ async fn route_job( trigger.error_handler_path.as_deref(), trigger.error_handler_args.as_ref(), format!("http_trigger/{}", trigger.path), - None, ) .await .map_err(|e| e.into_response())