<!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>[14418] 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/14418">14418</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-16 16:04:44 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>New simple query option, other bits.</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="#twextbranchesuserscdaboopod2podmigrationtwextenterprisedaltesttest_recordpy">twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_record.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 (14417 => 14418)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py 2015-02-16 20:56:21 UTC (rev 14417)
+++ twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/record.py 2015-02-17 00:04:44 UTC (rev 14418)
</span><span class="lines">@@ -171,6 +171,14 @@
</span><span class="cx"> return r
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def __eq__(self, other):
+ if type(self) != type(other):
+ return False
+ attrs = dict([(attr, getattr(self, attr),) for attr in self.__attrmap__.keys()])
+ otherattrs = dict([(attr, getattr(other, attr),) for attr in other.__attrmap__.keys()])
+ return attrs == otherattrs
+
+
</ins><span class="cx"> @classmethod
</span><span class="cx"> def fromTable(cls, table):
</span><span class="cx"> """
</span><span class="lines">@@ -282,6 +290,14 @@
</span><span class="cx"> return self
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def duplicate(self):
+ return self.make(**dict([(attr, getattr(self, attr),) for attr in self.__attrmap__.keys()]))
+
+
+ def isnew(self):
+ return self.transaction is None
+
+
</ins><span class="cx"> def _attributesFromRow(self, attributeList):
</span><span class="cx"> """
</span><span class="cx"> Take some data loaded from a row and apply it to this instance,
</span><span class="lines">@@ -538,6 +554,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><ins>+ def querysimple(cls, transaction, **kw):
+ """
+ Match all rows matching the specified attribute/values from the table that corresponds to C{cls}.
+ All attributes are logically AND'ed.
+ """
+ where = None
+ for k, v in kw.iteritems():
+ subexpr = (cls.__attrmap__[k] == v)
+ if where is None:
+ where = subexpr
+ else:
+ where = where.And(subexpr)
+ return cls.query(transaction, where)
+
+
+ @classmethod
</ins><span class="cx"> def all(cls, transaction):
</span><span class="cx"> """
</span><span class="cx"> Load all rows from the table that corresponds to C{cls} and return
</span><span class="lines">@@ -574,9 +606,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def deletematch(cls, transaction, **kw):
</del><ins>+ def deletesimple(cls, transaction, **kw):
</ins><span class="cx"> """
</span><span class="cx"> Delete all rows matching the specified attribute/values from the table that corresponds to C{cls}.
</span><ins>+ All attributes are logically AND'ed.
</ins><span class="cx"> """
</span><span class="cx"> where = None
</span><span class="cx"> for k, v in kw.iteritems():
</span></span></pre></div>
<a id="twextbranchesuserscdaboopod2podmigrationtwextenterprisedaltesttest_recordpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_record.py (14417 => 14418)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_record.py 2015-02-16 20:56:21 UTC (rev 14417)
+++ twext/branches/users/cdaboo/pod2pod-migration/twext/enterprise/dal/test/test_record.py 2015-02-17 00:04:44 UTC (rev 14418)
</span><span class="lines">@@ -307,6 +307,44 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_querySimple(self):
+ """
+ L{Record.querysimple} will allow you to query for a record by its class
+ attributes as columns.
+ """
+ txn = self.pool.connection()
+ for beta, gamma in [(123, u"one"), (234, u"two"), (345, u"three"),
+ (356, u"three"), (456, u"four")]:
+ yield txn.execSQL("insert into ALPHA values (:1, :2)",
+ [beta, gamma])
+ records = yield TestRecord.querysimple(txn, gamma=u"three")
+ self.assertEqual(len(records), 2)
+ records.sort(key=lambda x: x.beta)
+ self.assertEqual(records[0].beta, 345)
+ self.assertEqual(records[1].beta, 356)
+
+
+ @inlineCallbacks
+ def test_eq(self):
+ """
+ L{Record.__eq__} works.
+ """
+ txn = self.pool.connection()
+ data = [(123, u"one"), (456, u"four"), (345, u"three"),
+ (234, u"two"), (356, u"three")]
+ for beta, gamma in data:
+ yield txn.execSQL("insert into ALPHA values (:1, :2)",
+ [beta, gamma])
+
+ one = yield TestRecord.load(txn, 123)
+ one_copy = yield TestRecord.load(txn, 123)
+ two = yield TestRecord.load(txn, 234)
+
+ self.assertTrue(one == one_copy)
+ self.assertFalse(one == two)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_all(self):
</span><span class="cx"> """
</span><span class="cx"> L{Record.all} will return all instances of the record, sorted by
</span><span class="lines">@@ -363,9 +401,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_deletematch(self):
</del><ins>+ def test_deletesimple(self):
</ins><span class="cx"> """
</span><del>- L{Record.deletematch} will delete all instances of the matching records.
</del><ins>+ L{Record.deletesimple} will delete all instances of the matching records.
</ins><span class="cx"> """
</span><span class="cx"> txn = self.pool.connection()
</span><span class="cx"> data = [(123, u"one"), (456, u"four"), (345, u"three"),
</span><span class="lines">@@ -374,11 +412,11 @@
</span><span class="cx"> yield txn.execSQL("insert into ALPHA values (:1, :2)",
</span><span class="cx"> [beta, gamma])
</span><span class="cx">
</span><del>- yield TestRecord.deletematch(txn, gamma=u"three")
</del><ins>+ yield TestRecord.deletesimple(txn, gamma=u"three")
</ins><span class="cx"> all = yield TestRecord.all(txn)
</span><span class="cx"> self.assertEqual(set([record.beta for record in all]), set((123, 456, 234,)))
</span><span class="cx">
</span><del>- yield TestRecord.deletematch(txn, beta=123, gamma=u"one")
</del><ins>+ yield TestRecord.deletesimple(txn, beta=123, gamma=u"one")
</ins><span class="cx"> all = yield TestRecord.all(txn)
</span><span class="cx"> self.assertEqual(set([record.beta for record in all]), set((456, 234)))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>