<!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>[14784] twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py</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/14784">14784</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 08:44:22 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Random hash seed test fix.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisedaltesttest_sqlsyntaxpy">twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisedaltesttest_sqlsyntaxpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py (14783 => 14784)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py 2015-05-13 18:18:41 UTC (rev 14783)
+++ twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py 2015-05-14 15:44:22 UTC (rev 14784)
</span><span class="lines">@@ -921,30 +921,34 @@
</span><span class="cx">
</span><span class="cx"> # Two items with IN only
</span><span class="cx"> items = set(("A", "B"))
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=self.schema.FOO.BAR.In(
+ Parameter("names", len(items))
+ )
+ ).toSQL().bind(names=items)
+ test.parameters.sort()
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=self.schema.FOO.BAR.In(
- Parameter("names", len(items))
- )
- ).toSQL().bind(names=items),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAR in (?, ?)", ["A", "B"]
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with preceding AND
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAZ == Parameter("P1")
+ ).And(
+ self.schema.FOO.BAR.In(Parameter("names", len(items)))
+ )
+ )
+ ).toSQL().bind(P1="P1", names=items)
+ test.parameters = [test.parameters[0], ] + sorted(test.parameters[1:])
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=(
- (
- self.schema.FOO.BAZ == Parameter("P1")
- ).And(
- self.schema.FOO.BAR.In(Parameter("names", len(items)))
- )
- )
- ).toSQL().bind(P1="P1", names=items),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAZ = ? and BAR in (?, ?)",
</span><span class="cx"> ["P1", "A", "B"]
</span><span class="lines">@@ -952,17 +956,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with following AND
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAR.In(Parameter("names", len(items)))
+ ).And(
+ self.schema.FOO.BAZ == Parameter("P2")
+ )
+ )
+ ).toSQL().bind(P2="P2", names=items)
+ test.parameters = sorted(test.parameters[:-1]) + [test.parameters[-1], ]
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=(
- (
- self.schema.FOO.BAR.In(Parameter("names", len(items)))
- ).And(
- self.schema.FOO.BAZ == Parameter("P2")
- )
- )
- ).toSQL().bind(P2="P2", names=items),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAR in (?, ?) and BAZ = ?",
</span><span class="cx"> ["A", "B", "P2"]
</span><span class="lines">@@ -970,17 +976,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with preceding OR and following AND
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=((
+ self.schema.FOO.BAZ == Parameter("P1")
+ ).Or(
+ self.schema.FOO.BAR.In(Parameter("names", len(items))).And(
+ self.schema.FOO.BAZ == Parameter("P2")
+ )
+ ))
+ ).toSQL().bind(P1="P1", P2="P2", names=items)
+ test.parameters = [test.parameters[0], ] + sorted(test.parameters[1:-1]) + [test.parameters[-1], ]
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=((
- self.schema.FOO.BAZ == Parameter("P1")
- ).Or(
- self.schema.FOO.BAR.In(Parameter("names", len(items))).And(
- self.schema.FOO.BAZ == Parameter("P2")
- )
- ))
- ).toSQL().bind(P1="P1", P2="P2", names=items),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAZ = ? or BAR in (?, ?) and BAZ = ?",
</span><span class="cx"> ["P1", "A", "B", "P2"]
</span><span class="lines">@@ -1023,30 +1031,34 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with IN only
</span><del>- items = set(("A", "B"))
</del><ins>+ items = ("A", "B")
</ins><span class="cx"> for items in (set(items), list(items), tuple(items),):
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=self.schema.FOO.BAR.In(items),
+ ).toSQL().bind(names=items)
+ test.parameters.sort()
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=self.schema.FOO.BAR.In(items),
- ).toSQL().bind(names=items),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAR in (?, ?)", ["A", "B"]
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with preceding AND
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAZ == Parameter("P1")
+ ).And(
+ self.schema.FOO.BAR.In(items)
+ )
+ )
+ ).toSQL().bind(P1="P1")
+ test.parameters = [test.parameters[0], ] + sorted(test.parameters[1:])
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=(
- (
- self.schema.FOO.BAZ == Parameter("P1")
- ).And(
- self.schema.FOO.BAR.In(items)
- )
- )
- ).toSQL().bind(P1="P1"),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAZ = ? and BAR in (?, ?)",
</span><span class="cx"> ["P1", "A", "B"]
</span><span class="lines">@@ -1054,17 +1066,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with following AND
</span><ins>+ test = Select(
+ From=self.schema.FOO,
+ Where=(
+ (
+ self.schema.FOO.BAR.In(items)
+ ).And(
+ self.schema.FOO.BAZ == Parameter("P2")
+ )
+ )
+ ).toSQL().bind(P2="P2")
+ test.parameters = sorted(test.parameters[:-1]) + [test.parameters[-1], ]
</ins><span class="cx"> self.assertEquals(
</span><del>- Select(
- From=self.schema.FOO,
- Where=(
- (
- self.schema.FOO.BAR.In(items)
- ).And(
- self.schema.FOO.BAZ == Parameter("P2")
- )
- )
- ).toSQL().bind(P2="P2"),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAR in (?, ?) and BAZ = ?",
</span><span class="cx"> ["A", "B", "P2"]
</span><span class="lines">@@ -1072,17 +1086,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Two items with preceding OR and following AND
</span><ins>+ test = 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")
+ test.parameters = [test.parameters[0], ] + sorted(test.parameters[1:-1]) + [test.parameters[-1], ]
</ins><span class="cx"> self.assertEquals(
</span><del>- 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"),
</del><ins>+ test,
</ins><span class="cx"> SQLFragment(
</span><span class="cx"> "select * from FOO where BAZ = ? or BAR in (?, ?) and BAZ = ?",
</span><span class="cx"> ["P1", "A", "B", "P2"]
</span></span></pre>
</div>
</div>
</body>
</html>