[CalendarServer-changes] [12794] CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common /datastore/upgrade/sql/upgrades

[source_changes at macosforge.org]

Revision: 12794
          http://trac.calendarserver.org//changeset/12794
Author:   cdaboo at apple.com
Date:     2014-03-04 12:20:30 -0800 (Tue, 04 Mar 2014)
Log Message:
-----------
Make sure empty WebDAV alarm properties are properly converted to the new SQL schema column values.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py
    CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_3_to_4.py

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py	2014-03-04 18:55:52 UTC (rev 12793)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py	2014-03-04 20:20:30 UTC (rev 12794)
@@ -198,7 +198,7 @@
             continue
         prop = calendar.properties().get(PropertyName.fromElement(propname))
         if prop is not None:
-            alarm = str(prop.children[0]) if prop.children else None
+            alarm = str(prop.children[0]) if prop.children and prop.children[0] else "empty"
             yield calendar.setDefaultAlarm(alarm, vevent, timed)
             del calendar.properties()[PropertyName.fromElement(propname)]
 

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_3_to_4.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_3_to_4.py	2014-03-04 18:55:52 UTC (rev 12793)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_3_to_4.py	2014-03-04 20:20:30 UTC (rev 12794)
@@ -318,17 +318,11 @@
 END:VALARM
 """
 
-        alarmshared2 = """BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT2M
-END:VALARM
-"""
+        alarmshared2 = ""
+        alarmshared2_empty = "empty"
 
-        alarmshared3 = """BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT3M
-END:VALARM
-"""
+        alarmshared3 = ""
+        alarmshared3_empty = "empty"
 
         alarmshared4 = """BEGIN:VALARM
 ACTION:AUDIO
@@ -379,6 +373,14 @@
 
         yield self.commit()
 
+        # Re-adjust for empty changes
+        detailsshared = (
+            (True, True, alarmshared1, caldavxml.DefaultAlarmVEventDateTime,),
+            (True, False, alarmshared2_empty, caldavxml.DefaultAlarmVEventDate,),
+            (False, True, alarmshared3_empty, caldavxml.DefaultAlarmVToDoDateTime,),
+            (False, False, alarmshared4, caldavxml.DefaultAlarmVToDoDate,),
+        )
+
         returnValue((detailshome, detailscalendar, detailsshared, shared_name,))
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140304/5b1b3255/attachment-0001.html>