kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert last commit

Browse Source
This commit is contained in:
Ruben Fiszel
2025-02-13 19:38:58 +01:00
parent 3b95237e1e
commit 9765884e1a
2 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/ee-repo-ref.txt
View File

@@ -1 +1 @@
841642097f07cc1f765ef74059d66aae2eba2c1d
703a03ac430b6f603a5a189e5b4ff9a42bb2bd7f

186
backend/windmill-api/src/db.rs
View File

@@ -6,8 +6,6 @@
* LICENSE-AGPL for a copy of the license.
*/
use std::time::Duration;
use futures::FutureExt;
use sqlx::{
migrate::{Migrate, MigrateError},
@@ -16,11 +14,11 @@ use sqlx::{
};
use windmill_audit::audit_ee::{AuditAuthor, AuditAuthorable};
use windmill_common::utils::generate_lock_id;
use windmill_common::{
db::{Authable, Authed},
error::Error,
};
use windmill_common::{utils::generate_lock_id, worker::MIN_VERSION_IS_AT_LEAST_1_461};
pub type DB = Pool<Postgres>;
@@ -366,98 +364,98 @@ macro_rules! run_windmill_migration {
};
}
async fn v2_finalize(db: &DB) -> Result<(), Error> {
run_windmill_migration!("v2_finalize_disable_sync", db, |tx| {
tx.execute(
r#"
DROP FUNCTION v2_job_after_update CASCADE;
DROP FUNCTION v2_job_completed_before_insert CASCADE;
DROP FUNCTION v2_job_completed_before_update CASCADE;
DROP FUNCTION v2_job_queue_after_insert CASCADE;
DROP FUNCTION v2_job_queue_before_insert CASCADE;
DROP FUNCTION v2_job_queue_before_update CASCADE;
DROP FUNCTION v2_job_runtime_before_insert CASCADE;
DROP FUNCTION v2_job_runtime_before_update CASCADE;
DROP FUNCTION v2_job_status_before_insert CASCADE;
DROP FUNCTION v2_job_status_before_update CASCADE;
// async fn v2_finalize(db: &DB) -> Result<(), Error> {
// run_windmill_migration!("v2_finalize_disable_sync", db, |tx| {
// tx.execute(
// r#"
// DROP FUNCTION v2_job_after_update CASCADE;
// DROP FUNCTION v2_job_completed_before_insert CASCADE;
// DROP FUNCTION v2_job_completed_before_update CASCADE;
// DROP FUNCTION v2_job_queue_after_insert CASCADE;
// DROP FUNCTION v2_job_queue_before_insert CASCADE;
// DROP FUNCTION v2_job_queue_before_update CASCADE;
// DROP FUNCTION v2_job_runtime_before_insert CASCADE;
// DROP FUNCTION v2_job_runtime_before_update CASCADE;
// DROP FUNCTION v2_job_status_before_insert CASCADE;
// DROP FUNCTION v2_job_status_before_update CASCADE;
DROP VIEW completed_job, completed_job_view, job, queue, queue_view CASCADE;
"#,
)
.await?;
});
run_windmill_migration!("v2_finalize_job_queue", db, |tx| {
tx.execute(
r#"
ALTER TABLE v2_job_queue
DROP COLUMN __parent_job CASCADE,
DROP COLUMN __created_by CASCADE,
DROP COLUMN __script_hash CASCADE,
DROP COLUMN __script_path CASCADE,
DROP COLUMN __args CASCADE,
DROP COLUMN __logs CASCADE,
DROP COLUMN __raw_code CASCADE,
DROP COLUMN __canceled CASCADE,
DROP COLUMN __last_ping CASCADE,
DROP COLUMN __job_kind CASCADE,
DROP COLUMN __env_id CASCADE,
DROP COLUMN __schedule_path CASCADE,
DROP COLUMN __permissioned_as CASCADE,
DROP COLUMN __flow_status CASCADE,
DROP COLUMN __raw_flow CASCADE,
DROP COLUMN __is_flow_step CASCADE,
DROP COLUMN __language CASCADE,
DROP COLUMN __same_worker CASCADE,
DROP COLUMN __raw_lock CASCADE,
DROP COLUMN __pre_run_error CASCADE,
DROP COLUMN __email CASCADE,
DROP COLUMN __visible_to_owner CASCADE,
DROP COLUMN __mem_peak CASCADE,
DROP COLUMN __root_job CASCADE,
DROP COLUMN __leaf_jobs CASCADE,
DROP COLUMN __concurrent_limit CASCADE,
DROP COLUMN __concurrency_time_window_s CASCADE,
DROP COLUMN __timeout CASCADE,
DROP COLUMN __flow_step_id CASCADE,
DROP COLUMN __cache_ttl CASCADE;
"#,
)
.await?;
});
run_windmill_migration!("v2_finalize_job_completed", db, |tx| {
tx.execute(
r#"
LOCK TABLE v2_job_queue IN ACCESS EXCLUSIVE MODE;
ALTER TABLE v2_job_completed
DROP COLUMN __parent_job CASCADE,
DROP COLUMN __created_by CASCADE,
DROP COLUMN __created_at CASCADE,
DROP COLUMN __success CASCADE,
DROP COLUMN __script_hash CASCADE,
DROP COLUMN __script_path CASCADE,
DROP COLUMN __args CASCADE,
DROP COLUMN __logs CASCADE,
DROP COLUMN __raw_code CASCADE,
DROP COLUMN __canceled CASCADE,
DROP COLUMN __job_kind CASCADE,
DROP COLUMN __env_id CASCADE,
DROP COLUMN __schedule_path CASCADE,
DROP COLUMN __permissioned_as CASCADE,
DROP COLUMN __raw_flow CASCADE,
DROP COLUMN __is_flow_step CASCADE,
DROP COLUMN __language CASCADE,
DROP COLUMN __is_skipped CASCADE,
DROP COLUMN __raw_lock CASCADE,
DROP COLUMN __email CASCADE,
DROP COLUMN __visible_to_owner CASCADE,
DROP COLUMN __tag CASCADE,
DROP COLUMN __priority CASCADE;
"#,
)
.await?;
});
Ok(())
}
// DROP VIEW completed_job, completed_job_view, job, queue, queue_view CASCADE;
// "#,
// )
// .await?;
// });
// run_windmill_migration!("v2_finalize_job_queue", db, |tx| {
// tx.execute(
// r#"
// ALTER TABLE v2_job_queue
// DROP COLUMN __parent_job CASCADE,
// DROP COLUMN __created_by CASCADE,
// DROP COLUMN __script_hash CASCADE,
// DROP COLUMN __script_path CASCADE,
// DROP COLUMN __args CASCADE,
// DROP COLUMN __logs CASCADE,
// DROP COLUMN __raw_code CASCADE,
// DROP COLUMN __canceled CASCADE,
// DROP COLUMN __last_ping CASCADE,
// DROP COLUMN __job_kind CASCADE,
// DROP COLUMN __env_id CASCADE,
// DROP COLUMN __schedule_path CASCADE,
// DROP COLUMN __permissioned_as CASCADE,
// DROP COLUMN __flow_status CASCADE,
// DROP COLUMN __raw_flow CASCADE,
// DROP COLUMN __is_flow_step CASCADE,
// DROP COLUMN __language CASCADE,
// DROP COLUMN __same_worker CASCADE,
// DROP COLUMN __raw_lock CASCADE,
// DROP COLUMN __pre_run_error CASCADE,
// DROP COLUMN __email CASCADE,
// DROP COLUMN __visible_to_owner CASCADE,
// DROP COLUMN __mem_peak CASCADE,
// DROP COLUMN __root_job CASCADE,
// DROP COLUMN __leaf_jobs CASCADE,
// DROP COLUMN __concurrent_limit CASCADE,
// DROP COLUMN __concurrency_time_window_s CASCADE,
// DROP COLUMN __timeout CASCADE,
// DROP COLUMN __flow_step_id CASCADE,
// DROP COLUMN __cache_ttl CASCADE;
// "#,
// )
// .await?;
// });
// run_windmill_migration!("v2_finalize_job_completed", db, |tx| {
// tx.execute(
// r#"
// LOCK TABLE v2_job_queue IN ACCESS EXCLUSIVE MODE;
// ALTER TABLE v2_job_completed
// DROP COLUMN __parent_job CASCADE,
// DROP COLUMN __created_by CASCADE,
// DROP COLUMN __created_at CASCADE,
// DROP COLUMN __success CASCADE,
// DROP COLUMN __script_hash CASCADE,
// DROP COLUMN __script_path CASCADE,
// DROP COLUMN __args CASCADE,
// DROP COLUMN __logs CASCADE,
// DROP COLUMN __raw_code CASCADE,
// DROP COLUMN __canceled CASCADE,
// DROP COLUMN __job_kind CASCADE,
// DROP COLUMN __env_id CASCADE,
// DROP COLUMN __schedule_path CASCADE,
// DROP COLUMN __permissioned_as CASCADE,
// DROP COLUMN __raw_flow CASCADE,
// DROP COLUMN __is_flow_step CASCADE,
// DROP COLUMN __language CASCADE,
// DROP COLUMN __is_skipped CASCADE,
// DROP COLUMN __raw_lock CASCADE,
// DROP COLUMN __email CASCADE,
// DROP COLUMN __visible_to_owner CASCADE,
// DROP COLUMN __tag CASCADE,
// DROP COLUMN __priority CASCADE;
// "#,
// )
// .await?;
// });
// Ok(())
// }
async fn fix_job_completed_index(db: &DB) -> Result<(), Error> {
// let has_done_migration = sqlx::query_scalar!(