Skip to content

Commit 1dd5924

Browse files
committed
RHINENG-19230: remove obsoleted baseline table from schema
1 parent 606529f commit 1dd5924

3 files changed

Lines changed: 32 additions & 27 deletions

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
-- baseline
2+
CREATE TABLE IF NOT EXISTS baseline
3+
(
4+
id BIGINT GENERATED BY DEFAULT AS IDENTITY,
5+
rh_account_id INT NOT NULL REFERENCES rh_account (id),
6+
name TEXT NOT NULL CHECK (not empty(name)),
7+
config JSONB,
8+
description TEXT CHECK (NOT empty(description)),
9+
creator TEXT CHECK (NOT empty(creator)),
10+
published TIMESTAMP WITH TIME ZONE,
11+
last_edited TIMESTAMP WITH TIME ZONE,
12+
PRIMARY KEY (rh_account_id, id),
13+
UNIQUE(rh_account_id, name)
14+
) PARTITION BY HASH (rh_account_id);
15+
16+
GRANT SELECT, UPDATE, DELETE, INSERT ON baseline TO manager;
17+
GRANT SELECT, UPDATE, DELETE ON baseline TO listener;
18+
GRANT SELECT, UPDATE, DELETE ON baseline TO evaluator;
19+
GRANT SELECT, UPDATE, DELETE ON baseline TO vmaas_sync;
20+
21+
SELECT create_table_partitions('baseline', 16,
22+
$$WITH (fillfactor = '70', autovacuum_vacuum_scale_factor = '0.05')$$);
23+
24+
ALTER TABLE system_platform ADD COLUMN baseline_id BIGINT,
25+
baseline_uptodate BOOLEAN;
26+
ALTER TABLE system_platform ADD CONSTRAINT baseline_id FOREIGN KEY (rh_account_id, baseline_id) REFERENCES baseline (rh_account_id, id);
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ALTER TABLE system_platform DROP baseline_id, DROP baseline_uptodate;
2+
3+
DROP TABLE IF EXISTS baseline;
4+
5+

database_admin/schema/create_schema.sql

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS schema_migrations
77

88

99
INSERT INTO schema_migrations
10-
VALUES (137, false);
10+
VALUES (138, false);
1111

1212
-- ---------------------------------------------------------------------------
1313
-- Functions
@@ -606,29 +606,6 @@ VALUES (1, 'puptoo'),
606606
(6, 'discovery')
607607
ON CONFLICT DO NOTHING;
608608

609-
-- baseline
610-
CREATE TABLE IF NOT EXISTS baseline
611-
(
612-
id BIGINT GENERATED BY DEFAULT AS IDENTITY,
613-
rh_account_id INT NOT NULL REFERENCES rh_account (id),
614-
name TEXT NOT NULL CHECK (not empty(name)),
615-
config JSONB,
616-
description TEXT CHECK (NOT empty(description)),
617-
creator TEXT CHECK (NOT empty(creator)),
618-
published TIMESTAMP WITH TIME ZONE,
619-
last_edited TIMESTAMP WITH TIME ZONE,
620-
PRIMARY KEY (rh_account_id, id),
621-
UNIQUE(rh_account_id, name)
622-
) PARTITION BY HASH (rh_account_id);
623-
624-
GRANT SELECT, UPDATE, DELETE, INSERT ON baseline TO manager;
625-
GRANT SELECT, UPDATE, DELETE ON baseline TO listener;
626-
GRANT SELECT, UPDATE, DELETE ON baseline TO evaluator;
627-
GRANT SELECT, UPDATE, DELETE ON baseline TO vmaas_sync;
628-
629-
SELECT create_table_partitions('baseline', 16,
630-
$$WITH (fillfactor = '70', autovacuum_vacuum_scale_factor = '0.05')$$);
631-
632609
-- templates
633610
CREATE TABLE IF NOT EXISTS template
634611
(
@@ -681,8 +658,6 @@ CREATE TABLE IF NOT EXISTS system_platform
681658
packages_installable INT NOT NULL DEFAULT 0,
682659
reporter_id INT,
683660
third_party BOOLEAN NOT NULL DEFAULT false,
684-
baseline_id BIGINT,
685-
baseline_uptodate BOOLEAN,
686661
yum_updates JSONB,
687662
applicable_advisory_count_cache INT NOT NULL DEFAULT 0,
688663
applicable_advisory_enh_count_cache INT NOT NULL DEFAULT 0,
@@ -698,7 +673,6 @@ CREATE TABLE IF NOT EXISTS system_platform
698673
PRIMARY KEY (rh_account_id, id),
699674
UNIQUE (rh_account_id, inventory_id),
700675
CONSTRAINT reporter_id FOREIGN KEY (reporter_id) REFERENCES reporter (id),
701-
CONSTRAINT baseline_id FOREIGN KEY (rh_account_id, baseline_id) REFERENCES baseline (rh_account_id, id),
702676
CONSTRAINT template_id FOREIGN KEY (rh_account_id, template_id) REFERENCES template (rh_account_id, id)
703677
) PARTITION BY HASH (rh_account_id);
704678

0 commit comments

Comments
 (0)