From 05d59b0e39ff26ad706268cc10f596e7e73627fc Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Tue, 21 Sep 2021 14:05:09 +0200 Subject: [PATCH] Move migration changes to separate files Moves the migration changes introduced in 5d287b7 to separate migration files, so existing requeuest deployments can migrate without issue. --- migrations/20210316025847_setup.down.sql | 2 -- migrations/20210316025847_setup.up.sql | 21 ------------------- migrations/20210921115907_clear.down.sql | 2 ++ migrations/20210921115907_clear.up.sql | 21 +++++++++++++++++++ .../migrations/20210316025847_setup.down.sql | 2 -- .../migrations/20210316025847_setup.up.sql | 21 ------------------- .../migrations/20210921115907_clear.down.sql | 2 ++ .../migrations/20210921115907_clear.up.sql | 21 +++++++++++++++++++ 8 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 migrations/20210921115907_clear.down.sql create mode 100644 migrations/20210921115907_clear.up.sql create mode 100644 sqlxmq_stress/migrations/20210921115907_clear.down.sql create mode 100644 sqlxmq_stress/migrations/20210921115907_clear.up.sql diff --git a/migrations/20210316025847_setup.down.sql b/migrations/20210316025847_setup.down.sql index f40b008..1aa472e 100644 --- a/migrations/20210316025847_setup.down.sql +++ b/migrations/20210316025847_setup.down.sql @@ -1,5 +1,3 @@ -DROP FUNCTION mq_clear; -DROP FUNCTION mq_clear_all; DROP FUNCTION mq_checkpoint; DROP FUNCTION mq_keep_alive; DROP FUNCTION mq_delete; diff --git a/migrations/20210316025847_setup.up.sql b/migrations/20210316025847_setup.up.sql index 187c7e3..bf7f8f8 100644 --- a/migrations/20210316025847_setup.up.sql +++ b/migrations/20210316025847_setup.up.sql @@ -287,24 +287,3 @@ RETURNS VOID AS $$ id = msg_id; $$ LANGUAGE SQL; --- Deletes all messages from a list of channel names. -CREATE FUNCTION mq_clear(channel_names TEXT[]) -RETURNS VOID AS $$ -BEGIN - WITH deleted_ids AS ( - DELETE FROM mq_msgs WHERE channel_name = ANY(channel_names) RETURNING id - ) - DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); -END; -$$ LANGUAGE plpgsql; - --- Deletes all messages. -CREATE FUNCTION mq_clear_all() -RETURNS VOID AS $$ -BEGIN - WITH deleted_ids AS ( - DELETE FROM mq_msgs RETURNING id - ) - DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); -END; -$$ LANGUAGE plpgsql; diff --git a/migrations/20210921115907_clear.down.sql b/migrations/20210921115907_clear.down.sql new file mode 100644 index 0000000..e15638d --- /dev/null +++ b/migrations/20210921115907_clear.down.sql @@ -0,0 +1,2 @@ +DROP FUNCTION mq_clear; +DROP FUNCTION mq_clear_all; diff --git a/migrations/20210921115907_clear.up.sql b/migrations/20210921115907_clear.up.sql new file mode 100644 index 0000000..bd1c1f6 --- /dev/null +++ b/migrations/20210921115907_clear.up.sql @@ -0,0 +1,21 @@ +-- Deletes all messages from a list of channel names. +CREATE FUNCTION mq_clear(channel_names TEXT[]) +RETURNS VOID AS $$ +BEGIN + WITH deleted_ids AS ( + DELETE FROM mq_msgs WHERE channel_name = ANY(channel_names) RETURNING id + ) + DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); +END; +$$ LANGUAGE plpgsql; + +-- Deletes all messages. +CREATE FUNCTION mq_clear_all() +RETURNS VOID AS $$ +BEGIN + WITH deleted_ids AS ( + DELETE FROM mq_msgs RETURNING id + ) + DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); +END; +$$ LANGUAGE plpgsql; diff --git a/sqlxmq_stress/migrations/20210316025847_setup.down.sql b/sqlxmq_stress/migrations/20210316025847_setup.down.sql index f40b008..1aa472e 100644 --- a/sqlxmq_stress/migrations/20210316025847_setup.down.sql +++ b/sqlxmq_stress/migrations/20210316025847_setup.down.sql @@ -1,5 +1,3 @@ -DROP FUNCTION mq_clear; -DROP FUNCTION mq_clear_all; DROP FUNCTION mq_checkpoint; DROP FUNCTION mq_keep_alive; DROP FUNCTION mq_delete; diff --git a/sqlxmq_stress/migrations/20210316025847_setup.up.sql b/sqlxmq_stress/migrations/20210316025847_setup.up.sql index 187c7e3..bf7f8f8 100644 --- a/sqlxmq_stress/migrations/20210316025847_setup.up.sql +++ b/sqlxmq_stress/migrations/20210316025847_setup.up.sql @@ -287,24 +287,3 @@ RETURNS VOID AS $$ id = msg_id; $$ LANGUAGE SQL; --- Deletes all messages from a list of channel names. -CREATE FUNCTION mq_clear(channel_names TEXT[]) -RETURNS VOID AS $$ -BEGIN - WITH deleted_ids AS ( - DELETE FROM mq_msgs WHERE channel_name = ANY(channel_names) RETURNING id - ) - DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); -END; -$$ LANGUAGE plpgsql; - --- Deletes all messages. -CREATE FUNCTION mq_clear_all() -RETURNS VOID AS $$ -BEGIN - WITH deleted_ids AS ( - DELETE FROM mq_msgs RETURNING id - ) - DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); -END; -$$ LANGUAGE plpgsql; diff --git a/sqlxmq_stress/migrations/20210921115907_clear.down.sql b/sqlxmq_stress/migrations/20210921115907_clear.down.sql new file mode 100644 index 0000000..e15638d --- /dev/null +++ b/sqlxmq_stress/migrations/20210921115907_clear.down.sql @@ -0,0 +1,2 @@ +DROP FUNCTION mq_clear; +DROP FUNCTION mq_clear_all; diff --git a/sqlxmq_stress/migrations/20210921115907_clear.up.sql b/sqlxmq_stress/migrations/20210921115907_clear.up.sql new file mode 100644 index 0000000..bd1c1f6 --- /dev/null +++ b/sqlxmq_stress/migrations/20210921115907_clear.up.sql @@ -0,0 +1,21 @@ +-- Deletes all messages from a list of channel names. +CREATE FUNCTION mq_clear(channel_names TEXT[]) +RETURNS VOID AS $$ +BEGIN + WITH deleted_ids AS ( + DELETE FROM mq_msgs WHERE channel_name = ANY(channel_names) RETURNING id + ) + DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); +END; +$$ LANGUAGE plpgsql; + +-- Deletes all messages. +CREATE FUNCTION mq_clear_all() +RETURNS VOID AS $$ +BEGIN + WITH deleted_ids AS ( + DELETE FROM mq_msgs RETURNING id + ) + DELETE FROM mq_payloads WHERE id IN (SELECT id FROM deleted_ids); +END; +$$ LANGUAGE plpgsql;