]> git.ipfire.org Git - pbs.git/commitdiff
repos: Retire parent relationship between repositories
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 May 2023 14:34:40 +0000 (14:34 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 May 2023 14:34:40 +0000 (14:34 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/repository.py
src/database.sql

index f465cc4c2ac6b7be7db5a6661a07a01707ea1b07..8f44b1c77811fed9e8a93a411cd7d284f337eaa8 100644 (file)
@@ -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
index 900c0fd46853704bc46b2444b4a95658ea2b9fbd..f584e34c0e2c7045b28eb8744047fb7026be34f0 100644 (file)
@@ -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: -
 --