Merge lp:~stevenk/launchpad/db-add-information_type into lp:launchpad/db-devel

[Steve Kowalik]

[r=stub][bug=933759][no-qa] Add an information_type column to Bug and Branch.

Add an information_type column to Bug and Branch.

This is preliminary work to replace both Bug.security_related/Bug.private and Branch.private in one fell swoop. The columns make reference to the AccessPolicyType enum value (branch to rename it to InformationType is currently playing in ec2.)

A new DB patch to add a NOT NULL constraint will be added after we have completely migrated to it.

[Robert Collins (lifeless)]

Don't use default, it will take hours to apply. See the HotPatching wiki page/schemachangeprocess wiki page for docs.

review: Needs Fixing

[Stuart Bishop (stub)]

The comment is not very useful at the moment. Try something like 'Enum describing what type of information is stored, such as type of private or security related data, and used to determine how to apply an access policy.'

Otherwise the patch is fine.

review: Approve (db)

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2012-03-04 09:53:04 +0000
+++ database/schema/comments.sql	2012-03-08 08:15:23 +0000
@@ -107,6 +107,7 @@
 COMMENT ON COLUMN Branch.merge_queue IS 'A reference to the BranchMergeQueue record that manages merges.';
 COMMENT ON COLUMN Branch.merge_queue_config IS 'A JSON string of configuration values that can be read by a merge queue script.';
 COMMENT ON COLUMN Branch.transitively_private IS 'A branch is transitively private if it is explicitly private or is stacked on a transitively private branch.';
+COMMENT ON COLUMN Branch.information_type IS 'Enum describing what type of information is stored, such as type of private or security related data, and used to determine how to apply an access policy.';
 
 -- BranchMergeQueue
 COMMENT ON TABLE BranchMergeQueue IS 'Queue for managing the merge workflow for branches.';
@@ -216,6 +217,7 @@
 COMMENT ON COLUMN Bug.heat IS 'The relevance of this bug. This value is computed periodically using bug_affects_person and other bug values.';
 COMMENT ON COLUMN Bug.heat_last_updated IS 'The time this bug''s heat was last updated, or NULL if the heat has never yet been updated.';
 COMMENT ON COLUMN Bug.latest_patch_uploaded IS 'The time when the most recent patch has been attached to this bug or NULL if no patches are attached';
+COMMENT ON COLUMN Bug.information_type IS 'Enum describing what type of information is stored, such as type of private or security related data, and used to determine how to apply an access policy.';
 
 -- BugBranch
 COMMENT ON TABLE BugBranch IS 'A branch related to a bug, most likely a branch for fixing the bug.';

=== added file 'database/schema/patch-2209-12-0.sql'
--- database/schema/patch-2209-12-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2209-12-0.sql	2012-03-08 08:15:23 +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 Branch ADD COLUMN information_type INTEGER;
+ALTER TABLE Bug ADD COLUMN information_type INTEGER;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 12, 0);