[Sqlalchemy-commits] [5907] sqlalchemy/trunk: Added in MSSQL reserved words list.
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5907] sqlalchemy/trunk: Added in MSSQL reserved words list.
|
From: <co...@sq...> - 2009-04-12 02:12:43
|
<!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" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #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> <title>[5907] sqlalchemy/trunk: Added in MSSQL reserved words list.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5907</dd> <dt>Author</dt> <dd>empty</dd> <dt>Date</dt> <dd>2009-04-11 22:12:41 -0400 (Sat, 11 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>Added in MSSQL reserved words list. Fixes #1310</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesmssqlpy">sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (5906 => 5907)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2009-04-11 21:36:45 UTC (rev 5906) +++ sqlalchemy/trunk/CHANGES 2009-04-12 02:12:41 UTC (rev 5907) </span><span class="lines">@@ -57,6 +57,9 @@ </span><span class="cx"> construct (i.e. declarative columns). [ticket:1353] </span><span class="cx"> </span><span class="cx"> - mssql </span><ins>+ - Added in reserved words for MSSQL that covers version 2008 + and all prior versions. [ticket:1310] + </ins><span class="cx"> - Corrected problem with information schema not working with a </span><span class="cx"> binary collation based database. Cleaned up information schema </span><span class="cx"> since it is only used by mssql now. [ticket:1343] </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasesmssqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py (5906 => 5907)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py 2009-04-11 21:36:45 UTC (rev 5906) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/mssql.py 2009-04-12 02:12:41 UTC (rev 5907) </span><span class="lines">@@ -249,7 +249,36 @@ </span><span class="cx"> from decimal import Decimal as _python_Decimal </span><span class="cx"> </span><span class="cx"> </span><del>-MSSQL_RESERVED_WORDS = set(['function']) </del><ins>+RESERVED_WORDS = set( + ['add', 'all', 'alter', 'and', 'any', 'as', 'asc', 'authorization', + 'backup', 'begin', 'between', 'break', 'browse', 'bulk', 'by', 'cascade', + 'case', 'check', 'checkpoint', 'close', 'clustered', 'coalesce', + 'collate', 'column', 'commit', 'compute', 'constraint', 'contains', + 'containstable', 'continue', 'convert', 'create', 'cross', 'current', + 'current_date', 'current_time', 'current_timestamp', 'current_user', + 'cursor', 'database', 'dbcc', 'deallocate', 'declare', 'default', + 'delete', 'deny', 'desc', 'disk', 'distinct', 'distributed', 'double', + 'drop', 'dump', 'else', 'end', 'errlvl', 'escape', 'except', 'exec', + 'execute', 'exists', 'exit', 'external', 'fetch', 'file', 'fillfactor', + 'for', 'foreign', 'freetext', 'freetexttable', 'from', 'full', + 'function', 'goto', 'grant', 'group', 'having', 'holdlock', 'identity', + 'identity_insert', 'identitycol', 'if', 'in', 'index', 'inner', 'insert', + 'intersect', 'into', 'is', 'join', 'key', 'kill', 'left', 'like', + 'lineno', 'load', 'merge', 'national', 'nocheck', 'nonclustered', 'not', + 'null', 'nullif', 'of', 'off', 'offsets', 'on', 'open', 'opendatasource', + 'openquery', 'openrowset', 'openxml', 'option', 'or', 'order', 'outer', + 'over', 'percent', 'pivot', 'plan', 'precision', 'primary', 'print', + 'proc', 'procedure', 'public', 'raiserror', 'read', 'readtext', + 'reconfigure', 'references', 'replication', 'restore', 'restrict', + 'return', 'revert', 'revoke', 'right', 'rollback', 'rowcount', + 'rowguidcol', 'rule', 'save', 'schema', 'securityaudit', 'select', + 'session_user', 'set', 'setuser', 'shutdown', 'some', 'statistics', + 'system_user', 'table', 'tablesample', 'textsize', 'then', 'to', 'top', + 'tran', 'transaction', 'trigger', 'truncate', 'tsequal', 'union', + 'unique', 'unpivot', 'update', 'updatetext', 'use', 'user', 'values', + 'varying', 'view', 'waitfor', 'when', 'where', 'while', 'with', + 'writetext', + ]) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class _StringType(object): </span><span class="lines">@@ -1724,7 +1753,7 @@ </span><span class="cx"> </span><span class="cx"> </span><span class="cx"> class MSSQLIdentifierPreparer(compiler.IdentifierPreparer): </span><del>- reserved_words = compiler.IdentifierPreparer.reserved_words.union(MSSQL_RESERVED_WORDS) </del><ins>+ reserved_words = RESERVED_WORDS </ins><span class="cx"> </span><span class="cx"> def __init__(self, dialect): </span><span class="cx"> super(MSSQLIdentifierPreparer, self).__init__(dialect, initial_quote='[', final_quote=']') </span></span></pre> </div> </div> </body> </html> |