From f864709ab2e37751d09b94f02cb875f36809010b Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 16 Sep 2024 21:15:29 +0200 Subject: [PATCH] fix: cannot create duplicate apps and raw_apps --- backend/windmill-api/src/apps.rs | 2 +- backend/windmill-api/src/raw_apps.rs | 2 +- backend/windmill-worker/src/worker.rs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs index 11fc0b7a74..7bed72c50e 100644 --- a/backend/windmill-api/src/apps.rs +++ b/backend/windmill-api/src/apps.rs @@ -609,7 +609,7 @@ async fn create_app( } let exists = sqlx::query_scalar!( - "SELECT EXISTS(SELECT 1 FROM raw_app WHERE path = $1 AND workspace_id = $2)", + "SELECT EXISTS(SELECT 1 FROM app WHERE path = $1 AND workspace_id = $2)", &app.path, w_id ) diff --git a/backend/windmill-api/src/raw_apps.rs b/backend/windmill-api/src/raw_apps.rs index 20da51f3c7..59f2471c4d 100644 --- a/backend/windmill-api/src/raw_apps.rs +++ b/backend/windmill-api/src/raw_apps.rs @@ -158,7 +158,7 @@ async fn create_app( } let exists = sqlx::query_scalar!( - "SELECT EXISTS(SELECT 1 FROM app WHERE path = $1 AND workspace_id = $2)", + "SELECT EXISTS(SELECT 1 FROM raw_app WHERE path = $1 AND workspace_id = $2)", app.path, w_id ) diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index 5dc4a79bd2..ad4e242be3 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -43,8 +43,6 @@ use std::{ #[cfg(feature = "benchmark")] use std::sync::atomic::AtomicUsize; -#[cfg(feature = "benchmark")] -use std::sync::atomic::AtomicUsize; use uuid::Uuid;