Merge lp:~wgrant/launchpad/sprbu-columns-to-sprb into lp:launchpad/db-devel

[William Grant]

Drop SourcePackageRecipeBuildUpload, and move its useful attributes onto SourcePackageRecipeBuild.

[William Grant (wgrant)]

We need some new attributes on SourcePackageRecipeBuild:

 - pocket -- just like on Build, currently hardcoded to RELEASE in the model.
 - dependencies -- just like on Build, to store missing build dependencies.
 - upload_log -- just like on Build, to store the upload log. This was on SourcePackageRecipeBuildUpload, which we're not using for now.

[Jonathan Lange (jml)]

Thanks William.

It looks good to me and the changes seem sane, but I don't really feel competent to review it -- the details of the model have flown out of my head. Could you please ask Julian or Michael H or someone else to review this?

review: Abstain

[Julian Edwards (julian-edwards)]

It looks fine to me from a model PoV.

review: Approve

[Stuart Bishop (stub)]

I'm unsure of upload_log. Dropping this column in the future and migrating its information to SourcePackageRecipeBuildUpload seems more work than just creating the SourcePackageRecipeBuildUpload records.

We should either drop this column from the patch and create SourcePackageRecipeBuildUpload records, or add a comment stating that the column is temporary and add the needed index with "CREATE INDEX sourcepackagerecipiebuild__upload_log__idx ON SourcepackageRecipieBuild(upload_log);"

review: Needs Information (db)

[William Grant (wgrant)]

It's unclear whether we will ever use SourcePackageRecipeBuildUpload -- any uses for it are not obvious. It's easy to migrate to it if we ever need to.

What's the purpose of the index? I can't imagine any practical query in which it would be useful.

[Stuart Bishop (stub)]

Discussed with bigjools, so SourcepackageRecipeBuildUpload should go. The following patch is approved as patch-2207-32-0.sql. It will need the latest db-devel to work (I just noticed the todrop schema doesn't exist in developer databases any more, stopping us dropping tables). If dropping the table causes test failures you can't be bothered fixing, feel free to comment out that line and open a bug instead.

SET client_min_messages=ERROR;

ALTER TABLE SourcePackageRecipeBuild ADD COLUMN dependencies text;
ALTER TABLE SourcePackageRecipeBuild ADD COLUMN pocket integer
    DEFAULT 0 NOT NULL;
ALTER TABLE SourcePackageRecipeBuild ADD COLUMN upload_log integer
    CONSTRAINT sourcepackagerecipebuild__upload_log__fk
    REFERENCES LibraryFileAlias;

CREATE INDEX sourcepackagerecipebuild__upload_log__idx
    ON SourcePackageRecipeBuild(upload_log) WHERE upload_log IS NOT NULL;

-- We can't drop tables in DB patches due to Slony-I limitations, so
-- we give them a magic name for database/schema/upgrade.py to deal
-- with correctly.
ALTER TABLE SourcePackageRecipeBuildUpload SET SCHEMA todrop;

INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 32, 0);

review: Approve (db)

[Björn Tillenius (bjornt)]

Looks good. You still have a '--- SourcePackageRecipeBuildUpload' in comments.sql, though.

review: Approve (db)

[William Grant (wgrant)]

I actually don't have that -- it's a glitch in the diff highlighting. It's really the removal of '-- SourcePackageRecipeBuildUpload'.

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2010-02-04 11:12:20 +0000
+++ database/sampledata/current-dev.sql	2010-02-16 08:30:51 +0000
@@ -9062,13 +9062,6 @@
 ALTER TABLE sourcepackagerecipebuildjob ENABLE TRIGGER ALL;
 
 
-ALTER TABLE sourcepackagerecipebuildupload DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE sourcepackagerecipebuildupload ENABLE TRIGGER ALL;
-
-
 ALTER TABLE sourcepackagerecipedata DISABLE TRIGGER ALL;
 
 

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2010-02-04 11:12:20 +0000
+++ database/sampledata/current.sql	2010-02-16 08:30:51 +0000
@@ -8948,13 +8948,6 @@
 ALTER TABLE sourcepackagerecipebuildjob ENABLE TRIGGER ALL;
 
 
