[CalendarServer-changes] [14587] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14587
          http://trac.calendarserver.org//changeset/14587
Author:   cdaboo at apple.com
Date:     2015-03-13 10:34:53 -0700 (Fri, 13 Mar 2015)
Log Message:
-----------
Fixes for Oracle DB.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/txdav/caldav/datastore/query/generator.py
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/carddav/datastore/sql.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2015-03-13 17:33:19 UTC (rev 14586)
+++ CalendarServer/trunk/requirements-stable.txt	2015-03-13 17:34:53 UTC (rev 14587)
@@ -36,7 +36,7 @@
             #pyOpenSSL
         pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14531#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14586#egg=twextpy
         cffi==0.8.6
             pycparser==2.10
         #twisted

Modified: CalendarServer/trunk/txdav/caldav/datastore/query/generator.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/query/generator.py	2015-03-13 17:33:19 UTC (rev 14586)
+++ CalendarServer/trunk/txdav/caldav/datastore/query/generator.py	2015-03-13 17:34:53 UTC (rev 14587)
@@ -46,7 +46,7 @@
         @type freebusy: C{bool}
         """
         super(CalDAVSQLQueryGenerator, self).__init__(expr, collection, whereid)
-        self.userid = userid if userid else ""
+        self.userid = userid if userid else "."
         self.freebusy = freebusy
         self.usedtimerange = False
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-03-13 17:33:19 UTC (rev 14586)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-03-13 17:34:53 UTC (rev 14587)
@@ -3135,7 +3135,7 @@
 
         # See if default exists and add using appropriate logic
         alarm = self.calendar().getDefaultAlarm(vevent, timed)
-        if alarm is None:
+        if not alarm:
             alarm = self.calendar().viewerHome().getDefaultAlarm(vevent, timed)
         if alarm and alarm != "empty" and component.addAlarms(alarm):
             self._componentChanged = True
@@ -3913,7 +3913,7 @@
                 if usertransp != transp or adjusted_start is not None or adjusted_end is not None:
                     (yield Insert({
                         tpy.TIME_RANGE_INSTANCE_ID : instanceid,
-                        tpy.USER_ID                : useruid,
+                        tpy.USER_ID                : useruid if useruid else ".",
                         tpy.TRANSPARENT            : usertransp,
                         tpy.ADJUSTED_START_DATE    : _adjustDateTime(start, adjusted_start, add_duration=False),
                         tpy.ADJUSTED_END_DATE      : _adjustDateTime(end, adjusted_end, add_duration=True),

Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py	2015-03-13 17:33:19 UTC (rev 14586)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py	2015-03-13 17:34:53 UTC (rev 14587)
@@ -338,7 +338,7 @@
         # If the collection name is None that means we have a change to the owner's default address book,
         # so substitute in the name of that. If collection name is not None, then we have a revision
         # for the owned or a shared address book itself.
-        result = [[row[0] if row[0] is not None else self.addressbook().name()] + row for row in rows]
+        result = [[row[0] if row[0] else self.addressbook().name()] + row for row in rows]
         returnValue(result)
 
 
@@ -2635,12 +2635,17 @@
             self._modified = parseSQLTimestamp(self._modified)
 
             # delete foreign members table rows for this object
-            groupIDRows = yield Delete(
-                aboForeignMembers,
+            groupIDRows = yield Select(
+                [aboForeignMembers.GROUP_ID],
+                From=aboForeignMembers,
                 Where=aboForeignMembers.MEMBER_ADDRESS == "urn:uuid:" + self._uid,
-                Return=aboForeignMembers.GROUP_ID
             ).on(self._txn)
             groupIDs = set([groupIDRow[0] for groupIDRow in groupIDRows])
+            if groupIDs:
+                yield Delete(
+                    From=aboForeignMembers,
+                    Where=aboForeignMembers.MEMBER_ADDRESS == "urn:uuid:" + self._uid,
+                ).on(self._txn)
 
             # add this object to shared groups
             if partiallyShared:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150313/d7310056/attachment.html>