Merge lp:~stevenk/launchpad/drop-branchmergeproposal-merge_diff into lp:launchpad/db-devel

[Steve Kowalik]

Drop the BranchMergeProposal.merge_diff column.

Dump BranchMergeProposal.merge_diff as our last step.

[Stuart Bishop (stub)]

Yup

review: Approve (db)

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2013-02-06 11:44:37 +0000
+++ database/schema/comments.sql	2013-05-16 05:59:39 +0000
@@ -135,7 +135,6 @@
 COMMENT ON COLUMN BranchMergeProposal.dependent_branch IS 'If the source branch was not branched off the target branch, then this is considered the dependent_branch.';
 COMMENT ON COLUMN BranchMergeProposal.date_created IS 'When the registrant created the merge proposal.';
 COMMENT ON COLUMN BranchMergeProposal.whiteboard IS 'Used to write other information about the branch, like test URLs.';
-COMMENT ON COLUMN BranchMergeProposal.merge_diff IS 'The diff showing the predicted result of a merge.';
 COMMENT ON COLUMN BranchMergeProposal.merged_revno IS 'This is the revision number of the revision on the target branch that includes the merge from the source branch.';
 COMMENT ON COLUMN BranchMergeProposal.merge_reporter IS 'This is the user that marked the proposal as merged.';
 COMMENT ON COLUMN BranchMergeProposal.date_merged IS 'This is the date that merge occurred.';

=== added file 'database/schema/patch-2209-44-2.sql'
--- database/schema/patch-2209-44-2.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2209-44-2.sql	2013-05-16 05:59:39 +0000
@@ -0,0 +1,8 @@
+-- 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 branchmergeproposal DROP COLUMN merge_diff;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 44, 2);