diff --git a/backend/.sqlx/query-fe58ca3cef78c73867d309156df2b74f7127bf6cba25c9a0c5ca5eedd6a19aff.json b/backend/.sqlx/query-fe58ca3cef78c73867d309156df2b74f7127bf6cba25c9a0c5ca5eedd6a19aff.json new file mode 100644 index 0000000000..1188489d89 --- /dev/null +++ b/backend/.sqlx/query-fe58ca3cef78c73867d309156df2b74f7127bf6cba25c9a0c5ca5eedd6a19aff.json @@ -0,0 +1,12 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM _sqlx_migrations WHERE version=20250131115248", + "describe": { + "columns": [], + "parameters": { + "Left": [] + }, + "nullable": [] + }, + "hash": "fe58ca3cef78c73867d309156df2b74f7127bf6cba25c9a0c5ca5eedd6a19aff" +} diff --git a/backend/migrations/20250131182047_otel_global_settings_v2.down.sql b/backend/migrations/20250131182047_otel_global_settings_v2.down.sql new file mode 100644 index 0000000000..7d2a024490 --- /dev/null +++ b/backend/migrations/20250131182047_otel_global_settings_v2.down.sql @@ -0,0 +1 @@ +DELETE FROM global_settings WHERE name = 'otel'; diff --git a/backend/migrations/20250131182047_otel_global_settings_v2.up.sql b/backend/migrations/20250131182047_otel_global_settings_v2.up.sql new file mode 100644 index 0000000000..8227396ebc --- /dev/null +++ b/backend/migrations/20250131182047_otel_global_settings_v2.up.sql @@ -0,0 +1,3 @@ +INSERT INTO global_settings (name, value) +VALUES ('otel', '{}') +ON CONFLICT (name) DO NOTHING; diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs index 6186b0ada1..6cff3872e7 100644 --- a/backend/windmill-api/src/db.rs +++ b/backend/windmill-api/src/db.rs @@ -173,6 +173,13 @@ pub async fn migrate(db: &DB) -> Result<(), Error> { let migrator = db.acquire().await?; let mut custom_migrator = CustomMigrator { inner: migrator }; + if let Err(err) = sqlx::query!("DELETE FROM _sqlx_migrations WHERE version=20250131115248") + .execute(db) + .await + { + tracing::info!("Could not remove sqlx migration with version=20250131115248: {err:#}"); + } + match sqlx::migrate!("../migrations") .run_direct(&mut custom_migrator) .await