[CalendarServer-changes] [4963] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 25 18:07:15 PST 2010
Revision: 4963
http://trac.macosforge.org/projects/calendarserver/changeset/4963
Author: cdaboo at apple.com
Date: 2010-01-25 18:07:12 -0800 (Mon, 25 Jan 2010)
Log Message:
-----------
Protect against race conditions during initialization and upgrades.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2010-01-26 01:25:49 UTC (rev 4962)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2010-01-26 02:07:12 UTC (rev 4963)
@@ -709,19 +709,23 @@
#
# GROUPS table
#
- yield self._create_table("GROUPS", (
- ("GROUPNAME", "text"),
- ("MEMBER", "text"),
- ))
+ yield self._create_table(
+ "GROUPS",
+ (
+ ("GROUPNAME", "text"),
+ ("MEMBER", "text"),
+ ),
+ ifnotexists=True,
+ )
yield self._db_execute(
"""
- create index GROUPNAMES on GROUPS (GROUPNAME)
+ create index if not exists GROUPNAMES on GROUPS (GROUPNAME)
"""
)
yield self._db_execute(
"""
- create index MEMBERS on GROUPS (MEMBER)
+ create index if not exists MEMBERS on GROUPS (MEMBER)
"""
)
@@ -737,12 +741,12 @@
if int(old_version) < 4:
yield self._db_execute(
"""
- create index GROUPNAMES on GROUPS (GROUPNAME)
+ create index if not exists GROUPNAMES on GROUPS (GROUPNAME)
"""
)
yield self._db_execute(
"""
- create index MEMBERS on GROUPS (MEMBER)
+ create index if not exists MEMBERS on GROUPS (MEMBER)
"""
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100125/536f80cc/attachment.html>
More information about the calendarserver-changes
mailing list