[CalendarServer-changes] [7357] CalendarServer/branches/users/cdaboo/pods/twistedcaldav

[source_changes at macosforge.org]

Revision: 7357
          http://trac.macosforge.org/projects/calendarserver/changeset/7357
Author:   cdaboo at apple.com
Date:     2011-04-22 12:41:03 -0700 (Fri, 22 Apr 2011)
Log Message:
-----------
Need option to override the default proxy db name since deployment used a different one.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/pods/twistedcaldav/directory/calendaruserproxy.py
    CalendarServer/branches/users/cdaboo/pods/twistedcaldav/stdconfig.py

Modified: CalendarServer/branches/users/cdaboo/pods/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pods/twistedcaldav/directory/calendaruserproxy.py	2011-04-22 17:02:38 UTC (rev 7356)
+++ CalendarServer/branches/users/cdaboo/pods/twistedcaldav/directory/calendaruserproxy.py	2011-04-22 19:41:03 UTC (rev 7357)
@@ -797,12 +797,13 @@
     PostgreSQL based augment database implementation.
     """
 
-    def __init__(self, host, database, user=None, password=None):
+    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
 
-
 ##
 # Utilities
 ##

Modified: CalendarServer/branches/users/cdaboo/pods/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pods/twistedcaldav/stdconfig.py	2011-04-22 17:02:38 UTC (rev 7356)
+++ CalendarServer/branches/users/cdaboo/pods/twistedcaldav/stdconfig.py	2011-04-22 19:41:03 UTC (rev 7357)
@@ -148,6 +148,7 @@
         "database": "proxies",
         "user":     "",
         "password": "",
+        "dbtype": "",
     },
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110422/962d62f9/attachment.html>