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

[source_changes at macosforge.org]

Revision: 10716
          http://trac.calendarserver.org//changeset/10716
Author:   gaya at apple.com
Date:     2013-02-13 14:14:20 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
fix _childrenAndMetadataForHomeID

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-02-13 21:59:31 UTC (rev 10715)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-02-13 22:14:20 UTC (rev 10716)
@@ -2803,8 +2803,7 @@
         bind = cls._bindSchema
         child = cls._homeChildSchema
         childMetaData = cls._homeChildMetaDataSchema
-        columns = cls._bindColumns
-        columns = columns.extend(cls.metadataColumns())
+        columns = cls._bindColumns + list(cls.metadataColumns())
         return Select(columns,
                      From=child.join(
                          bind, child.RESOURCE_ID == bind.RESOURCE_ID,
@@ -3490,23 +3489,6 @@
         yield self.notifyChanged()
 
 
-    @classproperty
-    def _moveParentUpdateQuery(cls, adjustName=False): #@NoSelf
-        """
-        DAL query to update a child to be in a new parent.
-        """
-        obj = cls._objectSchema
-        cols = {
-            obj.PARENT_RESOURCE_ID: Parameter("newParentID")
-        }
-        if adjustName:
-            cols[obj.RESOURCE_NAME] = Parameter("newName")
-        return Update(
-            cols,
-            Where=obj.RESOURCE_ID == Parameter("resourceID")
-        )
-
-
     def _movedObjectResource(self, child, newparent):
         """
         Method that subclasses can override to do an extra DB adjustments when a resource
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130213/f71daba7/attachment.html>