[CalendarServer-changes] [7114] CalendarServer/branches/users/glyph/oracle/txdav

[source_changes at macosforge.org]

Revision: 7114
          http://trac.macosforge.org/projects/calendarserver/changeset/7114
Author:   glyph at apple.com
Date:     2011-03-07 18:59:43 -0800 (Mon, 07 Mar 2011)
Log Message:
-----------
start clearing out some now-unused SQL syntax stuff

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/oracle/txdav/caldav/datastore/sql.py
    CalendarServer/branches/users/glyph/oracle/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/glyph/oracle/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/oracle/txdav/caldav/datastore/sql.py	2011-03-08 02:59:31 UTC (rev 7113)
+++ CalendarServer/branches/users/glyph/oracle/txdav/caldav/datastore/sql.py	2011-03-08 02:59:43 UTC (rev 7114)
@@ -324,27 +324,6 @@
         self.hasPrivateComment = metadata.get("hasPrivateComment", False)
 
 
-    @classmethod
-    def _selectAllColumns(cls):
-        return """
-            select 
-              %(column_RESOURCE_ID)s,
-              %(column_RESOURCE_NAME)s,
-              %(column_UID)s,
-              %(column_MD5)s,
-              character_length(%(column_TEXT)s),
-              %(column_ATTACHMENTS_MODE)s,
-              %(column_DROPBOX_ID)s,
-              %(column_ACCESS)s,
-              %(column_SCHEDULE_OBJECT)s,
-              %(column_SCHEDULE_TAG)s,
-              %(column_SCHEDULE_ETAGS)s,
-              %(column_PRIVATE_COMMENTS)s,
-              %(column_CREATED)s,
-              %(column_MODIFIED)s
-        """ % cls._objectTable
-
-
     _allColumns = [
         _objectSchema.RESOURCE_ID,
         _objectSchema.RESOURCE_NAME,

Modified: CalendarServer/branches/users/glyph/oracle/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/oracle/txdav/common/datastore/sql.py	2011-03-08 02:59:31 UTC (rev 7113)
+++ CalendarServer/branches/users/glyph/oracle/txdav/common/datastore/sql.py	2011-03-08 02:59:43 UTC (rev 7114)
@@ -62,7 +62,6 @@
 from twext.enterprise.dal.syntax import Delete
 from twext.enterprise.dal.syntax import Insert
 from twext.enterprise.dal.syntax import Len
-from twext.enterprise.dal.syntax import Lock
 from twext.enterprise.dal.syntax import Max
 from twext.enterprise.dal.syntax import Parameter
 from twext.enterprise.dal.syntax import SavepointAction
@@ -2164,25 +2163,6 @@
             returnValue(None)
 
 
-    @classmethod
-    def _selectAllColumns(cls):
-        """
-        Full set of columns in the object table that need to be loaded to
-        initialize the object resource state.  (XXX: remove me, old string-based
-        version, see _allColumns)
-        """
-        return """
-            select
-              %(column_RESOURCE_ID)s,
-              %(column_RESOURCE_NAME)s,
-              %(column_UID)s,
-              %(column_MD5)s,
-              character_length(%(column_TEXT)s),
-              %(column_CREATED)s,
-              %(column_MODIFIED)s
-        """ % cls._objectTable
-
-
     @classproperty
     def _allColumns(cls):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110307/66645307/attachment.html>