<!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>[14597] twext/trunk/twext/enterprise</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/14597">14597</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-03-15 20:01:36 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes to support Oracle DB unit testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterpriseadbapi2py">twext/trunk/twext/enterprise/adbapi2.py</a></li>
<li><a href="#twexttrunktwextenterprisedalmodelpy">twext/trunk/twext/enterprise/dal/model.py</a></li>
<li><a href="#twexttrunktwextenterprisedalsyntaxpy">twext/trunk/twext/enterprise/dal/syntax.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterpriseadbapi2py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/adbapi2.py (14596 => 14597)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/adbapi2.py 2015-03-16 00:30:29 UTC (rev 14596)
+++ twext/trunk/twext/enterprise/adbapi2.py 2015-03-16 03:01:36 UTC (rev 14597)
</span><span class="lines">@@ -302,7 +302,13 @@
</span><span class="cx"> else:
</span><span class="cx"> if raiseOnZeroRowCount is not None and self._cursor.rowcount == 0:
</span><span class="cx"> raise raiseOnZeroRowCount()
</span><del>- return None
</del><ins>+ # Oracle with a return into clause returns an empty set or rows, but
+ # we then have to insert the special bind variables for the return into.
+ # Thus we need to know whether there was any rowcount from the actual query.
+ # What we do is always insert a set of empty rows as the result if the
+ # rowcount is non-zero. Then we can detect whether the bind variables
+ # need to be added into the result set.
+ return [[]] * self._cursor.rowcount if self._cursor.rowcount else None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def execSQL(self, *args, **kw):
</span></span></pre></div>
<a id="twexttrunktwextenterprisedalmodelpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/dal/model.py (14596 => 14597)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/dal/model.py 2015-03-16 00:30:29 UTC (rev 14596)
+++ twext/trunk/twext/enterprise/dal/model.py 2015-03-16 03:01:36 UTC (rev 14597)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> def __init__(self, name, length):
</span><span class="cx"> _checkstr(name)
</span><span class="cx"> self.name = name
</span><del>- self.length = length
</del><ins>+ self.length = length if length else 0
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __eq__(self, other):
</span></span></pre></div>
<a id="twexttrunktwextenterprisedalsyntaxpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/dal/syntax.py (14596 => 14597)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/dal/syntax.py 2015-03-16 00:30:29 UTC (rev 14596)
+++ twext/trunk/twext/enterprise/dal/syntax.py 2015-03-16 03:01:36 UTC (rev 14597)
</span><span class="lines">@@ -1655,9 +1655,13 @@
</span><span class="cx"> queryGenerator.dialect == ORACLE_DIALECT and
</span><span class="cx"> self.Return is not None
</span><span class="cx"> ):
</span><del>- def processIt(shouldBeNone):
- result = [[v.value for _ignore_k, v in outvars]]
- return result
</del><ins>+ def processIt(emptyListResult):
+ # See comment in L{adbapi2._ConnectedTxn._reallyExecSQL}. If the
+ # result is L{None} then also return L{None}. If the result is a
+ # L{list} of empty L{list} then there are return into rows to return.
+ if emptyListResult:
+ emptyListResult = [[v.value for _ignore_k, v in outvars]]
+ return emptyListResult
</ins><span class="cx"> return result.addCallback(processIt)
</span><span class="cx"> else:
</span><span class="cx"> return result
</span></span></pre>
</div>
</div>
</body>
</html>