[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [8784] CalendarServer/branches/users/glyph/case-insensitive-uid
From: source_changes () macosforge ! org
Date: 2012-02-29 18:15:34
Message-ID: 20120229181535.0261A57C83F2 () lists ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 8784
http://trac.macosforge.org/projects/calendarserver/changeset/8784
Author: glyph@apple.com
Date: 2012-02-29 10:15:34 -0800 (Wed, 29 Feb 2012)
Log Message:
-----------
actually take the check constraint name into account when parsing
Modified Paths:
--------------
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/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:29 UTC (rev 8783)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py 2012-02-29 \
18:15:34 UTC (rev 8784) @@ -86,12 +86,12 @@
NOT_NULL = 'NOT NULL'
UNIQUE = 'UNIQUE'
- def __init__(self, type, affectsColumns):
+ def __init__(self, type, affectsColumns, name=None):
self.affectsColumns = affectsColumns
# XXX: possibly different constraint types should have different
# classes?
self.type = type
- self.name = None
+ self.name = name
@@ -104,10 +104,10 @@
"""
# XXX TODO: model for expression, rather than
- def __init__(self, syntaxExpression):
+ def __init__(self, syntaxExpression, name=None):
self.expression = syntaxExpression
super(Check, self).__init__(
- 'CHECK', [c.model for c in self.expression.allColumns()]
+ 'CHECK', [c.model for c in self.expression.allColumns()], name
)
@@ -308,14 +308,14 @@
self.constraints.append(Constraint(constraintType, affectsColumns))
- def checkConstraint(self, protoExpression):
+ def checkConstraint(self, protoExpression, name=None):
"""
This table is affected by a 'check' constraint. (Should only be called
during schema parsing.)
@param protoExpression: proto expression.
"""
- self.constraints.append(Check(protoExpression))
+ self.constraints.append(Check(protoExpression, name))
def insertSchemaRow(self, values):
Modified: CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py
===================================================================
--- CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py 2012-02-29 \
18:15:29 UTC (rev 8783)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py 2012-02-29 \
18:15:34 UTC (rev 8784) @@ -304,9 +304,11 @@
Parse a 'free' constraint, described explicitly in the table as opposed
to being implicitly associated with a column by being placed after it.
"""
- # only know about PRIMARY KEY and UNIQUE for now
+ ident = None
+ # TODO: make use of identifier in tableConstraint, currently only used
+ # for checkConstraint.
if constraintType.match(Keyword, 'CONSTRAINT'):
- expect(self, cls=Identifier) # constraintName
+ ident = expect(self, cls=Identifier).get_name()
constraintType = expect(self, ttype=Keyword)
if constraintType.match(Keyword, 'PRIMARY'):
expect(self, ttype=Keyword, value='KEY')
@@ -316,7 +318,7 @@
names = self.namesInParens(expect(self, cls=Parenthesis))
self.table.tableConstraint(Constraint.UNIQUE, names)
elif constraintType.match(Keyword, 'CHECK'):
- self.table.checkConstraint(self.readExpression(self.next()))
+ self.table.checkConstraint(self.readExpression(self.next()), ident)
else:
raise ViolatedExpectation('PRIMARY or UNIQUE', constraintType)
return self.checkEnd(self.next())
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[8784] CalendarServer/branches/users/glyph/case-insensitive-uid</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/8784">8784</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2012-02-29 10:15:34 -0800 (Wed, 29 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>actually take the check constraint name into account when parsing</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphcaseinsensitiveuidtwextenterprisedalmode \
lpy">CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py</a></li>
<li><a href="#CalendarServerbranchesusersglyphcaseinsensitiveuidtwextenterprisedalpar \
seschemapy">CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphcaseinsensitiveuid">CalendarServer/branches/users/glyph/case-insensitive-uid/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersglyphcaseinsensitiveuidtwextenterprisedalmodelpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py \
(8783 => 8784)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py 2012-02-29 \
18:15:29 UTC (rev 8783)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/model.py 2012-02-29 \
18:15:34 UTC (rev 8784) </span><span class="lines">@@ -86,12 +86,12 @@
</span><span class="cx"> NOT_NULL = 'NOT NULL'
</span><span class="cx"> UNIQUE = 'UNIQUE'
</span><span class="cx">
</span><del>- def __init__(self, type, affectsColumns):
</del><ins>+ def __init__(self, type, affectsColumns, name=None):
</ins><span class="cx"> self.affectsColumns = affectsColumns
</span><span class="cx"> # XXX: possibly different constraint types should \
have different </span><span class="cx"> # classes?
</span><span class="cx"> self.type = type
</span><del>- self.name = None
</del><ins>+ self.name = name
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx"> """
</span><span class="cx"> # XXX TODO: model for expression, rather than
</span><span class="cx">
</span><del>- def __init__(self, syntaxExpression):
</del><ins>+ def __init__(self, syntaxExpression, name=None):
</ins><span class="cx"> self.expression = syntaxExpression
</span><span class="cx"> super(Check, self).__init__(
</span><del>- 'CHECK', [c.model for c in self.expression.allColumns()]
</del><ins>+ 'CHECK', [c.model for c in self.expression.allColumns()], \
name </ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -308,14 +308,14 @@
</span><span class="cx"> self.constraints.append(Constraint(constraintType, \
affectsColumns)) </span><span class="cx">
</span><span class="cx">
</span><del>- def checkConstraint(self, protoExpression):
</del><ins>+ def checkConstraint(self, protoExpression, name=None):
</ins><span class="cx"> """
</span><span class="cx"> This table is affected by a 'check' constraint. \
(Should only be called </span><span class="cx"> during schema parsing.)
</span><span class="cx">
</span><span class="cx"> @param protoExpression: proto expression.
</span><span class="cx"> """
</span><del>- self.constraints.append(Check(protoExpression))
</del><ins>+ self.constraints.append(Check(protoExpression, name))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def insertSchemaRow(self, values):
</span></span></pre></div>
<a id="CalendarServerbranchesusersglyphcaseinsensitiveuidtwextenterprisedalparseschemapy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py \
(8783 => 8784)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py 2012-02-29 \
18:15:29 UTC (rev 8783)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/twext/enterprise/dal/parseschema.py 2012-02-29 \
18:15:34 UTC (rev 8784) </span><span class="lines">@@ -304,9 +304,11 @@
</span><span class="cx"> Parse a 'free' constraint, described explicitly in \
the table as opposed </span><span class="cx"> to being implicitly associated \
with a column by being placed after it. </span><span class="cx"> \
""" </span><del>- # only know about PRIMARY KEY and UNIQUE for \
now </del><ins>+ ident = None
+ # TODO: make use of identifier in tableConstraint, currently only used
+ # for checkConstraint.
</ins><span class="cx"> if constraintType.match(Keyword, 'CONSTRAINT'):
</span><del>- expect(self, cls=Identifier) # constraintName
</del><ins>+ ident = expect(self, cls=Identifier).get_name()
</ins><span class="cx"> constraintType = expect(self, ttype=Keyword)
</span><span class="cx"> if constraintType.match(Keyword, 'PRIMARY'):
</span><span class="cx"> expect(self, ttype=Keyword, value='KEY')
</span><span class="lines">@@ -316,7 +318,7 @@
</span><span class="cx"> names = self.namesInParens(expect(self, \
cls=Parenthesis)) </span><span class="cx"> \
self.table.tableConstraint(Constraint.UNIQUE, names) </span><span class="cx"> \
elif constraintType.match(Keyword, 'CHECK'): </span><del>- \
self.table.checkConstraint(self.readExpression(self.next())) </del><ins>+ \
self.table.checkConstraint(self.readExpression(self.next()), ident) </ins><span \
class="cx"> else: </span><span class="cx"> raise \
ViolatedExpectation('PRIMARY or UNIQUE', constraintType) </span><span class="cx"> \
return self.checkEnd(self.next()) </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic