From 3d6b640c56e2e0db0021095d4fbaf17b723b0af7 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Mon, 27 Aug 2018 12:06:27 +0200 Subject: [PATCH] Modify SQL update scripts --- docs/schema-upgrade-1.16-1.17.sql | 3 +++ docs/schema.sql | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/schema-upgrade-1.16-1.17.sql b/docs/schema-upgrade-1.16-1.17.sql index 9ee22544..6cb9ad64 100644 --- a/docs/schema-upgrade-1.16-1.17.sql +++ b/docs/schema-upgrade-1.16-1.17.sql @@ -7,4 +7,7 @@ BEGIN; -- Change VARCHAR field for build_target names to TEXT to allow longer names ALTER TABLE build_target ALTER COLUMN name TYPE TEXT; +-- Allow different merge modes for mergerepo +ALTER TABLE tag_external_repos ADD COLUMN merge_mode TEXT DEFAULT 'koji'; + COMMIT; diff --git a/docs/schema.sql b/docs/schema.sql index 4e515303..86f799a1 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -467,7 +467,7 @@ create table tag_external_repos ( tag_id INTEGER NOT NULL REFERENCES tag(id), external_repo_id INTEGER NOT NULL REFERENCES external_repo(id), priority INTEGER NOT NULL, - merge_mode TEXT DEFAULT 'koji', + merge_mode TEXT DEFAULT 'koji', -- versioned - see earlier description of versioning create_event INTEGER NOT NULL REFERENCES events(id) DEFAULT get_event(), revoke_event INTEGER REFERENCES events(id),