<!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>[14448] twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal</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/14448">14448</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 13:40:25 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Record tweaks to support return cols on Delete and Distinct with Select. Allow some list/tuple/set types to be used directly in an In() or NotIn() query expression.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twextbranchesuserscdaboopod2podmigrationtwextenterprisedalrecordpy">twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py</a></li>
<li><a href="#twextbranchesuserscdaboopod2podmigrationtwextenterprisedalsyntaxpy">twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/syntax.py</a></li>
<li><a href="#twextbranchesuserscdaboopod2podmigrationtwextenterprisedaltesttest_sqlsyntaxpy">twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_sqlsyntax.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twextbranchesuserscdaboopod2podmigrationtwextenterprisedalrecordpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py (14447 => 14448)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py 2015-02-19 20:18:20 UTC (rev 14447)
+++ twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py 2015-02-19 21:40:25 UTC (rev 14448)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def query(cls, transaction, expr, order=None, ascending=True, group=None, forUpdate=False, noWait=False, limit=None):
</del><ins>+ def query(cls, transaction, expr, order=None, group=None, limit=None, forUpdate=False, noWait=False, ascending=True, distinct=False):
</ins><span class="cx"> """
</span><span class="cx"> Query the table that corresponds to C{cls}, and return instances of
</span><span class="cx"> C{cls} corresponding to the rows that are returned from that table.
</span><span class="lines">@@ -501,18 +501,19 @@
</span><span class="cx"> cls.queryExpr(
</span><span class="cx"> expr,
</span><span class="cx"> order=order,
</span><del>- ascending=ascending,
</del><span class="cx"> group=group,
</span><ins>+ limit=limit,
</ins><span class="cx"> forUpdate=forUpdate,
</span><span class="cx"> noWait=noWait,
</span><del>- limit=limit,
</del><ins>+ ascending=ascending,
+ distinct=distinct,
</ins><span class="cx"> ),
</span><span class="cx"> None
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def queryExpr(cls, expr, attributes=None, order=None, ascending=True, group=None, forUpdate=False, noWait=False, limit=None):
</del><ins>+ def queryExpr(cls, expr, attributes=None, order=None, group=None, limit=None, forUpdate=False, noWait=False, ascending=True, distinct=False):
</ins><span class="cx"> """
</span><span class="cx"> Query expression that corresponds to C{cls}. Used in cases where a sub-select
</span><span class="cx"> on this record's table is needed.
</span><span class="lines">@@ -541,12 +542,14 @@
</span><span class="cx"> kw.update(OrderBy=order, Ascending=ascending)
</span><span class="cx"> if group is not None:
</span><span class="cx"> kw.update(GroupBy=group)
</span><ins>+ if limit is not None:
+ kw.update(Limit=limit)
</ins><span class="cx"> if forUpdate:
</span><span class="cx"> kw.update(ForUpdate=True)
</span><span class="cx"> if noWait:
</span><span class="cx"> kw.update(NoWait=True)
</span><del>- if limit is not None:
- kw.update(Limit=limit)
</del><ins>+ if distinct:
+ kw.update(Distinct=True)
</ins><span class="cx"> if attributes is None:
</span><span class="cx"> attributes = list(cls.table)
</span><span class="cx"> return Select(
</span><span class="lines">@@ -599,13 +602,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def deletesome(cls, transaction, where):
</del><ins>+ def deletesome(cls, transaction, where, returnCols=None):
</ins><span class="cx"> """
</span><span class="cx"> Delete all rows matching the where expression from the table that corresponds to C{cls}.
</span><span class="cx"> """
</span><span class="cx"> return Delete(
</span><span class="cx"> From=cls.table,
</span><span class="cx"> Where=where,
</span><ins>+ Return=returnCols,
</ins><span class="cx"> ).on(transaction)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twextbranchesuserscdaboopod2podmigrationtwextenterprisedalsyntaxpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/syntax.py (14447 => 14448)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/syntax.py 2015-02-19 20:18:20 UTC (rev 14447)
+++ twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/syntax.py 2015-02-19 21:40:25 UTC (rev 14448)
</span><span class="lines">@@ -439,6 +439,8 @@
</span><span class="cx"> "{} expression needs an explicit count of parameters".format(op.upper())
</span><span class="cx"> )
</span><span class="cx"> return CompoundComparison(self, op, Constant(other))
</span><ins>+ elif isinstance(other, set) or isinstance(other, frozenset) or isinstance(other, list) or isinstance(other, tuple):
+ return CompoundComparison(self, op, Constant(other))
</ins><span class="cx"> else:
</span><span class="cx"> # Can't be Select.__contains__ because __contains__ gets
</span><span class="cx"> # __nonzero__ called on its result by the "in" syntax.
</span><span class="lines">@@ -548,6 +550,13 @@
</span><span class="cx"> for counter in range(self.value.count)
</span><span class="cx"> ]).subSQL(queryGenerator, allTables)
</span><span class="cx"> )
</span><ins>+ elif isinstance(self.value, set) or isinstance(self.value, frozenset) or isinstance(self.value, list) or isinstance(self.value, tuple):
+ return _inParens(
+ _CommaList([
+ SQLFragment(queryGenerator.placeholder.placeholder(), [value])
+ for value in self.value
+ ]).subSQL(queryGenerator, allTables)
+ )
</ins><span class="cx"> else:
</span><span class="cx"> return SQLFragment(
</span><span class="cx"> queryGenerator.placeholder.placeholder(), [self.value]
</span></span></pre></div>
<a id="twextbranchesuserscdaboopod2podmigrationtwextenterprisedaltesttest_sqlsyntaxpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_sqlsyntax.py (14447 => 14448)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_sqlsyntax.py 2015-02-19 20:18:20 UTC (rev 14447)
+++ twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_sqlsyntax.py 2015-02-19 21:40:25 UTC (rev 14448)
</span><span class="lines">@@ -1006,6 +1006,90 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_inIterable(self):
+ """
+ L{ColumnSyntax.In} returns a sub-expression using the SQL C{in} syntax
+ with parameter list.
+ """
+ # One item with IN only
+ items = set(("A",))
+ for items in (set(items), list(items), tuple(items),):
+ self.assertEquals(
+ Select(
+ From=self.schema.FOO,
+ Where=self.schema.FOO.BAR.In(items),
+ ).toSQL().bind(),
+ SQLFragment("select * from FOO where BAR in (?)", ["A"])
+ )
+
+ # Two items with IN only
+ items = set(("A", "B"))
+ for items in (set(items), list(items), tuple(items),):
+ self.assertEquals(
+ Select(
+ From=self.schema.FOO,
+ Where=self.schema.FOO.BAR.In(items),
+ ).toSQL().bind(names=items),
+ SQLFragment(
+ "select * from FOO where BAR in (?, ?)", ["A", "B"]
+ )
+ )
+
+ # Two items with preceding AND
+ self.assertEquals(
+ Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAZ == Parameter("P1")
+ ).And(
+ self.schema.FOO.BAR.In(items)
+ )
+ )
+ ).toSQL().bind(P1="P1"),
+ SQLFragment(
+ "select * from FOO where BAZ = ? and BAR in (?, ?)",
+ ["P1", "A", "B"]
+ ),
+ )
+
+ # Two items with following AND
+ self.assertEquals(
+ Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAR.In(items)
+ ).And(
+ self.schema.FOO.BAZ == Parameter("P2")
+ )
+ )
+ ).toSQL().bind(P2="P2"),
+ SQLFragment(
+ "select * from FOO where BAR in (?, ?) and BAZ = ?",
+ ["A", "B", "P2"]
+ ),
+ )
+
+ # Two items with preceding OR and following AND
+ self.assertEquals(
+ Select(
+ From=self.schema.FOO,
+ Where=((
+ self.schema.FOO.BAZ == Parameter("P1")
+ ).Or(
+ self.schema.FOO.BAR.In(items).And(
+ self.schema.FOO.BAZ == Parameter("P2")
+ )
+ ))
+ ).toSQL().bind(P1="P1", P2="P2"),
+ SQLFragment(
+ "select * from FOO where BAZ = ? or BAR in (?, ?) and BAZ = ?",
+ ["P1", "A", "B", "P2"]
+ ),
+ )
+
+
</ins><span class="cx"> def test_max(self):
</span><span class="cx"> """
</span><span class="cx"> L{Max}C{(column)} produces an object in the C{columns} clause that
</span></span></pre>
</div>
</div>
</body>
</html>