Merge lp:~stevenk/launchpad/db-recipe-description into lp:launchpad/db-devel

Proposed by Steve Kowalik
Status: Merged
Approved by: Stuart Bishop
Approved revision: no longer in the source branch.
Merged at revision: 10229
Proposed branch: lp:~stevenk/launchpad/db-recipe-description
Merge into: lp:launchpad/db-devel
Diff against target: 38 lines (+10/-2)
3 files modified
database/schema/patch-2208-49-0.sql (+8/-0)
lib/lp/code/interfaces/sourcepackagerecipe.py (+1/-1)
lib/lp/code/model/sourcepackagerecipe.py (+1/-1)
To merge this branch: bzr merge lp:~stevenk/launchpad/db-recipe-description
Reviewer Review Type Date Requested Status
Stuart Bishop (community) db + code Approve
Robert Collins db Pending
Launchpad code reviewers Pending
Review via email: mp+50697@code.launchpad.net

Commit message

[r=stub][bug=713518] SourcePackageRecipe.description is now optional.

Description of the change

Drop the NOT NULL constraint on SourcePackageRecipe.description, and update the interface and model to reflect this.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Fine.

patch-2208-49-0.sql

review: Approve (db)
Revision history for this message
Stuart Bishop (stub) wrote :

Approving code too.

review: Approve (code)
Revision history for this message
Stuart Bishop (stub) :
review: Approve (db + code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'database/schema/patch-2208-49-0.sql'
2--- database/schema/patch-2208-49-0.sql 1970-01-01 00:00:00 +0000
3+++ database/schema/patch-2208-49-0.sql 2011-02-22 07:56:41 +0000
4@@ -0,0 +1,8 @@
5+-- Copyright 2011 Canonical Ltd. This software is licensed under the
6+-- GNU Affero General Public License version 3 (see the file LICENSE).
7+SET client_min_messages=ERROR;
8+
9+ALTER TABLE SourcePackageRecipe
10+ ALTER COLUMN description DROP NOT NULL;
11+
12+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 49, 0);
13
14=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
15--- lib/lp/code/interfaces/sourcepackagerecipe.py 2011-02-18 02:39:47 +0000
16+++ lib/lp/code/interfaces/sourcepackagerecipe.py 2011-02-22 07:56:41 +0000
17@@ -191,7 +191,7 @@
18 description=_("The name of this recipe.")))
19
20 description = exported(Description(
21- title=_('Description'), required=True,
22+ title=_('Description'),
23 description=_('A short description of the recipe.')))
24
25 date_last_modified = exported(
26
27=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
28--- lib/lp/code/model/sourcepackagerecipe.py 2011-02-18 02:39:47 +0000
29+++ lib/lp/code/model/sourcepackagerecipe.py 2011-02-22 07:56:41 +0000
30@@ -147,7 +147,7 @@
31 return self.sourcepackagename.name
32
33 name = Unicode(allow_none=True)
34- description = Unicode(allow_none=False)
35+ description = Unicode(allow_none=True)
36
37 @property
38 def _recipe_data(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: