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

[Steve Kowalik]

[r=wgrant][bug=826516][incr] Add model changes for {B,S}PPH denormalisation, and fix new publications to set their name.

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

[William Grant (wgrant)]

8 + sourcepackagenameID = Attribute(
9 + "The DB id for the sourcepackagename.")
10 + sourcepackagename = Int(
11 + title=_('The source package name being published'),
12 + required=False, readonly=False,
13 + )

Lies. I think you have those types the wrong way around.

There's also already SPPH.source_package_name, which delegates to SPR.name. Might want to clarify with comments what the difference is.

Same with the binary equivalents for both comments.

review: Needs Fixing

[William Grant (wgrant)]

review: Approve (code)

=== 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 08:41:42 +0000
@@ -326,12 +326,15 @@
     id = Int(
             title=_('ID'), required=True, readonly=True,
             )
-    sourcepackagereleaseID = Attribute(
-        "The DB id for the sourcepackagerelease.")
-    sourcepackagerelease = Int(
-            title=_('The source package release being published'),
-            required=False, readonly=False,
-            )
+    sourcepackagenameID = Int(
+        title=_('The DB id for the sourcepackagename.'),
+        required=False, readonly=False)
+    sourcepackagename = Attribute('The source package name being published')
+    sourcepackagereleaseID = Int(
+        title=_('The DB id for the sourcepackagerelease.'),
+        required=False, readonly=False)
+    sourcepackagerelease = Attribute(
+        'The source package release being published')
     status = exported(
         Choice(
             title=_('Package Publishing Status'),
@@ -669,13 +672,15 @@
 
 class IBinaryPackagePublishingHistoryPublic(IPublishingView):
     """A binary package publishing record."""
-    id = Int(
-            title=_('ID'), required=True, readonly=True,
-            )
+
+    id = Int(title=_('ID'), required=True, readonly=True)
+    binarypackagenameID = Int(
+        title=_('The DB id for the binarypackagename.'),
+        required=False, readonly=False)
+    binarypackagename = Attribute('The binary package name being published')
     binarypackagerelease = Int(
             title=_('The binary package being published'), required=False,
-            readonly=False,
-            )
+            readonly=False)
     distroarchseries = exported(
         Reference(
             Interface, #Really IDistroArchSeries, circular import fixed below.

=== 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 08:41:42 +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',
@@ -683,6 +685,8 @@
         return self.distroseries.distribution.getSourcePackageRelease(
             self.supersededby)
 
+    # XXX: StevenK 2011-09-13 bug=848563: This can die when 
+    # self.sourcepackagename is populated.
     @property
     def source_package_name(self):
         """See `ISourcePackagePublishingHistory`"""
@@ -904,6 +908,8 @@
 
     implements(IBinaryPackagePublishingHistory)
 
+    binarypackagename = ForeignKey(foreignKey='BinaryPackageName',
+        dbName='binarypackagename')
     binarypackagerelease = ForeignKey(foreignKey='BinaryPackageRelease',
                                       dbName='binarypackagerelease')
     distroarchseries = ForeignKey(foreignKey='DistroArchSeries',
@@ -951,6 +957,8 @@
         """See `IBinaryPackagePublishingHistory`"""
         return self.distroarchseries.distroseries
 
+    # XXX: StevenK 2011-09-13 bug=848563: This can die when 
+    # self.binarypackagename is populated.
     @property
     def binary_package_name(self):
         """See `IBinaryPackagePublishingHistory`"""
@@ -1198,6 +1206,7 @@
 
         # Append the modified package publishing entry
         return BinaryPackagePublishingHistory(
+            binarypackagename=self.binarypackagerelease.binarypackagename,
             binarypackagerelease=self.binarypackagerelease,
             distroarchseries=self.distroarchseries,
             status=PackagePublishingStatus.PENDING,
@@ -1429,12 +1438,14 @@
         insert_head = """
             INSERT INTO BinaryPackagePublishingHistory
             (archive, distroarchseries, pocket, binarypackagerelease,
-             component, section, priority, status, datecreated)
+             binarypackagename, component, section, priority, status,
+             datecreated)
             VALUES
             """
         insert_pubs = ", ".join(
             "(%s)" % ", ".join(sqlvalues(
                 get_archive(archive, bpr).id, das.id, pocket, bpr.id,
+                bpr.binarypackagename,
                 get_component(archive, das.distroseries, component).id,
                 section.id, priority, PackagePublishingStatus.PENDING,
                 UTC_NOW))
@@ -1463,6 +1474,7 @@
             "Will not create new publications in a disabled architecture.")
         return BinaryPackagePublishingHistory(
             archive=archive,
+            binarypackagename=binarypackagerelease.binarypackagename,
             binarypackagerelease=binarypackagerelease,
             distroarchseries=distroarchseries,
             component=get_component(
@@ -1485,6 +1497,7 @@
             distroseries=distroseries,
             pocket=pocket,
             archive=archive,
+            sourcepackagename=sourcepackagerelease.sourcepackagename,
             sourcepackagerelease=sourcepackagerelease,
             component=get_component(archive, distroseries, component),
             section=section,

=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2011-09-08 09:27:01 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2011-09-13 08:41:42 +0000
@@ -976,6 +976,7 @@
 
         BinaryPackagePublishingHistory(
             binarypackagerelease=binarypackage.id,
+            binarypackagename=binarypackage.binarypackagename,
             component=component.id,
             section=section.id,
             priority=priority,