From f72cc419b6b9ba2ab82ade2b371455592afecaca Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 19 Jul 2023 08:37:48 +0200 Subject: [PATCH 1/5] copy collection UUID into dspace_object_id, set type to content --- ...e_subscriptionparamter_change_columns_subscription_table.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql index 2d632b58004d..61e01494fcb3 100644 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql +++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql @@ -32,6 +32,8 @@ ALTER TABLE subscription ADD COLUMN if NOT EXISTS type CHARACTER VARYING(255); ALTER TABLE subscription DROP CONSTRAINT IF EXISTS subscription_dspaceobject_fkey; ALTER TABLE subscription ADD CONSTRAINT subscription_dspaceobject_fkey FOREIGN KEY (dspace_object_id) REFERENCES dspaceobject (uuid); -- +UPDATE subscription SET dspace_object_id = collection_id , type = 'content'; +-- ALTER TABLE subscription DROP CONSTRAINT IF EXISTS subscription_collection_id_fkey; -- -- ALTER TABLE subscription DROP COLUMN IF EXISTS collection_id; From cf3fd60d84a33463c323fc29e43c24ae7b86d605 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 19 Jul 2023 09:13:09 +0200 Subject: [PATCH 2/5] Delete V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql --- ...mter_change_columns_subscription_table.sql | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql deleted file mode 100644 index 5313472706ee..000000000000 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql +++ /dev/null @@ -1,40 +0,0 @@ --- --- The contents of this file are subject to the license and copyright --- detailed in the LICENSE and NOTICE files at the root of the source --- tree and available online at --- --- http://www.dspace.org/license/ --- - ------------------------------------------------------------------------------------ --- ADD table subscription_parameter ------------------------------------------------------------------------------------ - - -CREATE SEQUENCE subscription_parameter_seq; ------------------------------------------------------------------------------------ --- ADD table subscription_parameter ------------------------------------------------------------------------------------ -CREATE TABLE subscription_parameter -( - subscription_parameter_id INTEGER NOT NULL, - name CHARACTER VARYING(255), - value CHARACTER VARYING(255), - subscription_id INTEGER NOT NULL, - CONSTRAINT subscription_parameter_pkey PRIMARY KEY (subscription_parameter_id), - CONSTRAINT subscription_parameter_subscription_fkey FOREIGN KEY (subscription_id) REFERENCES subscription (subscription_id) ON DELETE CASCADE -); - -- -ALTER TABLE subscription DROP CONSTRAINT subscription_collection_id_fkey; --- -- -ALTER TABLE subscription DROP COLUMN collection_id; --- -ALTER TABLE subscription ADD COLUMN dspace_object_id UUID; --- -- -ALTER TABLE subscription ADD COLUMN type CHARACTER VARYING(255); ----- -- -ALTER TABLE subscription ADD CONSTRAINT subscription_dspaceobject_fkey FOREIGN KEY (dspace_object_id) REFERENCES dspaceobject (uuid); --- - - - From b579de8c09c12aeb8e014e1b71771548292d0001 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 19 Jul 2023 09:14:50 +0200 Subject: [PATCH 3/5] fixed handling of dspace_object_id and type of existing collections --- ..._subscriptionparamter_change_columns_subscription_table.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql index 703a9c605f99..bcafcbc0d1c3 100644 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql +++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.01__add_table_subscriptionparamter_change_columns_subscription_table.sql @@ -34,9 +34,10 @@ ALTER TABLE subscription ADD COLUMN if NOT EXISTS type CHARACTER VARYING(255); ALTER TABLE subscription DROP CONSTRAINT IF EXISTS subscription_dspaceobject_fkey; ALTER TABLE subscription ADD CONSTRAINT subscription_dspaceobject_fkey FOREIGN KEY (dspace_object_id) REFERENCES dspaceobject (uuid); -- -- +UPDATE subscription set dspace_object_id = collection_id , type = 'content'; +-- ALTER TABLE subscription DROP CONSTRAINT IF EXISTS Subscription_collection_id_fk; -- ALTER TABLE subscription DROP COLUMN IF EXISTS collection_id; - From a0af3da87f7930e8a6fe627dc0503744ab33e66d Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 19 Jul 2023 09:16:23 +0200 Subject: [PATCH 4/5] Delete V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql --- ...mter_change_columns_subscription_table.sql | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql deleted file mode 100644 index e94ec3c5049f..000000000000 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql +++ /dev/null @@ -1,41 +0,0 @@ --- --- The contents of this file are subject to the license and copyright --- detailed in the LICENSE and NOTICE files at the root of the source --- tree and available online at --- --- http://www.dspace.org/license/ --- - ------------------------------------------------------------------------------------ --- ADD table subscription_parameter ------------------------------------------------------------------------------------ - - -CREATE SEQUENCE subscription_parameter_seq; -------------------------------------------------------- --- Create the subscription_parameter table -------------------------------------------------------- - -CREATE TABLE subscription_parameter -( - subscription_parameter_id INTEGER NOT NULL, - name CHARACTER VARYING(255), - value CHARACTER VARYING(255), - subscription_id INTEGER NOT NULL, - CONSTRAINT subscription_parameter_pkey PRIMARY KEY (subscription_parameter_id), - CONSTRAINT subscription_parameter_subscription_fkey FOREIGN KEY (subscription_id) REFERENCES subscription (subscription_id) ON DELETE CASCADE -); --- -- -ALTER TABLE subscription DROP CONSTRAINT Subscription_collection_id_fk; --- -ALTER TABLE subscription DROP COLUMN collection_id; --- -ALTER TABLE subscription ADD COLUMN dspace_object_id UUID; --- -ALTER TABLE subscription ADD COLUMN type CHARACTER VARYING(255); --- -ALTER TABLE subscription ADD CONSTRAINT subscription_dspaceobject_fkey FOREIGN KEY (dspace_object_id) REFERENCES dspaceobject (uuid); - - - - From 172283dedb88a6401421da7d6ecf0b14f8b8d361 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 19 Jul 2023 09:19:20 +0200 Subject: [PATCH 5/5] Delete V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql --- ...mter_change_columns_subscription_table.sql | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql deleted file mode 100644 index 8db385f5acf4..000000000000 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.0_2021.07.30__add_table_subscriptionparamter_change_columns_subscription_table.sql +++ /dev/null @@ -1,41 +0,0 @@ --- --- The contents of this file are subject to the license and copyright --- detailed in the LICENSE and NOTICE files at the root of the source --- tree and available online at --- --- http://www.dspace.org/license/ --- - ------------------------------------------------------------------------------------ --- ADD table subscription_parameter ------------------------------------------------------------------------------------ - - -CREATE SEQUENCE subscription_parameter_seq; ------------------------------------------------------------------------------------ --- ADD table subscription_parameter ------------------------------------------------------------------------------------ -CREATE TABLE subscription_parameter -( - subscription_parameter_id INTEGER NOT NULL, - name VARCHAR(255), - value VARCHAR(255), - subscription_id INTEGER NOT NULL, - CONSTRAINT subscription_parameter_pkey PRIMARY KEY (subscription_parameter_id), - CONSTRAINT subscription_parameter_subscription_fkey FOREIGN KEY (subscription_id) - REFERENCES subscription (subscription_id) ON DELETE CASCADE -); --- -- -ALTER TABLE subscription DROP CONSTRAINT subscription_collection_id_fkey; ----- -- -ALTER TABLE subscription DROP COLUMN collection_id; --- -ALTER TABLE subscription ADD COLUMN dspace_object_id UUID; ----- -- -ALTER TABLE subscription ADD COLUMN type CHARACTER VARYING(255); - -ALTER TABLE subscription ADD CONSTRAINT subscription_dspaceobject_fkey FOREIGN KEY (dspace_object_id) REFERENCES dspaceobject (uuid); --- - - -