Merge lp:~stevenk/launchpad/denorm-bspph-model into lp:launchpad

[Steve Kowalik]

Sprinkle in the model changes for {B,S}PPH denormalisation. This is able to land right away, due to the db patch having landed.

=== removed file 'database/schema/patch-2208-87-1.sql'
--- database/schema/patch-2208-87-1.sql	2011-09-13 01:08:28 +0000
+++ database/schema/patch-2208-87-1.sql	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--- Copyright 2011 Canonical Ltd.  This software is licensed under the
--- GNU Affero General Public License version 3 (see the file LICENSE).
-SET client_min_messages=ERROR;
-
-CREATE INDEX binarypackagepublishinghistory__binarypackagename__idx ON BinaryPackagePublishingHistory(binarypackagename);
-CREATE INDEX sourcepackagepublishinghistory__sourcepackagename__idx ON SourcePackagePublishingHistory(sourcepackagename);
-
-INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 87, 1);
-
 
=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2011-09-11 11:08:30 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2011-09-13 01:08:37 +0000
@@ -326,6 +326,12 @@
     id = Int(
             title=_('ID'), required=True, readonly=True,
             )
+    sourcepackagenameID = Attribute(
+        "The DB id for the sourcepackagename.")
+    sourcepackagename = Int(
+        title=_('The source package name being published'),
+        required=False, readonly=False,
+        )
     sourcepackagereleaseID = Attribute(
         "The DB id for the sourcepackagerelease.")
     sourcepackagerelease = Int(
@@ -672,6 +678,12 @@
     id = Int(
             title=_('ID'), required=True, readonly=True,
             )
+    binarypackagenameID = Attribute(
+        "The DB id for the binarypackagename.")
+    binarypackagename = Int(
+        title=_('The binary package name being published'),
+        required=False, readonly=False,
+        )
     binarypackagerelease = Int(
             title=_('The binary package being published'), required=False,
             readonly=False,
 
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2011-09-11 11:08:30 +0000
+++ lib/lp/soyuz/model/publishing.py	2011-09-13 01:08:37 +0000
@@ -421,6 +421,8 @@
     """A source package release publishing record."""
     implements(ISourcePackagePublishingHistory)
 
+    sourcepackagename = ForeignKey(foreignKey='SourcePackageName',
+        dbName='sourcepackagename')
     sourcepackagerelease = ForeignKey(foreignKey='SourcePackageRelease',
         dbName='sourcepackagerelease')
     distroseries = ForeignKey(foreignKey='DistroSeries',
@@ -904,6 +906,8 @@
 
     implements(IBinaryPackagePublishingHistory)
 
+    binarypackagename = ForeignKey(foreignKey='BinaryPackageName',
+        dbName='binarypackagename')
     binarypackagerelease = ForeignKey(foreignKey='BinaryPackageRelease',
                                       dbName='binarypackagerelease')
     distroarchseries = ForeignKey(foreignKey='DistroArchSeries',