[CalendarServer-changes] [9335] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9335
          http://trac.macosforge.org/projects/calendarserver/changeset/9335
Author:   glyph at apple.com
Date:     2012-06-05 17:37:39 -0700 (Tue, 05 Jun 2012)
Log Message:
-----------
Don't bother to UUID-normalize the Postgres proxy principals database; the syntax being used for sqlite doesn't work, and it's not worth the trouble at the moment.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

Property Changed:
----------------
    CalendarServer/trunk/

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2012-06-06 00:35:42 UTC (rev 9334)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2012-06-06 00:37:39 UTC (rev 9335)
@@ -788,6 +788,10 @@
 
     @inlineCallbacks
     def _maybeNormalizeUUIDs(self):
+        """
+        Normalize the UUIDs in the proxy database so they correspond to the
+        normalized UUIDs in the main calendar database.
+        """
         alreadyDone = yield self._db_value_for_sql(
             "select VALUE from CALDAV where KEY = 'UUIDS_NORMALIZED'"
         )
@@ -876,7 +880,7 @@
     """
 
     def __init__(self, dbpath):
-        
+
         ADBAPISqliteMixin.__init__(self)
         ProxyDB.__init__(self, "Proxies", "sqlite3", (fullServerPath(config.DataRoot, dbpath),))
 
@@ -886,12 +890,23 @@
     """
 
     def __init__(self, host, database, user=None, password=None, dbtype=None):
-        
+
         ADBAPIPostgreSQLMixin.__init__(self, )
         ProxyDB.__init__(self, "Proxies", "pgdb", (), host=host, database=database, user=user, password=password,)
         if dbtype:
             ProxyDB.schema_type = dbtype
 
+
+    def _maybeNormalizeUUIDs(self):
+        """
+        Don't bother normalizing UUIDs for postgres yet; users of postgres
+        databases for proxy data are even less likely to have UUID
+        case-normalization issues than the general population.
+        """
+        return succeed(None)
+
+
+
 ##
 # Utilities
 ##
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120605/48de67cb/attachment.html>