<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14571] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14571">14571</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 19:51:01 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cross-pod pg8000 fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkproject">CalendarServer/trunk/.project</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingstore_apipy">CalendarServer/trunk/txdav/common/datastore/podding/store_api.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkproject"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/.project (14570 => 14571)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/.project 2015-03-12 01:39:48 UTC (rev 14570)
+++ CalendarServer/trunk/.project 2015-03-12 02:51:01 UTC (rev 14571)
</span><span class="lines">@@ -6,15 +6,13 @@
</span><span class="cx"> <project>CalDAVClientLibrary</project>
</span><span class="cx"> <project>cffi</project>
</span><span class="cx"> <project>kerberos</project>
</span><ins>+ <project>pg8000</project>
</ins><span class="cx"> <project>psutil</project>
</span><span class="cx"> <project>pycalendar</project>
</span><span class="cx"> <project>pycparser</project>
</span><span class="cx"> <project>pycrypto</project>
</span><del>- <project>PyGreSQL</project>
</del><span class="cx"> <project>pyOpenSSL</project>
</span><del>- <project>python-ldap</project>
</del><span class="cx"> <project>service_identity</project>
</span><del>- <project>sqlparse</project>
</del><span class="cx"> <project>twextpy</project>
</span><span class="cx"> <project>Twisted</project>
</span><span class="cx"> <project>zope.interface-4.0.3</project>
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14570 => 14571)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-12 01:39:48 UTC (rev 14570)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-12 02:51:01 UTC (rev 14571)
</span><span class="lines">@@ -1189,6 +1189,16 @@
</span><span class="cx"> return self._home
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def serialize(self):
+ """
+ Override to map one column specific to this class.
+ """
+ data = super(Calendar, self).serialize()
+ if data["metadataData"]["trashed"]:
+ data["metadataData"]["trashed"] = data["metadataData"]["trashed"].isoformat(" ")
+ return data
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def copyMetadata(self, other):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingstore_apipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/store_api.py (14570 => 14571)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/store_api.py 2015-03-12 01:39:48 UTC (rev 14570)
+++ CalendarServer/trunk/txdav/common/datastore/podding/store_api.py 2015-03-12 02:51:01 UTC (rev 14571)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> from txdav.common.datastore.sql_tables import _HOME_STATUS_DISABLED
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.caldavxml import TimeRange
</span><ins>+from datetime import datetime
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class StoreAPIConduitMixin(object):
</span><span class="lines">@@ -157,6 +158,16 @@
</span><span class="cx"> """
</span><span class="cx"> return dict([(k, UtilityConduitMixin._to_serialize_list(v),) for k, v in value.items()])
</span><span class="cx">
</span><ins>+
+ @staticmethod
+ def _to_serialize_search_value(value):
+ """
+ Convert the value to the external (JSON-based) representation.
+ """
+ def _convert(item):
+ return map(lambda x: x.isoformat(" ") if isinstance(x, datetime) else x, item)
+ return map(_convert, value)
+
</ins><span class="cx"> # These are the actions on store objects we need to expose via the conduit api
</span><span class="cx">
</span><span class="cx"> # Calls on L{CommonHome} objects
</span><span class="lines">@@ -173,7 +184,7 @@
</span><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_moveaway", "moveObjectResourceAway")
</span><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_synctokenrevision", "syncTokenRevision")
</span><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_resourcenamessincerevision", "resourceNamesSinceRevision", transform_send_result=UtilityConduitMixin._to_tuple)
</span><del>-UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_search", "search")
</del><ins>+UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_search", "search", transform_recv_result=StoreAPIConduitMixin._to_serialize_search_value)
</ins><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_sharing_records", "sharingBindRecords", transform_recv_result=StoreAPIConduitMixin._to_serialize_dict_value)
</span><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_migrate_sharing_records", "migrateBindRecords")
</span><span class="cx"> UtilityConduitMixin._make_simple_action(StoreAPIConduitMixin, "homechild_group_sharees", "groupSharees", transform_recv_result=StoreAPIConduitMixin._to_serialize_dict_list_serialized_value)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14570 => 14571)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-12 01:39:48 UTC (rev 14570)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-12 02:51:01 UTC (rev 14571)
</span><span class="lines">@@ -4756,6 +4756,8 @@
</span><span class="cx"> the attributes may not match exactly and will need to be processed accordingly.
</span><span class="cx"> """
</span><span class="cx"> data = dict([(attr[1:], getattr(self, attr, None)) for attr in itertools.chain(self._rowAttributes(), self._otherSerializedAttributes())])
</span><ins>+ if data["trashed"]:
+ data["trashed"] = data["trashed"].isoformat(" ")
</ins><span class="cx"> data["created"] = data["created"].isoformat(" ")
</span><span class="cx"> data["modified"] = data["modified"].isoformat(" ")
</span><span class="cx"> return data
</span></span></pre>
</div>
</div>
</body>
</html>