Merge lp:~wgrant/launchpad/antibfjo-9-db-kill into lp:launchpad/db-devel

[William Grant]

Drop BuildQueue.job(_type), BuildPackageJob and SourcePackageRecipeBuildJob from the DB; they're replaced by BuildQueue.build_farm_job.

Drop BuildQueue.job(_type), BuildPackageJob and SourcePackageRecipeBuildJob; they're replaced by BuildQueue.build_farm_job.

Also make some of the new and older columns NOT NULL while we're there.

[Stuart Bishop (stub)]

Looks good.

review: Approve (db)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2013-11-28 05:53:55 +0000
+++ database/sampledata/current-dev.sql	2013-11-28 13:36:20 +0000
@@ -747,12 +747,6 @@
 
 
 
-
-
-
-
-
-
 SET SESSION AUTHORIZATION DEFAULT;
 
 ALTER TABLE account DISABLE TRIGGER ALL;
@@ -3727,19 +3721,10 @@
 ALTER TABLE builderprocessor ENABLE TRIGGER ALL;
 
 
-ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
-
-INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
-INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
-
-
-ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
-
-
 ALTER TABLE buildqueue DISABLE TRIGGER ALL;
 
-INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1, '00:00:00', 1, false, 8, 1, '2005-06-15 09:20:12.820778');
-INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (2, NULL, NULL, 10, false, 2, 1, '00:01:00', 1, false, 11, 0, NULL);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, '00:00:00', 1, false, 8, 1, '2005-06-15 09:20:12.820778');
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (2, NULL, NULL, 10, false, '00:01:00', 1, false, 11, 0, NULL);
 
 
 ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -9597,13 +9582,6 @@
 ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
 
 
-ALTER TABLE sourcepackagerecipebuildjob DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE sourcepackagerecipebuildjob ENABLE TRIGGER ALL;
-
-
 ALTER TABLE sourcepackagerecipedata DISABLE TRIGGER ALL;
 
 
 
=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2013-11-28 05:53:55 +0000
+++ database/sampledata/current.sql	2013-11-28 13:36:20 +0000
@@ -747,12 +747,6 @@
 
 
 
-
-
-
-
-
-
 SET SESSION AUTHORIZATION DEFAULT;
 
 ALTER TABLE account DISABLE TRIGGER ALL;
@@ -3661,19 +3655,10 @@
 ALTER TABLE builderprocessor ENABLE TRIGGER ALL;
 
 
-ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
-
-INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
-INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
-
-
-ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
-
-
 ALTER TABLE buildqueue DISABLE TRIGGER ALL;
 
-INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1, '00:00:00', 1, false, 8, 1, '2005-06-15 09:20:12.820778');
-INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (2, NULL, NULL, 10, false, 2, 1, '00:01:00', 1, false, 11, 0, NULL);
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, '00:00:00', 1, false, 8, 1, '2005-06-15 09:20:12.820778');
+INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, estimated_duration, processor, virtualized, build_farm_job, status, date_started) VALUES (2, NULL, NULL, 10, false, '00:01:00', 1, false, 11, 0, NULL);
 
 
 ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -9514,13 +9499,6 @@
 ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
 
 
-ALTER TABLE sourcepackagerecipebuildjob DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE sourcepackagerecipebuildjob ENABLE TRIGGER ALL;
-
-
 ALTER TABLE sourcepackagerecipedata DISABLE TRIGGER ALL;
 
 
 
=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2013-10-11 11:30:48 +0000
+++ database/schema/comments.sql	2013-11-28 13:36:20 +0000
@@ -1511,11 +1511,6 @@
 COMMENT ON COLUMN SourcePackageRecipeBuild.recipe IS 'The recipe being processed.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.manifest IS 'The evaluated recipe that was built.';
 
--- SourcePackageRecipeBuildJob
-
-COMMENT ON TABLE SourcePackageRecipeBuildJob IS 'The link between a SourcePackageRecipeBuild row and a Job row to schedule a build of a source package recipe.';
-COMMENT ON COLUMN SourcePackageRecipeBuildJob.sourcepackage_recipe_build IS 'The build record describing the package being built.';
-
 -- Specification
 
 COMMENT ON TABLE Specification IS 'A feature specification. At the moment we do not store the actual specification, we store a URL for the spec, which is managed in a wiki somewhere else. We store the overall state of the spec, as well as queueing information about who needs to review the spec, and why.';
@@ -1747,8 +1742,6 @@
 COMMENT ON COLUMN BuildQueue.logtail IS 'The tail end of the log of the current build. This is updated regularly as the buildd master polls the buildd slaves. Once the build is complete; the full log will be lodged with the librarian and linked into the build table.';
 COMMENT ON COLUMN BuildQueue.lastscore IS 'The last score ascribed to this build record. This can be used in the UI among other places.';
 COMMENT ON COLUMN BuildQueue.manual IS 'Indicates if the current record was or not rescored manually, if so it get skipped from the auto-score procedure.';
-COMMENT ON COLUMN BuildQueue.job IS 'Foreign key to the `Job` table row with the generic job data.';
-COMMENT ON COLUMN BuildQueue.job_type IS 'Type of job (enumeration value), enables us to find/query the correct table with the data specific to this type of job.';
 COMMENT ON COLUMN BuildQueue.estimated_duration IS 'Estimated job duration, based on previous running times of comparable jobs.';
 COMMENT ON COLUMN BuildQueue.processor IS 'The processor required by the associated build farm job.';
 COMMENT ON COLUMN BuildQueue.virtualized IS 'The virtualization setting required by the associated build farm job.';
 
=== added file 'database/schema/patch-2209-51-2.sql'
--- database/schema/patch-2209-51-2.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2209-51-2.sql	2013-11-28 13:36:20 +0000
@@ -0,0 +1,15 @@
+-- Copyright 2013 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE buildqueue
+    DROP COLUMN job,
+    DROP COLUMN job_type,
+    ALTER COLUMN virtualized SET NOT NULL,
+    ALTER COLUMN build_farm_job SET NOT NULL,
+    ALTER COLUMN status SET NOT NULL;
+DROP TABLE buildpackagejob;
+DROP TABLE sourcepackagerecipebuildjob;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 51, 2);