From 169d93e7b4ffdaeb6cf45d80f6f0feae7639cf7a Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 20 Jul 2023 20:24:11 +0200 Subject: [PATCH] fix: remove lockfile on any rawinput change in flows --- ...dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c.json | 15 +++++++++++ ...3223fd20548fb106d2a5e5669c0e23ecaa0eb.json | 22 ++++++++++++++++ ...a1e5186d3d107e2ded97df1cfac49580a2ed1.json | 15 +++++++++++ ...2c04910e2362029d6c9d4eb9ee8ebc70231cb.json | 14 ++++++++++ ...e512d3b0daf5ecc0d245d53504278b2d6eaa4.json | 26 +++++++++++++++++++ ...a4d904069ef91467ece10c158af2430da1e39.json | 15 +++++++++++ .../20230720092702_instance_groups.down.sql | 3 +++ .../20230720092702_instance_groups.up.sql | 3 +++ backend/windmill-api/src/groups.rs | 1 - 9 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 backend/.sqlx/query-383b8adaadc6e23952ca8942fe7dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c.json create mode 100644 backend/.sqlx/query-565db14b889f69dfbda5db400a33223fd20548fb106d2a5e5669c0e23ecaa0eb.json create mode 100644 backend/.sqlx/query-a77717db3326091974fe7d1d248a1e5186d3d107e2ded97df1cfac49580a2ed1.json create mode 100644 backend/.sqlx/query-c9f7da8404969eacb02a61c354c2c04910e2362029d6c9d4eb9ee8ebc70231cb.json create mode 100644 backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json create mode 100644 backend/.sqlx/query-dc96a920fcea89f4ba695fa3a1fa4d904069ef91467ece10c158af2430da1e39.json create mode 100644 backend/migrations/20230720092702_instance_groups.down.sql create mode 100644 backend/migrations/20230720092702_instance_groups.up.sql diff --git a/backend/.sqlx/query-383b8adaadc6e23952ca8942fe7dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c.json b/backend/.sqlx/query-383b8adaadc6e23952ca8942fe7dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c.json new file mode 100644 index 0000000000..db96fe6009 --- /dev/null +++ b/backend/.sqlx/query-383b8adaadc6e23952ca8942fe7dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO instance_group (name, summary) VALUES ($1, $2) ON CONFLICT DO NOTHING", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar", + "Varchar" + ] + }, + "nullable": [] + }, + "hash": "383b8adaadc6e23952ca8942fe7dbaa7c74ce0cfa1b945b7514e19a70f7a6f1c" +} diff --git a/backend/.sqlx/query-565db14b889f69dfbda5db400a33223fd20548fb106d2a5e5669c0e23ecaa0eb.json b/backend/.sqlx/query-565db14b889f69dfbda5db400a33223fd20548fb106d2a5e5669c0e23ecaa0eb.json new file mode 100644 index 0000000000..af526daf8f --- /dev/null +++ b/backend/.sqlx/query-565db14b889f69dfbda5db400a33223fd20548fb106d2a5e5669c0e23ecaa0eb.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT name FROM instance_group WHERE name = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "name", + "type_info": "Varchar" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "565db14b889f69dfbda5db400a33223fd20548fb106d2a5e5669c0e23ecaa0eb" +} diff --git a/backend/.sqlx/query-a77717db3326091974fe7d1d248a1e5186d3d107e2ded97df1cfac49580a2ed1.json b/backend/.sqlx/query-a77717db3326091974fe7d1d248a1e5186d3d107e2ded97df1cfac49580a2ed1.json new file mode 100644 index 0000000000..2883145d16 --- /dev/null +++ b/backend/.sqlx/query-a77717db3326091974fe7d1d248a1e5186d3d107e2ded97df1cfac49580a2ed1.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO email_to_igroup (email, igroup) VALUES ($1, $2) ON CONFLICT DO NOTHING", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar", + "Varchar" + ] + }, + "nullable": [] + }, + "hash": "a77717db3326091974fe7d1d248a1e5186d3d107e2ded97df1cfac49580a2ed1" +} diff --git a/backend/.sqlx/query-c9f7da8404969eacb02a61c354c2c04910e2362029d6c9d4eb9ee8ebc70231cb.json b/backend/.sqlx/query-c9f7da8404969eacb02a61c354c2c04910e2362029d6c9d4eb9ee8ebc70231cb.json new file mode 100644 index 0000000000..0cd0741808 --- /dev/null +++ b/backend/.sqlx/query-c9f7da8404969eacb02a61c354c2c04910e2362029d6c9d4eb9ee8ebc70231cb.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM instance_group WHERE name = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [] + }, + "hash": "c9f7da8404969eacb02a61c354c2c04910e2362029d6c9d4eb9ee8ebc70231cb" +} diff --git a/backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json b/backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json new file mode 100644 index 0000000000..854f4740ef --- /dev/null +++ b/backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT igroup as name, array_agg(email_to_igroup.email) as emails FROM email_to_igroup GROUP BY igroup", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "name", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "emails", + "type_info": "VarcharArray" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + null + ] + }, + "hash": "d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4" +} diff --git a/backend/.sqlx/query-dc96a920fcea89f4ba695fa3a1fa4d904069ef91467ece10c158af2430da1e39.json b/backend/.sqlx/query-dc96a920fcea89f4ba695fa3a1fa4d904069ef91467ece10c158af2430da1e39.json new file mode 100644 index 0000000000..bda2f41873 --- /dev/null +++ b/backend/.sqlx/query-dc96a920fcea89f4ba695fa3a1fa4d904069ef91467ece10c158af2430da1e39.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM email_to_igroup WHERE email = $1 AND igroup = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "dc96a920fcea89f4ba695fa3a1fa4d904069ef91467ece10c158af2430da1e39" +} diff --git a/backend/migrations/20230720092702_instance_groups.down.sql b/backend/migrations/20230720092702_instance_groups.down.sql new file mode 100644 index 0000000000..02dfa1c41d --- /dev/null +++ b/backend/migrations/20230720092702_instance_groups.down.sql @@ -0,0 +1,3 @@ +-- Add down migration script here +DROP TABLE instance_group; +DROP TABLE email_to_igroup; \ No newline at end of file diff --git a/backend/migrations/20230720092702_instance_groups.up.sql b/backend/migrations/20230720092702_instance_groups.up.sql new file mode 100644 index 0000000000..f9b93c6083 --- /dev/null +++ b/backend/migrations/20230720092702_instance_groups.up.sql @@ -0,0 +1,3 @@ +-- Add up migration script here +CREATE TABLE instance_group (name VARCHAR(255) PRIMARY KEY, summary VARCHAR(2000), external_id VARCHAR(1000)); +CREATE TABLE email_to_igroup (email VARCHAR(255), igroup VARCHAR(255), PRIMARY KEY (email, igroup)); \ No newline at end of file diff --git a/backend/windmill-api/src/groups.rs b/backend/windmill-api/src/groups.rs index d0c9640d5d..43c6ab33cb 100644 --- a/backend/windmill-api/src/groups.rs +++ b/backend/windmill-api/src/groups.rs @@ -529,7 +529,6 @@ async fn list_igroups(authed: Authed, Extension(db): Extension) -> JsonResul .await?; tx.commit().await?; - return Ok(Json(groups)); }