From 766badd2cc4db573ea1dc0baf41a653771f19243 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 6 Nov 2023 05:16:48 +0100 Subject: [PATCH] fix sqlx --- ...f476d1a4a97059c12253caf8361257c4d26fc5b92b1b9.json} | 10 ++++++++-- ...778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json} | 5 +++-- .../20231105173726_add_worker_version.down.sql | 2 ++ .../20231105173726_add_worker_version.up.sql | 2 ++ 4 files changed, 15 insertions(+), 4 deletions(-) rename backend/.sqlx/{query-240ce8c9b5c7530999642190c6f7915ae2734b90b8c4cd35fe37783b1d4dd0b0.json => query-6a7eac3f0e5fbda17fff476d1a4a97059c12253caf8361257c4d26fc5b92b1b9.json} (80%) rename backend/.sqlx/{query-03c7f098ad795d216d58ded0bf4cf6473960377455b5fd7ac3b578a1d36c0cc6.json => query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json} (53%) create mode 100644 backend/migrations/20231105173726_add_worker_version.down.sql create mode 100644 backend/migrations/20231105173726_add_worker_version.up.sql diff --git a/backend/.sqlx/query-240ce8c9b5c7530999642190c6f7915ae2734b90b8c4cd35fe37783b1d4dd0b0.json b/backend/.sqlx/query-6a7eac3f0e5fbda17fff476d1a4a97059c12253caf8361257c4d26fc5b92b1b9.json similarity index 80% rename from backend/.sqlx/query-240ce8c9b5c7530999642190c6f7915ae2734b90b8c4cd35fe37783b1d4dd0b0.json rename to backend/.sqlx/query-6a7eac3f0e5fbda17fff476d1a4a97059c12253caf8361257c4d26fc5b92b1b9.json index d6bbf3583d..28414e2d66 100644 --- a/backend/.sqlx/query-240ce8c9b5c7530999642190c6f7915ae2734b90b8c4cd35fe37783b1d4dd0b0.json +++ b/backend/.sqlx/query-6a7eac3f0e5fbda17fff476d1a4a97059c12253caf8361257c4d26fc5b92b1b9.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT worker, worker_instance, EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, custom_tags, worker_group FROM worker_ping ORDER BY ping_at desc LIMIT $1 OFFSET $2", + "query": "SELECT worker, worker_instance, EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, custom_tags, worker_group, wm_version FROM worker_ping ORDER BY ping_at desc LIMIT $1 OFFSET $2", "describe": { "columns": [ { @@ -42,6 +42,11 @@ "ordinal": 7, "name": "worker_group", "type_info": "Varchar" + }, + { + "ordinal": 8, + "name": "wm_version", + "type_info": "Varchar" } ], "parameters": { @@ -58,8 +63,9 @@ false, false, true, + false, false ] }, - "hash": "240ce8c9b5c7530999642190c6f7915ae2734b90b8c4cd35fe37783b1d4dd0b0" + "hash": "6a7eac3f0e5fbda17fff476d1a4a97059c12253caf8361257c4d26fc5b92b1b9" } diff --git a/backend/.sqlx/query-03c7f098ad795d216d58ded0bf4cf6473960377455b5fd7ac3b578a1d36c0cc6.json b/backend/.sqlx/query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json similarity index 53% rename from backend/.sqlx/query-03c7f098ad795d216d58ded0bf4cf6473960377455b5fd7ac3b578a1d36c0cc6.json rename to backend/.sqlx/query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json index 2f9eb8c94f..f60e074866 100644 --- a/backend/.sqlx/query-03c7f098ad795d216d58ded0bf4cf6473960377455b5fd7ac3b578a1d36c0cc6.json +++ b/backend/.sqlx/query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5", + "query": "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker, wm_version) VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5", "describe": { "columns": [], "parameters": { @@ -10,10 +10,11 @@ "Varchar", "TextArray", "Varchar", + "Varchar", "Varchar" ] }, "nullable": [] }, - "hash": "03c7f098ad795d216d58ded0bf4cf6473960377455b5fd7ac3b578a1d36c0cc6" + "hash": "7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa" } diff --git a/backend/migrations/20231105173726_add_worker_version.down.sql b/backend/migrations/20231105173726_add_worker_version.down.sql new file mode 100644 index 0000000000..652e6aae7d --- /dev/null +++ b/backend/migrations/20231105173726_add_worker_version.down.sql @@ -0,0 +1,2 @@ +-- Add down migration script here +ALTER TABLE worker_ping DROP COLUMN wm_version; \ No newline at end of file diff --git a/backend/migrations/20231105173726_add_worker_version.up.sql b/backend/migrations/20231105173726_add_worker_version.up.sql new file mode 100644 index 0000000000..2df833870c --- /dev/null +++ b/backend/migrations/20231105173726_add_worker_version.up.sql @@ -0,0 +1,2 @@ +-- Add up migration script here +ALTER TABLE worker_ping ADD COLUMN IF NOT EXISTS wm_version VARCHAR(255) NOT NULL DEFAULT ''; \ No newline at end of file