[CalendarServer-changes] [6985] CalendarServer/branches/users/glyph/dalify/txdav/base/propertystore/ sql.py

[source_changes at macosforge.org]

Revision: 6985
          http://trac.macosforge.org/projects/calendarserver/changeset/6985
Author:   glyph at apple.com
Date:     2011-02-16 06:36:11 -0800 (Wed, 16 Feb 2011)
Log Message:
-----------
dalify insert property

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/dalify/txdav/base/propertystore/sql.py

Modified: CalendarServer/branches/users/glyph/dalify/txdav/base/propertystore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/dalify/txdav/base/propertystore/sql.py	2011-02-16 14:35:59 UTC (rev 6984)
+++ CalendarServer/branches/users/glyph/dalify/txdav/base/propertystore/sql.py	2011-02-16 14:36:11 UTC (rev 6985)
@@ -28,6 +28,7 @@
 from twext.enterprise.dal.syntax import Select
 from twext.enterprise.dal.syntax import Parameter
 from twext.enterprise.dal.syntax import Update
+from twext.enterprise.dal.syntax import Insert
 
 from txdav.common.datastore.sql_tables import schema
 
@@ -138,6 +139,13 @@
                               prop.NAME == Parameter("name")).And(
                               prop.VIEWER_UID == Parameter("uid")))
 
+
+    _insertQuery = Insert({prop.VALUE: Parameter("value"),
+                           prop.RESOURCE_ID: Parameter("resourceID"),
+                           prop.NAME: Parameter("name"),
+                           prop.VIEWER_UID: Parameter("uid")})
+
+
     def _setitem_uid(self, key, value, uid):
         validKey(key)
 
@@ -148,14 +156,8 @@
             self._updateQuery.on(self._txn, resourceID=self._resourceID,
                                  value=value_str, name=key_str, uid=uid)
         else:
-            self._txn.execSQL(
-                """
-                insert into RESOURCE_PROPERTY
-                (RESOURCE_ID, NAME, VALUE, VIEWER_UID)
-                values (%s, %s, %s, %s)
-                """,
-                [self._resourceID, key_str, value_str, uid]
-            )
+            self._insertQuery.on(self._txn, resourceID=self._resourceID,
+                                 value=value_str, name=key_str, uid=uid)
         self._cached[(key_str, uid)] = value_str
         self._cacher.delete(str(self._resourceID))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110216/cb49e010/attachment.html>