Merge lp:~laney/launchpad/db-proposed-not-automatic-pre-release into lp:launchpad/db-devel

[Iain Lane]

Add new column proposed_not_automatic to DistroSeries table. This column indicates whether the -proposed pocket is set NotAutomatic and ButAutomaticUpgrades so that apt does not offer users upgrades into -proposed, but does offer upgrades within it.

Add new column proposed_not_automatic to DistroSeries table. This is part of fix for bug #1016776 — allow NotAutomatic and ButAutomaticUpgrades to be set for the proposed pocket. It's the supporting column for the flag that will allow distros to enable/disable this feature.

[Stuart Bishop (stub)]

Hi. Has this been discussed with the core Launchpad team?

The patch itself looks fine. There are few records in distroseries, so adding the column and setting the default value at the same time is fine.

The new column name is horrible. Can anyone come up with a better name?

(15:19:02) wgrant: stub: My suggestion would be to just make it proposed_not_automatic
(15:19:11) wgrant: stub: The pre-release bit can be handled by unsetting the flag on release :)

This suggestion seems a little more flexible, and doesn't encode the release procedure rules in the data store.

I'm not blocking on the name, as we have worse and it indeed may be the best option.

This patch cannot be applied live, so is targeted correctly for landing and deployment during a fast downtime window.

review: Approve (db)

[Iain Lane (laney)]

FYI, I mailed launchpad-dev asking what the best way to implement this would be (set based on status or the suggestion in the quoted IRC text of having an admin unset at release time) and am waiting for comments before proceeding: https://lists.launchpad.net/launchpad-dev/msg09509.html.

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2012-06-15 05:49:38 +0000
+++ database/schema/comments.sql	2012-07-02 09:08:31 +0000
@@ -1151,6 +1151,7 @@
 COMMENT ON COLUMN DistroSeries.language_pack_delta IS 'Current language pack update based on language_pack_base information.';
 COMMENT ON COLUMN DistroSeries.language_pack_proposed IS 'Either a full or update language pack being tested to be used in language_pack_base or language_pack_delta.';
 COMMENT ON COLUMN DistroSeries.language_pack_full_export_requested IS 'Whether next language pack export should be a full export or an update.';
+COMMENT ON COLUMN DistroSeries.proposed_not_automatic IS 'Whether the -proposed pocket is set NotAutomatic and ButAutomaticUpgrades so that apt does not offer users upgrades into -proposed, but does offer upgrades within it.';
 
 
 -- PackageCopyJob

=== added file 'database/schema/patch-2209-25-1.sql'
--- database/schema/patch-2209-25-1.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2209-25-1.sql	2012-07-02 09:08:31 +0000
@@ -0,0 +1,9 @@
+-- Copyright 2012 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 distroseries
+    ADD COLUMN proposed_not_automatic BOOLEAN NOT NULL DEFAULT FALSE;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 25, 1);