-ALTER TABLE sourcepackagerecipebuildupload DISABLE TRIGGER ALL;
-
-
-
-ALTER TABLE sourcepackagerecipebuildupload ENABLE TRIGGER ALL;
-
-
 ALTER TABLE sourcepackagerecipedata DISABLE TRIGGER ALL;
 
 

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2010-02-15 13:33:06 +0000
+++ database/schema/comments.sql	2010-02-16 08:30:52 +0000
@@ -1344,16 +1344,10 @@
 COMMENT ON COLUMN SourcePackageRecipeBuild.date_first_dispatched IS 'The instant the build was dispatched the first time. This value will not get overridden if the build is retried.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.requester IS 'Who requested the build.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.recipe IS 'The recipe being processed.';
-COMMENT ON COLUMN SourcePackageRecipeBuild.archive IS 'The archive the source package will be uploaded to.';
-
--- SourcePackageRecipeBuildUpload
-
-COMMENT ON TABLE SourcePackageRecipeBuildUpload IS 'The record of uploading the source package built by a SourcePackageRecipeBuild to an archive.';
-COMMENT ON COLUMN SourcePackageRecipeBuildUpload.registrant IS 'Who requested the upload.';
-COMMENT ON COLUMN SourcePackageRecipeBuildUpload.sourcepackage_recipe_build IS 'Upload the output of this build.';
-COMMENT ON COLUMN SourcePackageRecipeBuildUpload.archive IS 'The archive to upload to.';
-COMMENT ON COLUMN SourcePackageRecipeBuildUpload.upload_log IS 'The output from uploading the source package to the archive.';
-COMMENT ON COLUMN SourcePackageRecipeBuildUpload.state IS 'The state of the upload.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.archive IS 'The archive the source package will be built in and uploaded to.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.pocket IS 'The pocket the source package will be built in and uploaded to.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.dependencies IS 'The missing build dependencies, if any.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.upload_log IS 'The output from uploading the source package to the archive.';
 
 -- SourcePackageRecipeBuildJob
 

=== added file 'database/schema/patch-2207-32-0.sql'
--- database/schema/patch-2207-32-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-32-0.sql	2010-02-16 08:30:52 +0000
@@ -0,0 +1,21 @@
+SET client_min_messages=ERROR;
+
+ALTER TABLE SourcePackageRecipeBuild ADD COLUMN dependencies text;
+ALTER TABLE SourcePackageRecipeBuild ADD COLUMN pocket integer
+    DEFAULT 0 NOT NULL;
+ALTER TABLE SourcePackageRecipeBuild ADD COLUMN upload_log integer
+    CONSTRAINT sourcepackagerecipebuild__upload_log__fk
+    REFERENCES LibraryFileAlias;
+
+CREATE INDEX sourcepackagerecipebuild__upload_log__idx
+    ON SourcePackageRecipeBuild(upload_log) WHERE upload_log IS NOT NULL;
+
+-- We can't drop tables in DB patches due to Slony-I limitations, so
+-- we give them a magic name for database/schema/upgrade.py to deal
+-- with correctly.
+-- Drop the constraint right now so the person privacy checker doesn't
+-- look at this table at all.
+ALTER TABLE SourcePackageRecipeBuildUpload DROP CONSTRAINT sourcepackagerecipebuildupload_registrant_fkey;
+ALTER TABLE SourcePackageRecipeBuildUpload SET SCHEMA todrop; 
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 32, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-02-15 13:33:06 +0000
+++ database/schema/security.cfg	2010-02-16 08:30:52 +0000
@@ -281,7 +281,6 @@
 public.sourcepackagerecipe              = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipebuild         = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipebuildjob      = SELECT, INSERT, UPDATE
-public.sourcepackagerecipebuildupload   = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipedata          = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipedatainstruction = SELECT, INSERT, UPDATE, DELETE
 public.specificationbranch              = SELECT, INSERT, UPDATE, DELETE
@@ -413,7 +412,6 @@
 public.sprint                           = SELECT
 public.sourcepackagereleasefile         = SELECT
 public.sourcepackagerecipebuild         = SELECT
-public.sourcepackagerecipebuildupload   = SELECT
 public.temporaryblobstorage             = SELECT, DELETE
 public.translationimportqueueentry      = SELECT