Credentials hierarchy - Additional fixes

python/spacewalk/spacewalk-backend.changes.mackdk.credentials-hierarchy

@@ -0,0 +1 @@
+- Updated query to the new credentials structure

schema/spacewalk/susemanager-schema.changes.mackdk.credentials-hierarchy

@@ -1 +1 @@
-- Refactor Credentials to a proper class hierarchy
+- Refactor susecredentials to support the new hierarchy

schema/spacewalk/upgrade/susemanager-schema-4.3.19-to-susemanager-schema-4.3.20/001-add-rhui-credential-type.sql

@@ -1,4 +1,11 @@
-insert into suseCredentialsType (id, label, name)
-  select sequence_nextval('suse_credtype_id_seq'), 'rhui', 'Red Hat Update Infrastructure'
-  where not exists(select 1 from suseCredentialsType where label = 'rhui');
-
+DO $$
+  BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'susecredentialstype') THEN
+      insert into suseCredentialsType (id, label, name)
+        select sequence_nextval('suse_credtype_id_seq'), 'rhui', 'Red Hat Update Infrastructure'
+        where not exists(select 1 from suseCredentialsType where label = 'rhui');
+    ELSE
+      RAISE NOTICE 'suseCredentialsType does not exists';
+    END IF;
+  END;
+$$;

schema/spacewalk/upgrade/susemanager-schema-4.3.7-to-susemanager-schema-4.3.8/300-payg-database-changes.sql

@@ -68,9 +68,17 @@ CREATE SEQUENCE IF NOT EXISTS susecloudrmthost_id_seq;
 ---------------------------
 -- Add new credentials type
 ---------------------------
-insert into suseCredentialsType (id, label, name)
-  select sequence_nextval('suse_credtype_id_seq'), 'cloudrmt', 'Cloud RMT network'
-  where not exists(select 1 from suseCredentialsType where label = 'cloudrmt');
+DO $$
+  BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'susecredentialstype') THEN
+      insert into suseCredentialsType (id, label, name)
+        select sequence_nextval('suse_credtype_id_seq'), 'cloudrmt', 'Cloud RMT network'
+        where not exists(select 1 from suseCredentialsType where label = 'cloudrmt');
+    ELSE
+      RAISE NOTICE 'suseCredentialsType does not exists';
+    END IF;
+  END;
+$$;
 
 --------------------------------
 -- Update suse credentials Table

schema/spacewalk/upgrade/susemanager-schema-4.3.9-to-susemanager-schema-4.3.10/002-add-suseUyuniServerInfo.sql

@@ -9,9 +9,17 @@
 -- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 --
 
-insert into suseCredentialsType (id, label, name)
-  select sequence_nextval('suse_credtype_id_seq'), 'reportcreds', 'Reporting DB Credentials'
-   where not exists(select 1 from suseCredentialsType where label = 'reportcreds');
+DO $$
+  BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'susecredentialstype') THEN
+      insert into suseCredentialsType (id, label, name)
+        select sequence_nextval('suse_credtype_id_seq'), 'reportcreds', 'Reporting DB Credentials'
+         where not exists(select 1 from suseCredentialsType where label = 'reportcreds');
+    ELSE
+      RAISE NOTICE 'suseCredentialsType does not exists';
+    END IF;
+  END;
+$$;
 
 
 CREATE TABLE IF NOT EXISTS suseMgrServerInfo

schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/001-add-rhui-credential-type.sql

@@ -1,4 +1,11 @@
-insert into suseCredentialsType (id, label, name)
-  select sequence_nextval('suse_credtype_id_seq'), 'rhui', 'Red Hat Update Infrastructure'
-  where not exists(select 1 from suseCredentialsType where label = 'rhui');
-
+DO $$
+  BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'susecredentialstype') THEN
+      insert into suseCredentialsType (id, label, name)
+        select sequence_nextval('suse_credtype_id_seq'), 'rhui', 'Red Hat Update Infrastructure'
+        where not exists(select 1 from suseCredentialsType where label = 'rhui');
+    ELSE
+      RAISE NOTICE 'suseCredentialsType does not exists';
+    END IF;
+  END;
+$$;

spacewalk/setup/spacewalk-setup.changes.mackdk.credentials-hierarchy

@@ -0,0 +1 @@
+- Updated query to the new credentials structure

susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mackdk.credentials-hierarchy

@@ -0,0 +1 @@
+- Updated query to the new credentials structure