[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [8787] CalendarServer/branches/users/glyph/case-insensitive-uid
From: source_changes () macosforge ! org
Date: 2012-02-29 18:15:49
Message-ID: 20120229181549.4EDBE57C843D () lists ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 8787
http://trac.macosforge.org/projects/calendarserver/changeset/8787
Author: glyph@apple.com
Date: 2012-02-29 10:15:48 -0800 (Wed, 29 Feb 2012)
Log Message:
-----------
split out static SQL generation from _translateSchema into its own toplevel functions
Modified Paths:
--------------
CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py
Property Changed:
----------------
CalendarServer/branches/users/glyph/case-insensitive-uid/
Modified: CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py 2012-02-29 \
18:15:44 UTC (rev 8786)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py 2012-02-29 \
18:15:48 UTC (rev 8787) @@ -217,6 +217,58 @@
'char': 'nchar',
}
+
+
+def _quoted(x):
+ """
+ Quote an object for inclusion into an SQL string.
+
+ @note: Do not use this function with untrusted input, as it may be a
+ security risk. This is only for translating local, trusted input from
+ the schema.
+
+ @return: the translated SQL string.
+ @rtype: C{str}
+ """
+ if isinstance(x, (str, unicode)):
+ return ''.join(["'", x.replace("'", "''"), "'"])
+ else:
+ return str(x)
+
+
+
+def _staticSQL(sql, doquote=False):
+ """
+ Statically generate some SQL from some DAL syntax objects, interpolating
+ any parameters into the body of the string.
+
+ @note: Do not use this function with untrusted input, as it may be a
+ security risk. This is only for translating local, trusted input from
+ the schema.
+
+ @param sql: something from L{twext.enterprise.dal}, either a top-level
+ statement like L{Insert} or L{Select}, or a fragment such as an
+ expression.
+
+ @param doquote: Force all identifiers to be double-quoted, whether they
+ conflict with database identifiers or not, for consistency.
+
+ @return: the generated SQL string.
+ @rtype: C{str}
+ """
+ qgen = QueryGenerator(ORACLE_DIALECT, FixedPlaceholder('%s'))
+ if doquote:
+ qgen.shouldQuote = lambda name: True
+ if hasattr(sql, 'subSQL'):
+ fragment = sql.subSQL(qgen, [])
+ else:
+ fragment = sql.toSQL(qgen)
+ params = tuple([_quoted(param) for param in fragment.parameters])
+ result = fragment.text % params
+ return result
+
+
+
def _translateSchema(out, schema=schema):
"""
When run as a script, translate the schema to another dialect. Currently
@@ -295,45 +347,22 @@
continue # already done inline, skip
writeConstraint("unique", uniqueColumns)
- def quoted(x):
- if isinstance(x, (str, unicode)):
- return ''.join(["'", x.replace("'", "''"), "'"])
- else:
- return str(x)
-
- def staticSQL(sql, doquote=False):
- qgen = QueryGenerator(ORACLE_DIALECT, FixedPlaceholder('%s'))
- if doquote:
- qgen.shouldQuote = lambda name: True
- if hasattr(sql, 'subSQL'):
- fragment = sql.subSQL(qgen, [])
- else:
- fragment = sql.toSQL(qgen)
- params = tuple([quoted(param) for param in fragment.parameters])
- result = fragment.text % params
- return result
-
for checkConstraint in table.model.constraints:
if checkConstraint.type == 'CHECK':
out.write(", \n ")
if checkConstraint.name is not None:
out.write('constraint "%s" ' % (checkConstraint.name,))
out.write("check(%s)" %
- (staticSQL(checkConstraint.expression, True)))
+ (_staticSQL(checkConstraint.expression, True)))
out.write('\n);\n\n')
for row in table.model.schemaRows:
- cmap = dict(
- [(getattr(table, cmodel.name), val)
- for (cmodel, val) in row.items()]
- )
- out.write(
- staticSQL(Insert(cmap))
- )
+ cmap = dict([(getattr(table, cmodel.name), val)
+ for (cmodel, val) in row.items()])
+ out.write(_staticSQL(Insert(cmap)))
out.write(";\n")
-
for index in schema.model.indexes:
# Index names combine and repeat multiple table names and column names,
# so several of them conflict once oracle's length limit is applied.
[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>[8787] 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/8787">8787</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2012-02-29 10:15:48 -0800 (Wed, 29 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>split out static SQL generation from _translateSchema into its own toplevel \
functions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphcaseinsensitiveuidtxdavcommondatastoresq \
l_tablespy">CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.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="CalendarServerbranchesusersglyphcaseinsensitiveuidtxdavcommondatastoresql_tablespy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py \
(8786 => 8787)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py 2012-02-29 \
18:15:44 UTC (rev 8786)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/sql_tables.py 2012-02-29 \
18:15:48 UTC (rev 8787) </span><span class="lines">@@ -217,6 +217,58 @@
</span><span class="cx"> 'char': 'nchar',
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+
+def _quoted(x):
+ """
+ Quote an object for inclusion into an SQL string.
+
+ @note: Do not use this function with untrusted input, as it may be a
+ security risk. This is only for translating local, trusted input from
+ the schema.
+
+ @return: the translated SQL string.
+ @rtype: C{str}
+ """
+ if isinstance(x, (str, unicode)):
+ return ''.join(["'", x.replace("'", "''"), \
"'"]) + else:
+ return str(x)
+
+
+
+def _staticSQL(sql, doquote=False):
+ """
+ Statically generate some SQL from some DAL syntax objects, interpolating
+ any parameters into the body of the string.
+
+ @note: Do not use this function with untrusted input, as it may be a
+ security risk. This is only for translating local, trusted input from
+ the schema.
+
+ @param sql: something from L{twext.enterprise.dal}, either a top-level
+ statement like L{Insert} or L{Select}, or a fragment such as an
+ expression.
+
+ @param doquote: Force all identifiers to be double-quoted, whether they
+ conflict with database identifiers or not, for consistency.
+
+ @return: the generated SQL string.
+ @rtype: C{str}
+ """
+ qgen = QueryGenerator(ORACLE_DIALECT, FixedPlaceholder('%s'))
+ if doquote:
+ qgen.shouldQuote = lambda name: True
+ if hasattr(sql, 'subSQL'):
+ fragment = sql.subSQL(qgen, [])
+ else:
+ fragment = sql.toSQL(qgen)
+ params = tuple([_quoted(param) for param in fragment.parameters])
+ result = fragment.text % params
+ return result
+
+
+
</ins><span class="cx"> def _translateSchema(out, schema=schema):
</span><span class="cx"> """
</span><span class="cx"> When run as a script, translate the schema to another \
dialect. Currently </span><span class="lines">@@ -295,45 +347,22 @@
</span><span class="cx"> continue # already done inline, skip
</span><span class="cx"> writeConstraint("unique", \
uniqueColumns) </span><span class="cx">
</span><del>- def quoted(x):
- if isinstance(x, (str, unicode)):
- return ''.join(["'", x.replace("'", \
"''"), "'"])
- else:
- return str(x)
-
- def staticSQL(sql, doquote=False):
- qgen = QueryGenerator(ORACLE_DIALECT, FixedPlaceholder('%s'))
- if doquote:
- qgen.shouldQuote = lambda name: True
- if hasattr(sql, 'subSQL'):
- fragment = sql.subSQL(qgen, [])
- else:
- fragment = sql.toSQL(qgen)
- params = tuple([quoted(param) for param in fragment.parameters])
- result = fragment.text % params
- return result
-
</del><span class="cx"> for checkConstraint in table.model.constraints:
</span><span class="cx"> if checkConstraint.type == 'CHECK':
</span><span class="cx"> out.write(", \n ")
</span><span class="cx"> if checkConstraint.name is not None:
</span><span class="cx"> out.write('constraint "%s" ' % \
(checkConstraint.name,)) </span><span class="cx"> \
out.write("check(%s)" % </span><del>- \
(staticSQL(checkConstraint.expression, True))) </del><ins>+ \
(_staticSQL(checkConstraint.expression, True))) </ins><span class="cx">
</span><span class="cx"> out.write('\n);\n\n')
</span><span class="cx">
</span><span class="cx"> for row in table.model.schemaRows:
</span><del>- cmap = dict(
- [(getattr(table, cmodel.name), val)
- for (cmodel, val) in row.items()]
- )
- out.write(
- staticSQL(Insert(cmap))
- )
</del><ins>+ cmap = dict([(getattr(table, cmodel.name), val)
+ for (cmodel, val) in row.items()])
+ out.write(_staticSQL(Insert(cmap)))
</ins><span class="cx"> out.write(";\n")
</span><span class="cx">
</span><del>-
</del><span class="cx"> for index in schema.model.indexes:
</span><span class="cx"> # Index names combine and repeat multiple table \
names and column names, </span><span class="cx"> # so several of them \
conflict once oracle's length limit is applied. </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