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

[source_changes at macosforge.org]

Revision: 9644
          http://trac.macosforge.org/projects/calendarserver/changeset/9644
Author:   glyph at apple.com
Date:     2012-08-11 01:55:17 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
a transaction argument is also required.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/record.py
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_record.py

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

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/record.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/record.py	2012-08-11 08:55:16 UTC (rev 9643)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/record.py	2012-08-11 08:55:17 UTC (rev 9644)
@@ -159,7 +159,7 @@
 
     @classmethod
     @inlineCallbacks
-    def query(cls, expr, order=None):
+    def query(cls, txn, expr, order=None):
         yield None
         returnValue([])
 

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_record.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_record.py	2012-08-11 08:55:16 UTC (rev 9643)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_record.py	2012-08-11 08:55:17 UTC (rev 9644)
@@ -168,7 +168,8 @@
                             (356, u"three"), (456, u"four")]:
             yield txn.execSQL("insert into ALPHA values (:1, :2)",
                               [beta, gamma])
-        records = yield TestRecord.query(TestRecord.gamma == u"three",
+        records = yield TestRecord.query(txn,
+                                         TestRecord.gamma == u"three",
                                          TestRecord.beta)
         self.assertEqual(len(records), 2)
         self.assertEqual(records[0].beta, 345)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/9a9f94e3/attachment-0001.html>