starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-20 16:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: always clean up global_settings even if database doesn't exist

Browse Source 
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Diego Imbert
2026-03-27 15:26:58 +01:00
parent 68df399838
commit fbc07603a7
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-common/src/lib.rs
+22 -25
View File
@@ -576,35 +576,32 @@ pub async fn drop_custom_instance_database(db: &DB, dbname: &str) -> error::Resu
.await?
.unwrap_or(false);
if !db_exists {
return Err(error::Error::NotFound(format!(
"Database '{}' does not exist",
dbname
)));
}
// Terminate active connections
if let Err(e) = sqlx::query(&format!(
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '{}' AND pid <> pg_backend_pid()",
dbname.replace('\'', "''")
))
.execute(db)
.await
{
tracing::warn!("Failed to terminate connections to '{}': {}", dbname, e);
}
// Drop the database
sqlx::query(&format!("DROP DATABASE IF EXISTS \"{}\"", dbname))
if db_exists {
// Terminate active connections
if let Err(e) = sqlx::query(&format!(
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '{}' AND pid <> pg_backend_pid()",
dbname.replace('\'', "''")
))
.execute(db)
.await
.map_err(|e| {
error::Error::internal_err(format!("Failed to drop database '{}': {}", dbname, e))
})?;
{
tracing::warn!("Failed to terminate connections to '{}': {}", dbname, e);
}
tracing::info!("Dropped instance database '{}'", dbname);
// Drop the database
sqlx::query(&format!("DROP DATABASE IF EXISTS \"{}\"", dbname))
.execute(db)
.await
.map_err(|e| {
error::Error::internal_err(format!("Failed to drop database '{}': {}", dbname, e))
})?;
// Remove from global_settings
tracing::info!("Dropped instance database '{}'", dbname);
} else {
tracing::info!("Database '{}' does not exist, skipping drop", dbname);
}
// Always remove from global_settings
sqlx::query!(
r#"UPDATE global_settings SET value = value #- ARRAY['databases', $1] WHERE name = 'custom_instance_pg_databases'"#,
dbname