From 2f5245e1a1d48e64dfd613886633f43024eafa08 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 8 May 2025 15:24:21 +0200 Subject: [PATCH] remove hardcoded public schema --- backend/windmill-api/src/db.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs index 1ecef03fc5..557981d214 100644 --- a/backend/windmill-api/src/db.rs +++ b/backend/windmill-api/src/db.rs @@ -48,6 +48,9 @@ lazy_static::lazy_static! { (20250102145420, include_str!( "../../migrations/20250102145420_more_captures.up.sql" ).replace("public.", "")), + (20250429211554, include_str!( + "../../migrations/20250429211554_create_indices_on_queue.up.sql" + ).replace("public.", "")), (20241006144414, include_str!( "../../custom_migrations/grant_all_current_schema.sql" ).to_string()), @@ -231,7 +234,7 @@ pub async fn migrate(db: &DB) -> Result>, Error> { { Ok(_) => Ok(()), Err(sqlx::migrate::MigrateError::VersionMissing(e)) => { - tracing::error!("Database had been applied more migrations than this container. + tracing::error!("Database had been applied more migrations than this container. This usually mean than another container on a more recent version migrated the database and this one is on an earlier version. Please update the container to latest. Not critical, but may cause issues if migration introduced a breaking change. Version missing: {e:#}"); custom_migrator.unlock().await?; @@ -433,7 +436,7 @@ async fn v2_finalize(db: &DB) -> Result<(), Error> { r#" LOCK TABLE v2_job_completed IN ACCESS EXCLUSIVE MODE; DROP FUNCTION IF EXISTS v2_job_completed_before_insert CASCADE; - DROP FUNCTION IF EXISTS v2_job_completed_before_update CASCADE; + DROP FUNCTION IF EXISTS v2_job_completed_before_update CASCADE; "#, ) .await?; @@ -445,7 +448,7 @@ async fn v2_finalize(db: &DB) -> Result<(), Error> { LOCK TABLE v2_job_queue IN ACCESS EXCLUSIVE MODE; DROP FUNCTION IF EXISTS v2_job_queue_after_insert CASCADE; DROP FUNCTION IF EXISTS v2_job_queue_before_insert CASCADE; - DROP FUNCTION IF EXISTS v2_job_queue_before_update CASCADE; + DROP FUNCTION IF EXISTS v2_job_queue_before_update CASCADE; "#, ) .await?; @@ -456,7 +459,7 @@ async fn v2_finalize(db: &DB) -> Result<(), Error> { r#" LOCK TABLE v2_job_runtime IN ACCESS EXCLUSIVE MODE; DROP FUNCTION IF EXISTS v2_job_runtime_before_insert CASCADE; - DROP FUNCTION IF EXISTS v2_job_runtime_before_update CASCADE; + DROP FUNCTION IF EXISTS v2_job_runtime_before_update CASCADE; "#, ) .await?; @@ -467,7 +470,7 @@ async fn v2_finalize(db: &DB) -> Result<(), Error> { r#" LOCK TABLE v2_job_status IN ACCESS EXCLUSIVE MODE; DROP FUNCTION IF EXISTS v2_job_status_before_insert CASCADE; - DROP FUNCTION IF EXISTS v2_job_status_before_update CASCADE; + DROP FUNCTION IF EXISTS v2_job_status_before_update CASCADE; "#, ) .await?;