<!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>[14187] CalendarServer/branches/users/sagen/trashcan/txdav</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/14187">14187</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 13:16:24 -0800 (Thu, 20 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Store childType in the DB; childWithName() uses the childType to pick the right class</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcommondatastoresql_schemacurrentsql">CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcantxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py (14186 => 14187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py        2014-11-20 19:51:36 UTC (rev 14186)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py        2014-11-20 21:16:24 UTC (rev 14187)
</span><span class="lines">@@ -995,6 +995,7 @@
</span><span class="cx">             cls._homeChildMetaDataSchema.SUPPORTED_COMPONENTS,
</span><span class="cx">             cls._homeChildMetaDataSchema.CREATED,
</span><span class="cx">             cls._homeChildMetaDataSchema.MODIFIED,
</span><ins>+            cls._homeChildMetaDataSchema.CHILD_TYPE,
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -1012,6 +1013,7 @@
</span><span class="cx">             &quot;_supportedComponents&quot;,
</span><span class="cx">             &quot;_created&quot;,
</span><span class="cx">             &quot;_modified&quot;,
</span><ins>+            &quot;_childType&quot;,
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py (14186 => 14187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py        2014-11-20 19:51:36 UTC (rev 14186)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py        2014-11-20 21:16:24 UTC (rev 14187)
</span><span class="lines">@@ -3443,11 +3443,7 @@
</span><span class="cx">         @param name: a string.
</span><span class="cx">         @return: an L{ICalendar} or C{None} if no such child exists.
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        # FIXME: should determine the class from the collection_type column
-        if name == &quot;trash&quot;:
-            return self._trashClass.objectWithName(self, name)
-        else:
-            return self._childClass.objectWithName(self, name)
</del><ins>+        return self._childClass.objectWithName(self, name)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def anyObjectWithShareUID(self, shareUID):
</span><span class="lines">@@ -5569,6 +5565,11 @@
</span><span class="cx">         else:
</span><span class="cx">             ownerName = None
</span><span class="cx"> 
</span><ins>+        if metadataData:
+            collectionType = metadataData[3]
+            if collectionType == &quot;trash&quot;:  # FIXME: make this an enumeration
+                cls = home._trashClass
+
</ins><span class="cx">         c = cls._externalClass if ownerHome.external() else cls
</span><span class="cx">         child = c(
</span><span class="cx">             home=home,
</span><span class="lines">@@ -5829,7 +5830,6 @@
</span><span class="cx">         return Insert(
</span><span class="cx">             {
</span><span class="cx">                 child.RESOURCE_ID: schema.RESOURCE_ID_SEQ,
</span><del>-                child.COLLECTION_TYPE: Parameter(&quot;childType&quot;),
</del><span class="cx">             },
</span><span class="cx">             Return=(child.RESOURCE_ID)
</span><span class="cx">         )
</span><span class="lines">@@ -5844,6 +5844,7 @@
</span><span class="cx">         return Insert(
</span><span class="cx">             {
</span><span class="cx">                 child.RESOURCE_ID: Parameter(&quot;resourceID&quot;),
</span><ins>+                child.CHILD_TYPE: Parameter(&quot;childType&quot;),
</ins><span class="cx">             },
</span><span class="cx">             Return=(child.CREATED, child.MODIFIED)
</span><span class="cx">         )
</span><span class="lines">@@ -5860,10 +5861,14 @@
</span><span class="cx">             raise HomeChildNameNotAllowedError(name)
</span><span class="cx"> 
</span><span class="cx">         # Create this object
</span><del>-        resourceID = (yield cls._insertHomeChild.on(home._txn, childType=cls._childType))[0][0]
</del><ins>+        resourceID = (yield cls._insertHomeChild.on(home._txn))[0][0]
</ins><span class="cx"> 
</span><span class="cx">         # Initialize this object
</span><del>-        _created, _modified = (yield cls._insertHomeChildMetaData.on(home._txn, resourceID=resourceID))[0]
</del><ins>+        _created, _modified = (
+            yield cls._insertHomeChildMetaData.on(
+                home._txn, resourceID=resourceID, childType=cls._childType
+            )
+        )[0]
</ins><span class="cx">         # Bind table needs entry
</span><span class="cx">         yield cls._bindInsertQuery.on(
</span><span class="cx">             home._txn, homeID=home._resourceID, resourceID=resourceID, externalID=externalID,
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql (14186 => 14187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql        2014-11-20 19:51:36 UTC (rev 14186)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql        2014-11-20 21:16:24 UTC (rev 14187)
</span><span class="lines">@@ -92,8 +92,7 @@
</span><span class="cx"> --------------
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR (
</span><del>-  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
-  COLLECTION_TYPE       varchar(10) default null -- None, inbox, trash (FIXME: convert this to enumeration)
</del><ins>+  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -132,7 +131,9 @@
</span><span class="cx">   RESOURCE_ID           integer      primary key references CALENDAR on delete cascade, -- implicit index
</span><span class="cx">   SUPPORTED_COMPONENTS  varchar(255) default null,
</span><span class="cx">   CREATED               timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>-  MODIFIED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  MODIFIED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  CHILD_TYPE            varchar(10)  default null -- None, inbox, trash (FIXME: convert this to enumeration)
+
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>