builds: Rename "build_group" to just "group"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 31d453ed83e8743f0257da56a3c23ab1ba8e882a..b57feec25d80800c9bd254b88fe11b834b7e6fd6 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -270,7 +270,7 @@ class Builds(base.Object):
                        repo                = repo,
                        pkg                 = package,
                        owner               = owner,
-                       build_group_id      = group.id if group else None,
+                       group               = group,
                        test                = test,
                        disable_test_builds = disable_test_builds,
                )
@@ -463,7 +463,7 @@ class Build(database.Base, database.BackendMixin, database.SoftDeleteMixin):
 
        # Group ID
 
-       build_group_id = Column(Integer, ForeignKey("build_groups.id"))
+       group_id = Column(Integer, ForeignKey("build_groups.id"))
 
        # Group
 
@@ -478,7 +478,7 @@ class Build(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                        )
                        .where(
                                BuildGroup.deleted_at == None,
-                               BuildGroup.id == self.build_group_id,
+                               BuildGroup.id == self.group_id,
                        )
                )
 
@@ -1253,7 +1253,7 @@ class BuildGroup(database.Base, database.SoftDeleteMixin):
        # Builds
 
        builds = sqlalchemy.orm.relationship(
-               "Build", foreign_keys=[Build.build_group_id], lazy="selectin",
+               "Build", foreign_keys=[Build.group_id], lazy="selectin",
        )
 
        @staticmethod

diff --git a/src/database.sql b/src/database.sql
index 12c761b88daee0bf4ca73e5e5efa07d3ac4c88b5..fc504b201f3d27d05d96680dcbfb8c7640d40a0c 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -247,7 +247,7 @@ CREATE TABLE public.builds (
     failed boolean DEFAULT false NOT NULL,
     deleted_at timestamp without time zone,
     deleted_by_id integer,
-    build_group_id integer,
+    group_id integer,
     deprecating_build_id integer,
     deprecated_at timestamp without time zone,
     deprecated_by_id integer,
@@ -1598,7 +1598,7 @@ CREATE UNIQUE INDEX builders_name ON public.builders USING btree (name) WHERE (d
 -- Name: builds_build_group_id; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX builds_build_group_id ON public.builds USING btree (build_group_id) WHERE (deleted_at IS NULL);
+CREATE INDEX builds_build_group_id ON public.builds USING btree (group_id) WHERE (deleted_at IS NULL);
 
 
 --
@@ -2044,14 +2044,6 @@ ALTER TABLE ONLY public.builders
     ADD CONSTRAINT builders_deleted_by FOREIGN KEY (deleted_by_id) REFERENCES public.users(id);
 
 
---
--- Name: builds builds_build_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.builds
-    ADD CONSTRAINT builds_build_group_id FOREIGN KEY (build_group_id) REFERENCES public.build_groups(id);
-
-
 --
 -- Name: build_comments builds_comments_build_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -2100,6 +2092,14 @@ ALTER TABLE ONLY public.builds
     ADD CONSTRAINT builds_deprecating_build_id FOREIGN KEY (deprecating_build_id) REFERENCES public.builds(id);
 
 
+--
+-- Name: builds builds_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.builds
+    ADD CONSTRAINT builds_group_id FOREIGN KEY (group_id) REFERENCES public.build_groups(id);
+
+
 --
 -- Name: builds builds_owner_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --