From 0f45f2dd6aa325fa0ef802292179862b8dd01ff7 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Thu, 13 Feb 2025 17:52:28 +0100 Subject: [PATCH 1/3] schema fix --- .../101-default-settings-updates.sql | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql b/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql index edfa3cabac04..c96ce9b44194 100644 --- a/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql +++ b/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql @@ -3,28 +3,40 @@ alter table rhnConfiguration disable trigger rhn_conf_mod_trig; INSERT INTO rhnConfiguration (key, description, value, default_value) SELECT 'EXTAUTH_DEFAULT_ORGID', description, value, null FROM rhnConfiguration - WHERE key = 'extauth_default_orgid'; + WHERE key = 'extauth_default_orgid' +ON CONFLICT (key) DO UPDATE + SET default_value = EXCLUDED.default_value; + DELETE FROM rhnConfiguration WHERE key = 'extauth_default_orgid'; INSERT INTO rhnConfiguration (key, description, default_value, value) SELECT 'EXTAUTH_USE_ORGUNIT', description, 'false', COALESCE(value, 'false') FROM rhnConfiguration - WHERE key = 'extauth_use_orgunit'; + WHERE key = 'extauth_use_orgunit' +ON CONFLICT (key) DO UPDATE + SET default_value = EXCLUDED.default_value; + DELETE FROM rhnConfiguration WHERE key = 'extauth_use_orgunit'; INSERT INTO rhnConfiguration (key, description, default_value, value) SELECT 'SYSTEM_CHECKIN_THRESHOLD', description, '1', COALESCE(value, '1') FROM rhnConfiguration - WHERE key = 'system_checkin_threshold'; + WHERE key = 'system_checkin_threshold' +ON CONFLICT (key) DO UPDATE + SET default_value = EXCLUDED.default_value; + DELETE FROM rhnConfiguration WHERE key = 'system_checkin_threshold'; INSERT INTO rhnConfiguration (key, description, default_value, value) SELECT 'EXTAUTH_KEEP_TEMPROLES', description, 'false', COALESCE(value, 'false') FROM rhnConfiguration - WHERE key = 'extauth_keep_temproles'; + WHERE key = 'extauth_keep_temproles' +ON CONFLICT (key) DO UPDATE + SET default_value = rhnConfiguration.default_value; + DELETE FROM rhnConfiguration WHERE key = 'extauth_keep_temproles'; From 0988811c98f5bab72906ee66a6c440f226c97522 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Thu, 13 Feb 2025 18:11:27 +0100 Subject: [PATCH 2/3] schema fix --- .../susemanager-schema.changes.serpico.password-policy-hotfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 schema/spacewalk/susemanager-schema.changes.serpico.password-policy-hotfix diff --git a/schema/spacewalk/susemanager-schema.changes.serpico.password-policy-hotfix b/schema/spacewalk/susemanager-schema.changes.serpico.password-policy-hotfix new file mode 100644 index 000000000000..abacee2649a5 --- /dev/null +++ b/schema/spacewalk/susemanager-schema.changes.serpico.password-policy-hotfix @@ -0,0 +1 @@ +- Fix for bad schema migration From e9febc24ced5ee7796b35e4a789aa70700d5bd83 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Fri, 14 Feb 2025 10:30:36 +0100 Subject: [PATCH 3/3] on conflict value taken from excluded not table --- .../101-default-settings-updates.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql b/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql index c96ce9b44194..8c211b2cc7d2 100644 --- a/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql +++ b/schema/spacewalk/upgrade/susemanager-schema-5.1.3-to-susemanager-schema-5.1.4/101-default-settings-updates.sql @@ -35,7 +35,7 @@ INSERT INTO rhnConfiguration (key, description, default_value, value) FROM rhnConfiguration WHERE key = 'extauth_keep_temproles' ON CONFLICT (key) DO UPDATE - SET default_value = rhnConfiguration.default_value; + SET default_value = EXCLUDED.default_value; DELETE FROM rhnConfiguration WHERE key = 'extauth_keep_temproles';