From: Michael Tremer Date: Mon, 8 May 2023 14:34:40 +0000 (+0000) Subject: repos: Retire parent relationship between repositories X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e455a2807923c63559a2bd9b48034dd690e5981e;p=pbs.git repos: Retire parent relationship between repositories Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py index f465cc4c..8f44b1c7 100644 --- a/src/buildservice/repository.py +++ b/src/buildservice/repository.py @@ -165,21 +165,10 @@ class Repository(base.DataObject): def __lt__(self, other): if isinstance(other, self.__class__): - return self.parent_id == other.id + return self.priority > other.priority or self.name < other.name return NotImplemented - @lazy_property - def next(self): - return self.backend.repos._get_repository("SELECT * FROM repositories \ - WHERE parent_id = %s", self.id) - - @lazy_property - def parent(self): - if self.data.parent_id: - return self.backend.repos._get_repository("SELECT * FROM repositories \ - WHERE id = %s", self.data.parent_id) - @lazy_property def distro(self): return self.backend.distros.get_by_id(self.data.distro_id) @@ -337,10 +326,6 @@ class Repository(base.DataObject): description = property(get_description, set_description) - @property - def parent_id(self): - return self.data.parent_id - # Key Management @lazy_property diff --git a/src/database.sql b/src/database.sql index 900c0fd4..f584e34c 100644 --- a/src/database.sql +++ b/src/database.sql @@ -765,7 +765,6 @@ CREATE TABLE public.repositories ( slug text, description text DEFAULT ''::text NOT NULL, distro_id integer NOT NULL, - parent_id integer, key_id integer NOT NULL, mirrored boolean DEFAULT false NOT NULL, updated_at timestamp without time zone, @@ -1966,14 +1965,6 @@ ALTER TABLE ONLY public.repositories ADD CONSTRAINT repositories_owner_id FOREIGN KEY (owner_id) REFERENCES public.users(id); --- --- Name: repositories repositories_parent_id; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.repositories - ADD CONSTRAINT repositories_parent_id FOREIGN KEY (parent_id) REFERENCES public.repositories(id); - - -- -- Name: repository_builds repository_builds_added_by; Type: FK CONSTRAINT; Schema: public; Owner: - --