Merge ~cjwatson/launchpad:stormbase-dbobject into launchpad:master

[Colin Watson]

Make StormBase implement IDBObject

According to https://bugs.launchpad.net/launchpad/+bug/591841, there was once a problem with getting non-`SQLBase` Storm models to implement `IDBObject`, and as a result the `IPrimaryObject` adapter had to be registered on the very broad `Interface` rather than on the more sensible `IDBObject`.

Nowadays, all our Storm models use `StormBase` (enforced by lint rules), and there doesn't appear to be any problem with declaring that that class implements `IDBObject`, so we can replace this ancient hack with something neater.

[Ines Almeida (ines-almeida)]

Makes sense!

Builds need re-running, they seem to have failed with a random failure

review: Approve

diff --git a/lib/lp/services/webapp/database.zcml b/lib/lp/services/webapp/database.zcml
index 4c9bd10..b7130a2 100644
--- a/lib/lp/services/webapp/database.zcml
+++ b/lib/lp/services/webapp/database.zcml
@@ -50,12 +50,9 @@
         for="zope.interface.Interface"
         factory="lp.services.webapp.adapter.get_standby_store"
         />
-    <!-- Universal adapter needed here per Bug #591841.
-         We have no way of specifying that all subclasses of
-         storm.locals.Storm implement an Interface. -->
     <adapter
         provides="lp.services.database.interfaces.IPrimaryObject"
-        for="zope.interface.Interface"
+        for="lp.services.database.interfaces.IDBObject"
         trusted="yes"
         factory="lp.services.webapp.adapter.get_object_from_primary_store"
         />
@@ -66,5 +63,8 @@
     <class class="lp.services.database.sqlbase.SQLBase">
         <implements interface="lp.services.database.interfaces.IDBObject" />
     </class>
+    <class class="lp.services.database.stormbase.StormBase">
+        <implements interface="lp.services.database.interfaces.IDBObject" />
+    </class>
 
 </configure>