[CalendarServer-changes] [8783] CalendarServer/branches/users/glyph/case-insensitive-uid

[source_changes at macosforge.org]

Revision: 8783
          http://trac.macosforge.org/projects/calendarserver/changeset/8783
Author:   glyph at apple.com
Date:     2012-02-29 10:15:29 -0800 (Wed, 29 Feb 2012)
Log Message:
-----------
check constraint name

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py
    CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/test/test_parseschema.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/case-insensitive-uid/

Modified: CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py
===================================================================
--- CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py	2012-02-29 18:15:25 UTC (rev 8782)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py	2012-02-29 18:15:29 UTC (rev 8783)
@@ -91,6 +91,7 @@
         # XXX: possibly different constraint types should have different
         # classes?
         self.type = type
+        self.name = None
 
 
 

Modified: CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/test/test_parseschema.py
===================================================================
--- CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/test/test_parseschema.py	2012-02-29 18:15:25 UTC (rev 8782)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/test/test_parseschema.py	2012-02-29 18:15:29 UTC (rev 8783)
@@ -211,7 +211,7 @@
         A column with a CHECK constraint in SQL that uses an inequality will
         result in a L{Check} constraint being added to the L{Table} object.
         """
-        def checkOneConstraint(sqlText):
+        def checkOneConstraint(sqlText, checkName=None):
             s = self.schemaFromString(sqlText)
             table = s.tableNamed('sample')
             self.assertEquals(len(table.constraints), 1)
@@ -221,6 +221,7 @@
             self.assertEqual(expr.a.model, table.columnNamed('example'))
             self.assertEqual(expr.b.value, 5)
             self.assertEqual(expr.op, '>')
+            self.assertEqual(constraint.name, checkName)
         checkOneConstraint(
             "create table sample (example integer check(example >  5));"
         )
@@ -229,7 +230,7 @@
         )
         checkOneConstraint(
             "create table sample "
-            "(example integer, constraint gt_5 check(example>5))"
+            "(example integer, constraint gt_5 check(example>5))", "gt_5"
         )
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120229/325a08a4/attachment-0001.html>