[CalendarServer-changes] [10314] CalendarServer/branches/users/gaya/sharedgroups/txdav/common/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 10314
          http://trac.calendarserver.org//changeset/10314
Author:   gaya at apple.com
Date:     2013-01-18 21:08:18 -0800 (Fri, 18 Jan 2013)
Log Message:
-----------
clean up a bit from last merge from trunk

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-01-19 04:44:01 UTC (rev 10313)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-01-19 05:08:18 UTC (rev 10314)
@@ -2743,23 +2743,15 @@
                    bind.BIND_STATUS,
                    bind.MESSAGE]
         columns.extend(cls.metadataColumns())
+        return Select(columns,
+                     From=child.join(
+                         bind, child.RESOURCE_ID == bind.RESOURCE_ID,
+                         'left outer').join(
+                         childMetaData, childMetaData.RESOURCE_ID == bind.RESOURCE_ID,
+                         'left outer'),
+                     Where=(bind.HOME_RESOURCE_ID == Parameter("homeID")
+                           ).And(bind.BIND_STATUS == _BIND_STATUS_ACCEPTED))
 
-        if child == childMetaData:
-            return Select(columns,
-                         From=child.join(
-                             bind, child.RESOURCE_ID == bind.RESOURCE_ID,
-                             'left outer'),
-                         Where=(bind.HOME_RESOURCE_ID == Parameter("homeID")
-                               ).And(bind.BIND_STATUS == _BIND_STATUS_ACCEPTED))
-        else:
-            return Select(columns,
-                         From=child.join(
-                             bind, child.RESOURCE_ID == bind.RESOURCE_ID,
-                             'left outer').join(
-                             childMetaData, childMetaData.RESOURCE_ID == bind.RESOURCE_ID,
-                             'left outer'),
-                         Where=(bind.HOME_RESOURCE_ID == Parameter("homeID")
-                               ).And(bind.BIND_STATUS == _BIND_STATUS_ACCEPTED))
 
 
     def shareMode(self):
@@ -3100,10 +3092,12 @@
         if name.startswith("."):
             raise HomeChildNameNotAllowedError(name)
 
+        # Create this object
         resourceID = (
             yield cls._insertHomeChild.on(home._txn))[0][0]
 
-        created, modified = (
+        # Initialize this object
+        _created, _modified = (
             yield cls._insertHomeChildMetaData.on(home._txn,
                                                   resourceID=resourceID))[0]
 
@@ -3116,8 +3110,8 @@
 
         # Initialize other state
         child = cls(home, name, resourceID, _BIND_MODE_OWN, _BIND_STATUS_ACCEPTED)
-        child._created = created
-        child._modified = modified
+        child._created = _created
+        child._modified = _modified
         yield child._loadPropertyStore()
 
         child.properties()[
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130118/ed75eca2/attachment.html>