[Sqlalchemy-commits] [1906] sqlalchemy/trunk/test/sql: decruftify
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1906] sqlalchemy/trunk/test/sql: decruftify
|
From: <co...@sq...> - 2006-09-28 01:14:51
|
<!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><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 { 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; } #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>[1906] sqlalchemy/trunk/test/sql: decruftify</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1906</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-09-27 21:13:37 -0500 (Wed, 27 Sep 2006)</dd> </dl> <h3>Log Message</h3> <pre>decruftify</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyansisqlpy">sqlalchemy/trunk/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyschemapy">sqlalchemy/trunk/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemytrunktestsqlquerypy">sqlalchemy/trunk/test/sql/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyansisqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ansisql.py (1905 => 1906)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-09-28 01:46:16 UTC (rev 1905) +++ sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-09-28 02:13:37 UTC (rev 1906) </span><span class="lines">@@ -140,14 +140,14 @@ </span><span class="cx"> </span><span class="cx"> d = sql.ClauseParameters(self.dialect, self.positiontup) </span><span class="cx"> for b in self.binds.values(): </span><del>- d.set_parameter(b.key, b.value, b) </del><ins>+ d.set_parameter(b, b.value) </ins><span class="cx"> </span><span class="cx"> for key, value in bindparams.iteritems(): </span><span class="cx"> try: </span><span class="cx"> b = self.binds[key] </span><span class="cx"> except KeyError: </span><span class="cx"> continue </span><del>- d.set_parameter(b.key, value, b) </del><ins>+ d.set_parameter(b, value) </ins><span class="cx"> </span><span class="cx"> return d </span><span class="cx"> </span><span class="lines">@@ -181,7 +181,7 @@ </span><span class="cx"> self.strings[column] = self.preparer.format_column_with_table(column) </span><span class="cx"> </span><span class="cx"> def visit_fromclause(self, fromclause): </span><del>- self.froms[fromclause] = fromclause.from_name </del><ins>+ self.froms[fromclause] = fromclause.name </ins><span class="cx"> </span><span class="cx"> def visit_index(self, index): </span><span class="cx"> self.strings[index] = index.name </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/schema.py (1905 => 1906)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-09-28 01:46:16 UTC (rev 1905) +++ sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-09-28 02:13:37 UTC (rev 1906) </span><span class="lines">@@ -435,12 +435,10 @@ </span><span class="cx"> </span><span class="cx"> def __str__(self): </span><span class="cx"> if self.table is not None: </span><del>- tname = self.table.displayname - if tname is not None: - return tname + "." + self.name </del><ins>+ if self.table.named_with_column(): + return self.table.name + "." + self.name </ins><span class="cx"> else: </span><span class="cx"> return self.name </span><del>- else: </del><span class="cx"> return self.name </span><span class="cx"> </span><span class="cx"> def _derived_metadata(self): </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1905 => 1906)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-09-28 01:46:16 UTC (rev 1905) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-09-28 02:13:37 UTC (rev 1906) </span><span class="lines">@@ -217,16 +217,16 @@ </span><span class="cx"> of this object.""" </span><span class="cx"> return TableClause(name, *columns) </span><span class="cx"> </span><del>-def bindparam(key, value = None, type=None): </del><ins>+def bindparam(key, value=None, type=None, shortname=None): </ins><span class="cx"> """creates a bind parameter clause with the given key. </span><span class="cx"> </span><span class="cx"> An optional default value can be specified by the value parameter, and the optional type parameter </span><span class="cx"> is a sqlalchemy.types.TypeEngine object which indicates bind-parameter and result-set translation for </span><span class="cx"> this bind parameter.""" </span><span class="cx"> if isinstance(key, ColumnClause): </span><del>- return BindParamClause(key.name, value, type=key.type) </del><ins>+ return BindParamClause(key.name, value, type=key.type, shortname=shortname) </ins><span class="cx"> else: </span><del>- return BindParamClause(key, value, type=type) </del><ins>+ return BindParamClause(key, value, type=type, shortname=shortname) </ins><span class="cx"> </span><span class="cx"> def text(text, engine=None, *args, **kwargs): </span><span class="cx"> """creates literal text to be inserted into a query. </span><span class="lines">@@ -301,9 +301,9 @@ </span><span class="cx"> self.dialect=dialect </span><span class="cx"> self.binds = {} </span><span class="cx"> self.positional = positional or [] </span><del>- def set_parameter(self, key, value, bindparam): - self[key] = value - self.binds[key] = bindparam </del><ins>+ def set_parameter(self, bindparam, value): + self[bindparam.key] = value + self.binds[bindparam.key] = bindparam </ins><span class="cx"> def get_original(self, key): </span><span class="cx"> """returns the given parameter as it was originally placed in this ClauseParameters object, without any Type conversion""" </span><span class="cx"> return super(ClauseParameters, self).__getitem__(key) </span><span class="lines">@@ -654,14 +654,8 @@ </span><span class="cx"> </span><span class="cx"> class FromClause(Selectable): </span><span class="cx"> """represents an element that can be used within the FROM clause of a SELECT statement.""" </span><del>- def __init__(self, from_name = None): - self.from_name = self.name = from_name - def _display_name(self): - if self.named_with_column(): - return self.name - else: - return None - displayname = property(_display_name) </del><ins>+ def __init__(self, name=None): + self.name = name </ins><span class="cx"> def _get_from_objects(self): </span><span class="cx"> # this could also be [self], at the moment it doesnt matter to the Select object </span><span class="cx"> return [] </span><span class="lines">@@ -678,7 +672,7 @@ </span><span class="cx"> def join(self, right, *args, **kwargs): </span><span class="cx"> return Join(self, right, *args, **kwargs) </span><span class="cx"> def outerjoin(self, right, *args, **kwargs): </span><del>- return Join(self, right, isouter = True, *args, **kwargs) </del><ins>+ return Join(self, right, isouter=True, *args, **kwargs) </ins><span class="cx"> def alias(self, name=None): </span><span class="cx"> return Alias(self, name) </span><span class="cx"> def named_with_column(self): </span><span class="lines">@@ -760,9 +754,26 @@ </span><span class="cx"> class BindParamClause(ClauseElement, CompareMixin): </span><span class="cx"> """represents a bind parameter. public constructor is the bindparam() function.""" </span><span class="cx"> def __init__(self, key, value, shortname=None, type=None): </span><ins>+ """construct a BindParamClause. + + key - the key for this bind param. will be used in the generated SQL statement + for dialects that use named parameters. this value may be modified when part of a + compilation operation, if other BindParamClause objects exist with the same key, or if + its length is too long and truncation is required. + + value - initial value for this bind param. This value may be overridden by the + dictionary of parameters sent to statement compilation/execution. + + shortname - defaults to the key, a 'short name' that will also identify this + bind parameter, similar to an alias. the bind parameter keys sent to a statement + compilation or compiled execution may match either the key or the shortname of the + corresponding BindParamClause objects. + + type - a TypeEngine object that will be used to pre-process the value corresponding + to this BindParamClause at execution time.""" </ins><span class="cx"> self.key = key </span><span class="cx"> self.value = value </span><del>- self.shortname = shortname </del><ins>+ self.shortname = shortname or key </ins><span class="cx"> self.type = sqltypes.to_instance(type) </span><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> visitor.visit_bindparam(self) </span><span class="lines">@@ -1506,7 +1517,7 @@ </span><span class="cx"> setattr(self, attribute, condition) </span><span class="cx"> </span><span class="cx"> def clear_from(self, from_obj): </span><del>- self._froms[from_obj] = FromClause(from_name = None) </del><ins>+ self._froms[from_obj] = FromClause() </ins><span class="cx"> </span><span class="cx"> def append_from(self, fromclause): </span><span class="cx"> if type(fromclause) == str: </span></span></pre></div> <a id="sqlalchemytrunktestsqlquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/sql/query.py (1905 => 1906)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/sql/query.py 2006-09-28 01:46:16 UTC (rev 1905) +++ sqlalchemy/trunk/test/sql/query.py 2006-09-28 02:13:37 UTC (rev 1906) </span><span class="lines">@@ -125,6 +125,15 @@ </span><span class="cx"> s = self.users.select(or_(self.users.c.user_name==u, self.users.c.user_name==u)) </span><span class="cx"> r = s.execute(uid='fred').fetchall() </span><span class="cx"> assert len(r) == 1 </span><ins>+ + def test_bindparam_shortname(self): + """test the 'shortname' field on BindParamClause.""" + self.users.insert().execute(user_id = 7, user_name = 'jack') + self.users.insert().execute(user_id = 8, user_name = 'fred') + u = bindparam('uid', shortname='someshortname') + s = self.users.select(self.users.c.user_name==u) + r = s.execute(someshortname='fred').fetchall() + assert len(r) == 1 </ins><span class="cx"> </span><span class="cx"> def testdelete(self): </span><span class="cx"> self.users.insert().execute(user_id = 7, user_name = 'jack') </span></span></pre> </div> </div> </body> </html> |