From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 8 Oct 2017 12:00:04 +0000 (+0100)
Subject: Drop builders_arches table
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7d550a5a2ebbac1ec317f9e9d1d8b2bb3fa9349;p=pbs.git

Drop builders_arches table

This was to enable/disable building for a certain architecture
for some builders. This concept was dropped earlier.

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

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index de6c9245..c9f54950 100644
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -207,39 +207,6 @@ class Builder(base.DataObject):
 			pakfire_version, cpu_model, cpu_count, cpu_arch, cpu_bogomips,
 			host_key, os_name, self.id)
 
-	def update_arches(self, arches):
-		# Get all arches this builder does currently support.
-		supported_arches = [a.name for a in self.get_arches()]
-
-		# Noarch is always supported.
-		if not "noarch" in arches:
-			arches.append("noarch")
-
-		arches_add = []
-		for arch in arches:
-			if arch in supported_arches:
-				supported_arches.remove(arch)
-				continue
-
-			arches_add.append(arch)
-		arches_rem = supported_arches
-
-		for arch_name in arches_add:
-			arch = self.pakfire.arches.get_by_name(arch_name)
-			if not arch:
-				logging.info("Client sent unknown architecture: %s" % arch_name)
-				continue
-
-			self.db.execute("INSERT INTO builders_arches(builder_id, arch_id) \
-				VALUES(%s, %s)", self.id, arch.id)
-
-		for arch_name in arches_rem:
-			arch = self.pakfire.arches.get_by_name(arch_name)
-			assert arch
-
-			self.db.execute("DELETE FROM builders_arches WHERE builder_id = %s \
-				AND arch_id = %s", self.id, arch.id)
-
 	def get_enabled(self):
 		return self.status == "enabled"
 
diff --git a/src/database.sql b/src/database.sql
index 73d1d272..ae451299 100644
--- a/src/database.sql
+++ b/src/database.sql
@@ -724,41 +724,6 @@ ALTER TABLE arches_id_seq OWNER TO pakfire;
 ALTER SEQUENCE arches_id_seq OWNED BY arches.id;
 
 
---
--- Name: builders_arches; Type: TABLE; Schema: public; Owner: pakfire; Tablespace: 
---
-
-CREATE TABLE builders_arches (
-    id integer NOT NULL,
-    builder_id integer NOT NULL,
-    arch_id integer NOT NULL,
-    enabled builders_arches_enabled DEFAULT 'Y'::builders_arches_enabled NOT NULL
-);
-
-
-ALTER TABLE builders_arches OWNER TO pakfire;
-
---
--- Name: builders_arches_id_seq; Type: SEQUENCE; Schema: public; Owner: pakfire
---
-
-CREATE SEQUENCE builders_arches_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE builders_arches_id_seq OWNER TO pakfire;
-
---
--- Name: builders_arches_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: pakfire
---
-
-ALTER SEQUENCE builders_arches_id_seq OWNED BY builders_arches.id;
-
-
 --
 -- Name: builders_history; Type: TABLE; Schema: public; Owner: pakfire; Tablespace: 
 --
@@ -2313,13 +2278,6 @@ ALTER TABLE ONLY arches ALTER COLUMN id SET DEFAULT nextval('arches_id_seq'::reg
 ALTER TABLE ONLY builders ALTER COLUMN id SET DEFAULT nextval('builders_id_seq'::regclass);
 
 
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY builders_arches ALTER COLUMN id SET DEFAULT nextval('builders_arches_id_seq'::regclass);
-
-
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: pakfire
 --
@@ -2575,14 +2533,6 @@ ALTER TABLE ONLY builders
     ADD CONSTRAINT idx_2197954_primary PRIMARY KEY (id);
 
 
---
--- Name: idx_2197975_primary; Type: CONSTRAINT; Schema: public; Owner: pakfire; Tablespace: 
---
-
-ALTER TABLE ONLY builders_arches
-    ADD CONSTRAINT idx_2197975_primary PRIMARY KEY (id);
-
-
 --
 -- Name: idx_2197982_primary; Type: CONSTRAINT; Schema: public; Owner: pakfire; Tablespace: 
 --
@@ -2863,13 +2813,6 @@ ALTER TABLE ONLY sessions
     ADD CONSTRAINT sessions_session_id_key UNIQUE (session_id);
 
 
---
--- Name: builders_arches_builder_id; Type: INDEX; Schema: public; Owner: pakfire; Tablespace: 
---
-
-CREATE INDEX builders_arches_builder_id ON builders_arches USING btree (builder_id);
-
-
 --
 -- Name: builds_watchers_build_id; Type: INDEX; Schema: public; Owner: pakfire; Tablespace: 
 --
@@ -3166,22 +3109,6 @@ ALTER TABLE mirrors_checks CLUSTER ON mirrors_checks_sort;
 CREATE TRIGGER on_update_current_timestamp BEFORE UPDATE ON sources FOR EACH ROW EXECUTE PROCEDURE on_update_current_timestamp_sources();
 
 
---
--- Name: builders_arches_arch_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY builders_arches
-    ADD CONSTRAINT builders_arches_arch_id FOREIGN KEY (arch_id) REFERENCES arches(id);
-
-
---
--- Name: builders_arches_builder_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY builders_arches
-    ADD CONSTRAINT builders_arches_builder_id FOREIGN KEY (builder_id) REFERENCES builders(id);
-
-
 --
 -- Name: builders_history_builder_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
 --