[CalendarServer-changes] [9610] CalendarServer/branches/users/glyph/q

[source_changes at macosforge.org]

Revision: 9610
          http://trac.macosforge.org/projects/calendarserver/changeset/9610
Author:   glyph at apple.com
Date:     2012-08-11 01:54:50 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
make the test pass

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/q/

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py	2012-08-11 08:54:49 UTC (rev 9609)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py	2012-08-11 08:54:50 UTC (rev 9610)
@@ -1507,11 +1507,12 @@
             preresult = prequery.on(txn, *a, **kw)
             before = yield preresult
             yield upcall()
-            result = yield (Select(self._returnAsList(),
+            result = (yield Select(self._returnAsList(),
                             # TODO: error reporting when 'return' includes
                             # columns foreign to the primary table.
                             From=TableSyntax(table),
-                            Where=rowidcol == before[0][0]
+                            Where=reduce(lambda left, right: left.Or(right),
+                                         ((rowidcol == x) for [x] in before))
                             ).on(txn, *a, **kw))
             returnValue(result)
         else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/560ff55d/attachment.html>