[Sqlalchemy-commits] [1353] sqlalchemy/trunk/test: fix for [ticket:169], moves the creation of "defa
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1353] sqlalchemy/trunk/test: fix for [ticket:169], moves the creation of "default" parameters more accurately
|
From: <co...@sq...> - 2006-04-28 23:32:17
|
<!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>[1353] sqlalchemy/trunk/test: fix for [ticket:169], moves the creation of "default" parameters more accurately</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1353</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-28 18:31:59 -0500 (Fri, 28 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>fix for [ticket:169], moves the creation of "default" parameters more accurately where theyre supposed to be</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyansisqlpy">sqlalchemy/trunk/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasespostgrespy">sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py</a></li> <li><a href="#sqlalchemytrunktestdefaultspy">sqlalchemy/trunk/test/defaults.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 (1352 => 1353)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-04-28 22:42:58 UTC (rev 1352) +++ sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-04-28 23:31:59 UTC (rev 1353) </span><span class="lines">@@ -146,7 +146,6 @@ </span><span class="cx"> continue </span><span class="cx"> d.set_parameter(b.key, value, b) </span><span class="cx"> </span><del>- #print "FROM", params, "TO", d </del><span class="cx"> return d </span><span class="cx"> </span><span class="cx"> def get_named_params(self, parameters): </span><span class="lines">@@ -425,26 +424,26 @@ </span><span class="cx"> " ON " + self.get_str(join.onclause)) </span><span class="cx"> self.strings[join] = self.froms[join] </span><span class="cx"> </span><del>- def visit_insert_column_default(self, column, default): </del><ins>+ def visit_insert_column_default(self, column, default, parameters): </ins><span class="cx"> """called when visiting an Insert statement, for each column in the table that </span><span class="cx"> contains a ColumnDefault object. adds a blank 'placeholder' parameter so the </span><span class="cx"> Insert gets compiled with this column's name in its column and VALUES clauses.""" </span><del>- self.parameters.setdefault(column.key, None) </del><ins>+ parameters.setdefault(column.key, None) </ins><span class="cx"> </span><del>- def visit_update_column_default(self, column, default): </del><ins>+ def visit_update_column_default(self, column, default, parameters): </ins><span class="cx"> """called when visiting an Update statement, for each column in the table that </span><span class="cx"> contains a ColumnDefault object as an onupdate. adds a blank 'placeholder' parameter so the </span><span class="cx"> Update gets compiled with this column's name as one of its SET clauses.""" </span><del>- self.parameters.setdefault(column.key, None) </del><ins>+ parameters.setdefault(column.key, None) </ins><span class="cx"> </span><del>- def visit_insert_sequence(self, column, sequence): </del><ins>+ def visit_insert_sequence(self, column, sequence, parameters): </ins><span class="cx"> """called when visiting an Insert statement, for each column in the table that </span><span class="cx"> contains a Sequence object. Overridden by compilers that support sequences to place </span><span class="cx"> a blank 'placeholder' parameter, so the Insert gets compiled with this column's </span><span class="cx"> name in its column and VALUES clauses.""" </span><span class="cx"> pass </span><span class="cx"> </span><del>- def visit_insert_column(self, column): </del><ins>+ def visit_insert_column(self, column, parameters): </ins><span class="cx"> """called when visiting an Insert statement, for each column in the table </span><span class="cx"> that is a NULL insert into the table. Overridden by compilers who disallow </span><span class="cx"> NULL columns being set in an Insert where there is a default value on the column </span><span class="lines">@@ -454,25 +453,27 @@ </span><span class="cx"> def visit_insert(self, insert_stmt): </span><span class="cx"> # scan the table's columns for defaults that have to be pre-set for an INSERT </span><span class="cx"> # add these columns to the parameter list via visit_insert_XXX methods </span><ins>+ default_params = {} </ins><span class="cx"> class DefaultVisitor(schema.SchemaVisitor): </span><span class="cx"> def visit_column(s, c): </span><del>- self.visit_insert_column(c) </del><ins>+ self.visit_insert_column(c, default_params) </ins><span class="cx"> def visit_column_default(s, cd): </span><del>- self.visit_insert_column_default(c, cd) </del><ins>+ self.visit_insert_column_default(c, cd, default_params) </ins><span class="cx"> def visit_sequence(s, seq): </span><del>- self.visit_insert_sequence(c, seq) </del><ins>+ self.visit_insert_sequence(c, seq, default_params) </ins><span class="cx"> vis = DefaultVisitor() </span><span class="cx"> for c in insert_stmt.table.c: </span><span class="cx"> if (isinstance(c, schema.SchemaItem) and (self.parameters is None or self.parameters.get(c.key, None) is None)): </span><span class="cx"> c.accept_schema_visitor(vis) </span><span class="cx"> </span><span class="cx"> self.isinsert = True </span><del>- colparams = self._get_colparams(insert_stmt) </del><ins>+ colparams = self._get_colparams(insert_stmt, default_params) </ins><span class="cx"> </span><span class="cx"> def create_param(p): </span><span class="cx"> if isinstance(p, sql.BindParamClause): </span><span class="cx"> self.binds[p.key] = p </span><del>- self.binds[p.shortname] = p </del><ins>+ if p.shortname is not None: + self.binds[p.shortname] = p </ins><span class="cx"> return self.bindparam_string(p.key) </span><span class="cx"> else: </span><span class="cx"> p.accept_visitor(self) </span><span class="lines">@@ -483,22 +484,23 @@ </span><span class="cx"> </span><span class="cx"> text = ("INSERT INTO " + insert_stmt.table.fullname + " (" + string.join([c[0].name for c in colparams], ', ') + ")" + </span><span class="cx"> " VALUES (" + string.join([create_param(c[1]) for c in colparams], ', ') + ")") </span><del>- </del><ins>+ </ins><span class="cx"> self.strings[insert_stmt] = text </span><span class="cx"> </span><span class="cx"> def visit_update(self, update_stmt): </span><span class="cx"> # scan the table's columns for onupdates that have to be pre-set for an UPDATE </span><span class="cx"> # add these columns to the parameter list via visit_update_XXX methods </span><ins>+ default_params = {} </ins><span class="cx"> class OnUpdateVisitor(schema.SchemaVisitor): </span><span class="cx"> def visit_column_onupdate(s, cd): </span><del>- self.visit_update_column_default(c, cd) </del><ins>+ self.visit_update_column_default(c, cd, default_params) </ins><span class="cx"> vis = OnUpdateVisitor() </span><span class="cx"> for c in update_stmt.table.c: </span><span class="cx"> if (isinstance(c, schema.SchemaItem) and (self.parameters is None or self.parameters.get(c.key, None) is None)): </span><span class="cx"> c.accept_schema_visitor(vis) </span><span class="cx"> </span><span class="cx"> self.isupdate = True </span><del>- colparams = self._get_colparams(update_stmt) </del><ins>+ colparams = self._get_colparams(update_stmt, default_params) </ins><span class="cx"> def create_param(p): </span><span class="cx"> if isinstance(p, sql.BindParamClause): </span><span class="cx"> self.binds[p.key] = p </span><span class="lines">@@ -519,7 +521,7 @@ </span><span class="cx"> self.strings[update_stmt] = text </span><span class="cx"> </span><span class="cx"> </span><del>- def _get_colparams(self, stmt): </del><ins>+ def _get_colparams(self, stmt, default_params): </ins><span class="cx"> """determines the VALUES or SET clause for an INSERT or UPDATE </span><span class="cx"> clause based on the arguments specified to this ANSICompiler object </span><span class="cx"> (i.e., the execute() or compile() method clause object): </span><span class="lines">@@ -550,6 +552,9 @@ </span><span class="cx"> for k, v in stmt.parameters.iteritems(): </span><span class="cx"> parameters.setdefault(k, v) </span><span class="cx"> </span><ins>+ for k, v in default_params.iteritems(): + parameters.setdefault(k, v) + </ins><span class="cx"> # now go thru compiled params, get the Column object for each key </span><span class="cx"> d = {} </span><span class="cx"> for key, value in parameters.iteritems(): </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasespostgrespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py (1352 => 1353)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2006-04-28 22:42:58 UTC (rev 1352) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2006-04-28 23:31:59 UTC (rev 1353) </span><span class="lines">@@ -291,13 +291,13 @@ </span><span class="cx"> class PGCompiler(ansisql.ANSICompiler): </span><span class="cx"> </span><span class="cx"> </span><del>- def visit_insert_column(self, column): </del><ins>+ def visit_insert_column(self, column, parameters): </ins><span class="cx"> # Postgres advises against OID usage and turns it off in 8.1, </span><span class="cx"> # effectively making cursor.lastrowid </span><span class="cx"> # useless, effectively making reliance upon SERIAL useless. </span><span class="cx"> # so all column primary key inserts must be explicitly present </span><span class="cx"> if column.primary_key: </span><del>- self.parameters[column.key] = None </del><ins>+ parameters[column.key] = None </ins><span class="cx"> </span><span class="cx"> def limit_clause(self, select): </span><span class="cx"> text = "" </span></span></pre></div> <a id="sqlalchemytrunktestdefaultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/defaults.py (1352 => 1353)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/defaults.py 2006-04-28 22:42:58 UTC (rev 1352) +++ sqlalchemy/trunk/test/defaults.py 2006-04-28 23:31:59 UTC (rev 1353) </span><span class="lines">@@ -92,6 +92,12 @@ </span><span class="cx"> l = t.select().execute() </span><span class="cx"> self.assert_(l.fetchall() == [(51, 'imthedefault', f, ts, ts, ctexec), (52, 'imthedefault', f, ts, ts, ctexec), (53, 'imthedefault', f, ts, ts, ctexec)]) </span><span class="cx"> </span><ins>+ def testinsertvalues(self): + t.insert(values={'col3':50}).execute() + l = t.select().execute() + self.assert_(l.fetchone()['col3'] == 50) + + </ins><span class="cx"> def testupdate(self): </span><span class="cx"> t.insert().execute() </span><span class="cx"> pk = t.engine.last_inserted_ids()[0] </span><span class="lines">@@ -103,6 +109,14 @@ </span><span class="cx"> self.assert_(l == (pk, 'im the update', f2, None, None, ctexec)) </span><span class="cx"> # mysql/other db's return 0 or 1 for count(1) </span><span class="cx"> self.assert_(14 <= f2 <= 15) </span><ins>+ + def testupdatevalues(self): + t.insert().execute() + pk = t.engine.last_inserted_ids()[0] + t.update(t.c.col1==pk, values={'col3': 55}).execute() + l = t.select(t.c.col1==pk).execute() + l = l.fetchone() + self.assert_(l['col3'] == 55) </ins><span class="cx"> </span><span class="cx"> class SequenceTest(PersistTest): </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |