[Sqlalchemy-commits] [1128] sqlalchemy/trunk/test/defaults.py: tweak to mysql default test

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

<!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><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[1128] sqlalchemy/trunk/test/defaults.py: tweak to mysql default test</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1128</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-03-12 19:06:33 -0600 (Sun, 12 Mar 2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>tweak to mysql default test</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemytrunktestdefaultspy">sqlalchemy/trunk/test/defaults.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sqlalchemytrunktestdefaultspy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/test/defaults.py (1127 => 1128)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/test/defaults.py	2006-03-13 00:24:54 UTC (rev 1127)
+++ sqlalchemy/trunk/test/defaults.py	2006-03-13 01:06:33 UTC (rev 1128)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> class DefaultTest(PersistTest):
</span><span class="cx"> 
</span><span class="cx">     def setUpAll(self):
</span><del>-        global t, f, ts, currenttime
</del><ins>+        global t, f, f2, ts, currenttime
</ins><span class="cx">         x = {'x':50}
</span><span class="cx">         def mydefault():
</span><span class="cx">             x['x'] += 1
</span><span class="lines">@@ -26,17 +26,20 @@
</span><span class="cx">         if is_oracle:
</span><span class="cx">             ts = db.func.sysdate().scalar()
</span><span class="cx">             f = select([func.count(1) + 5], engine=db).scalar()
</span><ins>+            f2 = select([func.count(1) + 14], engine=db).scalar()
</ins><span class="cx">             def1 = currenttime
</span><span class="cx">             def2 = text(&quot;sysdate&quot;)
</span><span class="cx">             deftype = Date
</span><span class="cx">         elif use_function_defaults:
</span><span class="cx">             f = select([func.count(1) + 5], engine=db).scalar()
</span><ins>+            f2 = select([func.count(1) + 14], engine=db).scalar()
</ins><span class="cx">             def1 = currenttime
</span><span class="cx">             def2 = text(&quot;current_date&quot;)
</span><span class="cx">             deftype = Date
</span><span class="cx">             ts = db.func.current_date().scalar()
</span><span class="cx">         else:
</span><span class="cx">             f = select([func.count(1) + 5], engine=db).scalar()
</span><ins>+            f2 = select([func.count(1) + 14], engine=db).scalar()
</ins><span class="cx">             def1 = def2 = &quot;3&quot;
</span><span class="cx">             ts = 3
</span><span class="cx">             deftype = Integer
</span><span class="lines">@@ -74,7 +77,9 @@
</span><span class="cx">         z = t.c.col3.default.execute()
</span><span class="cx">         self.assert_(50 &lt;= x &lt;= 57)
</span><span class="cx">         self.assert_(y == 'imthedefault')
</span><del>-        self.assert_(z == 6)
</del><ins>+        self.assert_(z == f)
+        # mysql/other db's return 0 or 1 for count(1)
+        self.assert_(5 &lt;= z &lt;= 6)
</ins><span class="cx">         
</span><span class="cx">     def testinsert(self):
</span><span class="cx">         t.insert().execute()
</span><span class="lines">@@ -95,7 +100,9 @@
</span><span class="cx">         self.echo(&quot;Currenttime &quot;+ repr(ctexec))
</span><span class="cx">         l = t.select(t.c.col1==pk).execute()
</span><span class="cx">         l = l.fetchone()
</span><del>-        self.assert_(l == (pk, 'im the update', 15, None, None, ctexec))
</del><ins>+        self.assert_(l == (pk, 'im the update', f2, None, None, ctexec))
+        # mysql/other db's return 0 or 1 for count(1)
+        self.assert_(14 &lt;= f2 &lt;= 15)
</ins><span class="cx">         
</span><span class="cx"> class SequenceTest(PersistTest):
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>