From 8dfb5d5ae0091d4d49d230a5b429d32c54eddd0f Mon Sep 17 00:00:00 2001 From: qqmyers Date: Wed, 9 Feb 2022 18:14:58 -0500 Subject: [PATCH 1/3] #8407 fix - update CC0 1.0 info in db/align json with other licenses --- scripts/api/data/licenses/licenseCC0-1.0.json | 2 +- .../resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql diff --git a/scripts/api/data/licenses/licenseCC0-1.0.json b/scripts/api/data/licenses/licenseCC0-1.0.json index 024b3bc826a..7414546eac3 100644 --- a/scripts/api/data/licenses/licenseCC0-1.0.json +++ b/scripts/api/data/licenses/licenseCC0-1.0.json @@ -1,6 +1,6 @@ { "name": "CC0 1.0", - "uri": "https://creativecommons.org/publicdomain/zero/1.0/", + "uri": "https://creativecommons.org/publicdomain/zero/1.0", "shortDescription": "Creative Commons CC0 1.0 Universal Public Domain Dedication.", "iconUrl": "https://licensebuttons.net/p/zero/1.0/88x31.png", "active": true diff --git a/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql b/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql new file mode 100644 index 00000000000..48b2ba56b2b --- /dev/null +++ b/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql @@ -0,0 +1,3 @@ +UPDATE license SET shortdescription='Creative Commons CC0 1.0 Universal Public Domain Dedication.' WHERE name='CC0'; +UPDATE license SET iconurl='https://licensebuttons.net/p/zero/1.0/88x31.png' WHERE name='CC0'; +UPDATE license SET name='CC0 1.0' WHERE name='CC0'; \ No newline at end of file From 591c688a8f1aebb42fa874a569461fdfd06387b0 Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 10 Feb 2022 08:19:18 -0500 Subject: [PATCH 2/3] repackaging as one script --- .../migration/V5.9.0.1__7440-configurable-license-list.sql | 6 ++++++ .../db/migration/V5.9.0.2__8407-fix-CC0-license.sql | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql diff --git a/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql index 9a3ce0b37d5..f9915791990 100644 --- a/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql +++ b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql @@ -71,6 +71,12 @@ BEGIN EXCEPTION WHEN undefined_column THEN RAISE NOTICE 'license is not in table - new instance'; END; + + BEGIN + UPDATE license SET shortdescription='Creative Commons CC0 1.0 Universal Public Domain Dedication.' WHERE name='CC0'; + UPDATE license SET iconurl='https://licensebuttons.net/p/zero/1.0/88x31.png' WHERE name='CC0'; + UPDATE license SET name='CC0 1.0' WHERE name='CC0'; + END; END $$; ALTER TABLE termsofuseandaccess DROP COLUMN IF EXISTS license; diff --git a/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql b/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql deleted file mode 100644 index 48b2ba56b2b..00000000000 --- a/src/main/resources/db/migration/V5.9.0.2__8407-fix-CC0-license.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE license SET shortdescription='Creative Commons CC0 1.0 Universal Public Domain Dedication.' WHERE name='CC0'; -UPDATE license SET iconurl='https://licensebuttons.net/p/zero/1.0/88x31.png' WHERE name='CC0'; -UPDATE license SET name='CC0 1.0' WHERE name='CC0'; \ No newline at end of file From b50442644ed9a9481aa3e6eb42146d0dd97b0c3b Mon Sep 17 00:00:00 2001 From: qqmyers Date: Thu, 10 Feb 2022 08:52:37 -0500 Subject: [PATCH 3/3] add comment --- .../db/migration/V5.9.0.1__7440-configurable-license-list.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql index f9915791990..cb76b2270a4 100644 --- a/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql +++ b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql @@ -72,6 +72,7 @@ BEGIN WHEN undefined_column THEN RAISE NOTICE 'license is not in table - new instance'; END; + -- This section updates the db of those who ran the develop branch and does not make changes for new installs or upgrades from v5.9 BEGIN UPDATE license SET shortdescription='Creative Commons CC0 1.0 Universal Public Domain Dedication.' WHERE name='CC0'; UPDATE license SET iconurl='https://licensebuttons.net/p/zero/1.0/88x31.png' WHERE name='CC0';