merge mode is part of tag connection rather than inherent to repo

This commit is contained in:
Mike McLean 2018-08-24 18:08:18 -04:00
parent d63bf7f3df
commit 3273d249cd
3 changed files with 34 additions and 44 deletions

View file

@ -450,7 +450,6 @@ INSERT INTO external_repo (id, name) VALUES (0, 'INTERNAL');
create table external_repo_config (
external_repo_id INTEGER NOT NULL REFERENCES external_repo(id),
url TEXT NOT NULL,
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),
@ -468,6 +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',
-- versioned - see earlier description of versioning
create_event INTEGER NOT NULL REFERENCES events(id) DEFAULT get_event(),
revoke_event INTEGER REFERENCES events(id),