From: Michael Tremer Date: Mon, 8 May 2023 14:15:48 +0000 (+0000) Subject: jobs: Rename jobs_packages table X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbcacbc99aff6ff19cd65ddfe32145371b4d47a0;p=pbs.git jobs: Rename jobs_packages table Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index c931aa1d..34870fa4 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -151,9 +151,9 @@ class Builds(base.Object): LEFT JOIN jobs ON builds.id = jobs.build_id LEFT JOIN - jobs_packages ON jobs.id = jobs_packages.job_id + job_packages ON jobs.id = job_packages.job_id LEFT JOIN - packages ON jobs_packages.pkg_id = packages.id + packages ON job_packages.pkg_id = packages.id WHERE builds.deleted_at IS NULL AND diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index 49318761..8163f46d 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -263,11 +263,11 @@ class Job(base.DataObject): SELECT packages.* FROM - jobs_packages + job_packages LEFT JOIN - packages ON jobs_packages.pkg_id = packages.id + packages ON job_packages.pkg_id = packages.id WHERE - jobs_packages.job_id = %s + job_packages.job_id = %s ORDER BY packages.name""", self.id, @@ -291,7 +291,7 @@ class Job(base.DataObject): # Add them to the database self.db.executemany(""" INSERT INTO - jobs_packages( + job_packages( job_id, pkg_id ) diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py index 6e479fa8..abd647db 100644 --- a/src/buildservice/packages.py +++ b/src/buildservice/packages.py @@ -498,7 +498,7 @@ class Package(base.DataObject): @lazy_property def job(self): return self.backend.jobs._get_job("SELECT jobs.* FROM jobs \ - LEFT JOIN jobs_packages pkgs ON jobs.id = pkgs.job_id \ + LEFT JOIN job_packages pkgs ON jobs.id = pkgs.job_id \ WHERE pkgs.pkg_id = %s", self.id) # Files diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py index 1bbe8db5..f465cc4c 100644 --- a/src/buildservice/repository.py +++ b/src/buildservice/repository.py @@ -607,9 +607,9 @@ class Repository(base.DataObject): LEFT JOIN jobs ON builds.id = jobs.build_id LEFT JOIN - jobs_packages ON jobs.id = jobs_packages.job_id + job_packages ON jobs.id = job_packages.job_id LEFT JOIN - packages ON jobs_packages.pkg_id = packages.id + packages ON job_packages.pkg_id = packages.id WHERE builds.deleted_at IS NULL AND @@ -679,9 +679,9 @@ class Repository(base.DataObject): LEFT JOIN jobs ON builds.id = jobs.build_id LEFT JOIN - jobs_packages ON jobs.id = jobs_packages.job_id + job_packages ON jobs.id = job_packages.job_id LEFT JOIN - packages ON jobs_packages.pkg_id = packages.id + packages ON job_packages.pkg_id = packages.id WHERE builds.deleted_at IS NULL AND diff --git a/src/database.sql b/src/database.sql index 69261904..900c0fd4 100644 --- a/src/database.sql +++ b/src/database.sql @@ -380,6 +380,16 @@ CREATE SEQUENCE public.images_types_id_seq ALTER SEQUENCE public.images_types_id_seq OWNED BY public.images_types.id; +-- +-- Name: job_packages; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.job_packages ( + job_id integer NOT NULL, + pkg_id integer NOT NULL +); + + -- -- Name: jobs; Type: TABLE; Schema: public; Owner: - -- @@ -440,36 +450,6 @@ CREATE SEQUENCE public.jobs_id_seq ALTER SEQUENCE public.jobs_id_seq OWNED BY public.jobs.id; --- --- Name: jobs_packages; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.jobs_packages ( - id integer NOT NULL, - job_id integer NOT NULL, - pkg_id integer NOT NULL -); - - --- --- Name: jobs_packages_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.jobs_packages_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: jobs_packages_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE public.jobs_packages_id_seq OWNED BY public.jobs_packages.id; - - -- -- Name: keys; Type: TABLE; Schema: public; Owner: - -- @@ -1127,13 +1107,6 @@ ALTER TABLE ONLY public.images_types ALTER COLUMN id SET DEFAULT nextval('public ALTER TABLE ONLY public.jobs ALTER COLUMN id SET DEFAULT nextval('public.jobs_id_seq'::regclass); --- --- Name: jobs_packages id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.jobs_packages ALTER COLUMN id SET DEFAULT nextval('public.jobs_packages_id_seq'::regclass); - - -- -- Name: keys id; Type: DEFAULT; Schema: public; Owner: - -- @@ -1274,14 +1247,6 @@ ALTER TABLE ONLY public.images_types ADD CONSTRAINT idx_2198057_primary PRIMARY KEY (id); --- --- Name: jobs_packages idx_2198085_primary; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.jobs_packages - ADD CONSTRAINT idx_2198085_primary PRIMARY KEY (id); - - -- -- Name: mirrors idx_2198115_primary; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -1298,14 +1263,6 @@ ALTER TABLE ONLY public.users ADD CONSTRAINT idx_2198244_primary PRIMARY KEY (id); --- --- Name: jobs_packages jobs_packages_unique; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.jobs_packages - ADD CONSTRAINT jobs_packages_unique UNIQUE (job_id, pkg_id); - - -- -- Name: jobs jobs_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -1514,6 +1471,20 @@ CREATE UNIQUE INDEX idx_2198199_k ON public.settings USING btree (k); CREATE UNIQUE INDEX idx_2198244_name ON public.users USING btree (name); +-- +-- Name: job_packages_job_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX job_packages_job_id ON public.job_packages USING btree (job_id); + + +-- +-- Name: job_packages_pkg_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE UNIQUE INDEX job_packages_pkg_id ON public.job_packages USING btree (pkg_id); + + -- -- Name: jobs_arch; Type: INDEX; Schema: public; Owner: - -- @@ -1836,51 +1807,51 @@ ALTER TABLE ONLY public.builds -- --- Name: jobs jobs_aborted_by; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: job_packages job_packages_job_id; Type: FK CONSTRAINT; Schema: public; Owner: - -- -ALTER TABLE ONLY public.jobs - ADD CONSTRAINT jobs_aborted_by FOREIGN KEY (aborted_by) REFERENCES public.users(id); +ALTER TABLE ONLY public.job_packages + ADD CONSTRAINT job_packages_job_id FOREIGN KEY (job_id) REFERENCES public.jobs(id); -- --- Name: jobs jobs_build_id; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: job_packages job_packages_pkg_id; Type: FK CONSTRAINT; Schema: public; Owner: - -- -ALTER TABLE ONLY public.jobs - ADD CONSTRAINT jobs_build_id FOREIGN KEY (build_id) REFERENCES public.builds(id); +ALTER TABLE ONLY public.job_packages + ADD CONSTRAINT job_packages_pkg_id FOREIGN KEY (pkg_id) REFERENCES public.packages(id); -- --- Name: jobs jobs_builder_id; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: jobs jobs_aborted_by; Type: FK CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY public.jobs - ADD CONSTRAINT jobs_builder_id FOREIGN KEY (builder_id) REFERENCES public.builders(id); + ADD CONSTRAINT jobs_aborted_by FOREIGN KEY (aborted_by) REFERENCES public.users(id); -- --- Name: jobs jobs_deleted_by; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: jobs jobs_build_id; Type: FK CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY public.jobs - ADD CONSTRAINT jobs_deleted_by FOREIGN KEY (deleted_by) REFERENCES public.users(id); + ADD CONSTRAINT jobs_build_id FOREIGN KEY (build_id) REFERENCES public.builds(id); -- --- Name: jobs_packages jobs_packaged_job_id; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: jobs jobs_builder_id; Type: FK CONSTRAINT; Schema: public; Owner: - -- -ALTER TABLE ONLY public.jobs_packages - ADD CONSTRAINT jobs_packaged_job_id FOREIGN KEY (job_id) REFERENCES public.jobs(id); +ALTER TABLE ONLY public.jobs + ADD CONSTRAINT jobs_builder_id FOREIGN KEY (builder_id) REFERENCES public.builders(id); -- --- Name: jobs_packages jobs_packages_pkg_id; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: jobs jobs_deleted_by; Type: FK CONSTRAINT; Schema: public; Owner: - -- -ALTER TABLE ONLY public.jobs_packages - ADD CONSTRAINT jobs_packages_pkg_id FOREIGN KEY (pkg_id) REFERENCES public.packages(id); +ALTER TABLE ONLY public.jobs + ADD CONSTRAINT jobs_deleted_by FOREIGN KEY (deleted_by) REFERENCES public.users(id); --