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

[source_changes at macosforge.org]

Revision: 9611
          http://trac.macosforge.org/projects/calendarserver/changeset/9611
Author:   glyph at apple.com
Date:     2012-08-11 01:54:50 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
Test for Delete(Return=) in SQLite.

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

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

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py	2012-08-11 08:54:50 UTC (rev 9610)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py	2012-08-11 08:54:50 UTC (rev 9611)
@@ -1052,7 +1052,8 @@
             csql.execed[1],
             ["update FOO set BAR = :1 where BAZ = :2", [4321, 1234]]
         )
-        self.assertEqual(csql.execed[2],
+        self.assertEqual(
+            csql.execed[2],
             ["select BAR from FOO where rowid = :1", ["sample row id"]]
         )
 
@@ -1082,12 +1083,33 @@
             csql.execed[1],
             ["update FOO set BAR = :1 where BAZ = :2", [4321, 1234]]
         )
-        self.assertEqual(csql.execed[2],
+        self.assertEqual(
+            csql.execed[2],
             ["select BAR from FOO where rowid = :1 or rowid = :2 or rowid = :3",
              ["one row id", "and another", "and one more"]]
         )
 
 
+    def test_deleteReturningSQLite(self):
+        """
+        When SQLite deletes a value, ...
+        """
+        csql = CatchSQL()
+        stmt = Delete(From=self.schema.FOO, Where=self.schema.FOO.BAZ == 1234,
+                      Return=self.schema.FOO.BAR)
+        result = resultOf(stmt.on(csql))
+        self.assertResultList(result, 1)
+        self.assertEqual(len(csql.execed), 2)
+        self.assertEqual(
+            csql.execed[0],
+            ["select BAR from FOO where BAZ = :1", [1234]]
+        )
+        self.assertEqual(
+            csql.execed[1],
+            ["delete from FOO where BAZ = :1", [1234]]
+        )
+
+
     def test_insertMismatch(self):
         """
         L{Insert} raises L{TableMismatch} if the columns specified aren't all
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/ef8d1b2c/attachment-0001.html>