matthew
2010-09-14 19:50:36 UTC
<!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>[framework-svn][22942] laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php: Functional fixes</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, #logmsg > ol { margin-left: 0; 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>22942</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-14 12:50:34 -0700 (Tue, 14 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Functional fixes
- SimpleDB replaceDocument() now acts as a facade to deleteDocument() and
insertDocument() (since it has no equivalent currently)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php (22941 => 22942)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-14 19:35:11 UTC (rev 22941)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-14 19:50:34 UTC (rev 22942)
</span><span class="lines">@@ -211,20 +211,15 @@
</span><span class="cx"> throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- try {
- $replace = array();
- foreach ($document->getFields() as $key => $value) {
- $replace[$key] = true;
- }
- $this->_simpleDb->putAttributes(
- $collectionName,
- $document->getID(),
- $this->_makeAttributes($document->getID(), $document->getFields()),
- $replace
- );
- } catch(Zend_Service_Amazon_Exception $e) {
- throw new Zend_Cloud_DocumentService_Exception('Error on document insertion: '.$e->getMessage(), $e->getCode(), $e);
- }
</del><ins>+ // Delete document first, then insert. PutAttributes always keeps any
+ // fields not referenced in the payload, but present in the document
+ $documentId = $document->getId();
+ $fields = $document->getFields();
+ $docClass = get_class($document);
+ $this->deleteDocument($collectionName, $document, $options);
+
+ $document = new $docClass($documentId, $fields);
+ $this->insertDocument($collectionName, $document); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> /** </span><span class="lines">@@ -291,7 +286,7 @@ </span><span class="cx"> public function deleteDocument($collectionName, $document, $options = null) </span><span class="cx"> { </span><span class="cx"> if ($document instanceof Zend_Cloud_DocumentService_Document) { </span><del>- $document = $document->getFields(); </del><ins>+ $document = $document->getId(); </ins><span class="cx"> } </span><span class="cx"> try { </span><span class="cx"> $this->_simpleDb->deleteAttributes($collectionName, $document);
</span></span></pre>
</div>
</div>
</body>
</html>
"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>[framework-svn][22942] laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php: Functional fixes</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, #logmsg > ol { margin-left: 0; 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>22942</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-14 12:50:34 -0700 (Tue, 14 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Functional fixes
- SimpleDB replaceDocument() now acts as a facade to deleteDocument() and
insertDocument() (since it has no equivalent currently)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php (22941 => 22942)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-14 19:35:11 UTC (rev 22941)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-14 19:50:34 UTC (rev 22942)
</span><span class="lines">@@ -211,20 +211,15 @@
</span><span class="cx"> throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- try {
- $replace = array();
- foreach ($document->getFields() as $key => $value) {
- $replace[$key] = true;
- }
- $this->_simpleDb->putAttributes(
- $collectionName,
- $document->getID(),
- $this->_makeAttributes($document->getID(), $document->getFields()),
- $replace
- );
- } catch(Zend_Service_Amazon_Exception $e) {
- throw new Zend_Cloud_DocumentService_Exception('Error on document insertion: '.$e->getMessage(), $e->getCode(), $e);
- }
</del><ins>+ // Delete document first, then insert. PutAttributes always keeps any
+ // fields not referenced in the payload, but present in the document
+ $documentId = $document->getId();
+ $fields = $document->getFields();
+ $docClass = get_class($document);
+ $this->deleteDocument($collectionName, $document, $options);
+
+ $document = new $docClass($documentId, $fields);
+ $this->insertDocument($collectionName, $document); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> /** </span><span class="lines">@@ -291,7 +286,7 @@ </span><span class="cx"> public function deleteDocument($collectionName, $document, $options = null) </span><span class="cx"> { </span><span class="cx"> if ($document instanceof Zend_Cloud_DocumentService_Document) { </span><del>- $document = $document->getFields(); </del><ins>+ $document = $document->getId(); </ins><span class="cx"> } </span><span class="cx"> try { </span><span class="cx"> $this->_simpleDb->deleteAttributes($collectionName, $document);
</span></span></pre>
</div>
</div>
</body>
</html>