[Sqlalchemy-commits] [1354] sqlalchemy/branches/schema/test: merged [changeset:1353] fixes
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1354] sqlalchemy/branches/schema/test: merged [changeset:1353] fixes
|
From: <co...@sq...> - 2006-04-29 00:08:20
|
<!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>[1354] sqlalchemy/branches/schema/test: merged [changeset:1353] fixes</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1354</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-28 19:08:07 -0500 (Fri, 28 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>merged [changeset:1353] fixes fixed some stuff related to connection scoping when running sequences/defaults added 'metadata' argument to DefaultGenerator</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyansisqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemydatabasespostgrespy">sqlalchemy/branches/schema/lib/sqlalchemy/databases/postgres.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyenginebasepy">sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyschemapy">sqlalchemy/branches/schema/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemybranchesschematestdefaultspy">sqlalchemy/branches/schema/test/defaults.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyansisqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py (1353 => 1354)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py 2006-04-28 23:31:59 UTC (rev 1353) +++ sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py 2006-04-29 00:08:07 UTC (rev 1354) </span><span class="lines">@@ -138,7 +138,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">@@ -426,26 +425,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">@@ -455,25 +454,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">@@ -484,22 +485,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">@@ -520,7 +522,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">@@ -551,6 +553,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="sqlalchemybranchesschemalibsqlalchemydatabasespostgrespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/databases/postgres.py (1353 => 1354)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/databases/postgres.py 2006-04-28 23:31:59 UTC (rev 1353) +++ sqlalchemy/branches/schema/lib/sqlalchemy/databases/postgres.py 2006-04-29 00:08:07 UTC (rev 1354) </span><span class="lines">@@ -288,13 +288,13 @@ </span><span class="cx"> </span><span class="cx"> class PGCompiler(ansisql.ANSICompiler): </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="sqlalchemybranchesschemalibsqlalchemyenginebasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py (1353 => 1354)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py 2006-04-28 23:31:59 UTC (rev 1353) +++ sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py 2006-04-29 00:08:07 UTC (rev 1354) </span><span class="lines">@@ -276,12 +276,16 @@ </span><span class="cx"> self.engine.dialect.do_execute(c, statement, parameters, context=context) </span><span class="cx"> except Exception, e: </span><span class="cx"> self.engine.dialect.do_rollback(self.connection) </span><ins>+ if self.close_with_result: + self.close() </ins><span class="cx"> raise exceptions.SQLError(statement, parameters, e) </span><span class="cx"> def _executemany(self, c, statement, parameters, context=None): </span><span class="cx"> try: </span><span class="cx"> self.engine.dialect.do_executemany(c, statement, parameters, context=context) </span><span class="cx"> except Exception, e: </span><span class="cx"> self.engine.dialect.do_rollback(self.connection) </span><ins>+ if self.close_with_result: + self.close() </ins><span class="cx"> raise exceptions.SQLError(statement, parameters, e) </span><span class="cx"> def proxy(self, statement=None, parameters=None): </span><span class="cx"> """executes the given statement string and parameter object. </span><span class="lines">@@ -349,7 +353,7 @@ </span><span class="cx"> """drops a table or index within this engine's database connection given a schema.Table object.""" </span><span class="cx"> self._run_visitor(self.dialect.schemadropper, entity, connection=connection, **kwargs) </span><span class="cx"> def execute_default(self, default, **kwargs): </span><del>- connection = self.connect() </del><ins>+ connection = self.contextual_connect(close_with_result=False) </ins><span class="cx"> try: </span><span class="cx"> return connection.execute_default(default, **kwargs) </span><span class="cx"> finally: </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/schema.py (1353 => 1354)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-04-28 23:31:59 UTC (rev 1353) +++ sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-04-29 00:08:07 UTC (rev 1354) </span><span class="lines">@@ -453,12 +453,17 @@ </span><span class="cx"> </span><span class="cx"> class DefaultGenerator(SchemaItem): </span><span class="cx"> """Base class for column "default" values.""" </span><del>- def __init__(self, for_update=False): </del><ins>+ def __init__(self, for_update=False, metadata=None): </ins><span class="cx"> self.for_update = for_update </span><ins>+ self._metadata = metadata </ins><span class="cx"> def _derived_metadata(self): </span><del>- return self.column.table.metadata </del><ins>+ try: + return self.column.table.metadata + except AttributeError: + return self._metadata </ins><span class="cx"> def _set_parent(self, column): </span><span class="cx"> self.column = column </span><ins>+ self._metadata = self.column.table.metadata </ins><span class="cx"> if self.for_update: </span><span class="cx"> self.column.onupdate = self </span><span class="cx"> else: </span></span></pre></div> <a id="sqlalchemybranchesschematestdefaultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/defaults.py (1353 => 1354)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/defaults.py 2006-04-28 23:31:59 UTC (rev 1353) +++ sqlalchemy/branches/schema/test/defaults.py 2006-04-29 00:08:07 UTC (rev 1354) </span><span class="lines">@@ -72,7 +72,7 @@ </span><span class="cx"> t.delete().execute() </span><span class="cx"> </span><span class="cx"> def teststandalone(self): </span><del>- c = db.engine.connect() </del><ins>+ c = db.engine.contextual_connect() </ins><span class="cx"> x = c.execute(t.c.col1.default) </span><span class="cx"> y = t.c.col2.default.execute() </span><span class="cx"> z = c.execute(t.c.col3.default) </span><span class="lines">@@ -93,6 +93,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"> r = t.insert().execute() </span><span class="cx"> pk = r.last_inserted_ids()[0] </span><span class="lines">@@ -104,6 +110,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): + r = t.insert().execute() + pk = r.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 class="lines">@@ -128,10 +142,10 @@ </span><span class="cx"> </span><span class="cx"> </span><span class="cx"> def teststandalone(self): </span><del>- s = Sequence("my_sequence", engine=db) </del><ins>+ s = Sequence("my_sequence", metadata=testbase.db) </ins><span class="cx"> s.create() </span><span class="cx"> try: </span><del>- x =s.execute() </del><ins>+ x = s.execute() </ins><span class="cx"> self.assert_(x == 1) </span><span class="cx"> finally: </span><span class="cx"> s.drop() </span></span></pre> </div> </div> </body> </html> |
