[CalendarServer-changes] [7142] CalendarServer/branches/users/glyph/oracle/twext/enterprise/dal/ syntax.py

[source_changes at macosforge.org]

Revision: 7142
          http://trac.macosforge.org/projects/calendarserver/changeset/7142
Author:   glyph at apple.com
Date:     2011-03-07 19:05:30 -0800 (Mon, 07 Mar 2011)
Log Message:
-----------
oops; continue returning real results in postgres, where this hack isn't necessary

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

Modified: CalendarServer/branches/users/glyph/oracle/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/branches/users/glyph/oracle/twext/enterprise/dal/syntax.py	2011-03-08 03:05:16 UTC (rev 7141)
+++ CalendarServer/branches/users/glyph/oracle/twext/enterprise/dal/syntax.py	2011-03-08 03:05:30 UTC (rev 7142)
@@ -121,7 +121,7 @@
         return {}
 
 
-    def _extraResult(self, result, outvars):
+    def _extraResult(self, result, outvars, metadata):
         return result
 
 
@@ -136,7 +136,7 @@
         fragment = self.toSQL(metadata).bind(**kw)
         result = txn.execSQL(fragment.text, fragment.parameters,
                              raiseOnZeroRowCount)
-        return self._extraResult(result, outvars)
+        return self._extraResult(result, outvars, metadata)
 
 
 
@@ -810,10 +810,13 @@
         return result
 
 
-    def _extraResult(self, result, outvars):
-        def processIt(shouldBeNone):
-            return [[v.value for k, v in outvars]]
-        return result.addCallback(processIt)
+    def _extraResult(self, result, outvars, metadata):
+        if metadata.dialect == ORACLE_DIALECT and self.Return is not None:
+            def processIt(shouldBeNone):
+                return [[v.value for k, v in outvars]]
+            return result.addCallback(processIt)
+        else:
+            return result
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110307/cdf04119/attachment.html>