From 387dbecebe96689a4f8b9730179765d5cd527870 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jan 05 2024 10:01:02 +0000 Subject: simplify draft_release_sane logic --- diff --git a/schemas/schema-upgrade-1.33-1.34.sql b/schemas/schema-upgrade-1.33-1.34.sql index 8437b5e..a4315ae 100644 --- a/schemas/schema-upgrade-1.33-1.34.sql +++ b/schemas/schema-upgrade-1.33-1.34.sql @@ -61,8 +61,7 @@ BEGIN; ALTER TABLE build ADD CONSTRAINT draft_for_rpminfo UNIQUE (id, draft); ALTER TABLE build ADD CONSTRAINT promotion_sane CHECK (NOT draft OR (promotion_time IS NULL AND promoter IS NULL)); ALTER TABLE build ADD CONSTRAINT draft_release_sane CHECK - ((draft AND release ~ ('^.*,draft_' || id::TEXT || '$')) - OR NOT draft); + (NOT draft OR release ~ ('^.*,draft_' || id::TEXT || '$')); ALTER TABLE rpminfo ADD COLUMN draft BOOLEAN; UPDATE rpminfo SET draft=FALSE WHERE build_id IS NOT NULL; diff --git a/schemas/schema.sql b/schemas/schema.sql index 2a61de8..d74535d 100644 --- a/schemas/schema.sql +++ b/schemas/schema.sql @@ -303,8 +303,7 @@ CREATE TABLE build ( CONSTRAINT completion_sane CHECK ((state = 0 AND completion_time IS NULL) OR (state <> 0 AND completion_time IS NOT NULL)), CONSTRAINT promotion_sane CHECK (NOT draft OR (promotion_time IS NULL AND promoter IS NULL)), - CONSTRAINT draft_release_sane CHECK ((draft AND release ~ ('^.*,draft_' || id::TEXT || '$')) OR - NOT draft) + CONSTRAINT draft_release_sane CHECK (NOT draft OR release ~ ('^.*,draft_' || id::TEXT || '$')) ) WITHOUT OIDS; CREATE INDEX build_by_pkg_id ON build (pkg_id);