[Sqlalchemy-commits] [1054] sqlalchemy/trunk/test: implemented SyncRules for mapper with inheritance
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1054] sqlalchemy/trunk/test: implemented SyncRules for mapper with inheritance relationship, fixes [ticket:81]
|
From: <co...@sq...> - 2006-02-26 22:23:16
|
<!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>[1054] sqlalchemy/trunk/test: implemented SyncRules for mapper with inheritance relationship, fixes [ticket:81]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1054</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-26 16:23:01 -0600 (Sun, 26 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>implemented SyncRules for mapper with inheritance relationship, fixes [ticket:81] TableFinder becomes a list-implementing object (should probably create clauseutils or sqlutils for these little helper visitors)</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingsyncpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/sync.py</a></li> <li><a href="#sqlalchemytrunktestinheritancepy">sqlalchemy/trunk/test/inheritance.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1053 => 1054)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-26 21:45:10 UTC (rev 1053) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-02-26 22:23:01 UTC (rev 1054) </span><span class="lines">@@ -9,6 +9,7 @@ </span><span class="cx"> import sqlalchemy.schema as schema </span><span class="cx"> import sqlalchemy.engine as engine </span><span class="cx"> import sqlalchemy.util as util </span><ins>+import sync </ins><span class="cx"> from sqlalchemy.exceptions import * </span><span class="cx"> import objectstore </span><span class="cx"> import sys </span><span class="lines">@@ -64,14 +65,15 @@ </span><span class="cx"> self.primarytable = inherits.primarytable </span><span class="cx"> # inherit_condition is optional since the join can figure it out </span><span class="cx"> self.table = sql.join(inherits.table, table, inherit_condition) </span><ins>+ self._synchronizer = sync.ClauseSynchronizer(self, self, sync.ONETOMANY) + self._synchronizer.compile(self.table.onclause, inherits.tables, TableFinder(table)) </ins><span class="cx"> else: </span><span class="cx"> self.primarytable = self.table </span><del>- </del><ins>+ self._synchronizer = None + </ins><span class="cx"> # locate all tables contained within the "table" passed in, which </span><span class="cx"> # may be a join or other construct </span><del>- tf = TableFinder() - self.table.accept_visitor(tf) - self.tables = tf.tables </del><ins>+ self.tables = TableFinder(self.table) </ins><span class="cx"> </span><span class="cx"> # determine primary key columns, either passed in, or get them from our set of tables </span><span class="cx"> self.pks_by_table = {} </span><span class="lines">@@ -170,7 +172,6 @@ </span><span class="cx"> self.props[key] = prop.copy() </span><span class="cx"> self.props[key].parent = self </span><span class="cx"> self.props[key].key = None # force re-init </span><del>- </del><span class="cx"> l = [(key, prop) for key, prop in self.props.iteritems()] </span><span class="cx"> for key, prop in l: </span><span class="cx"> if getattr(prop, 'key', None) is None: </span><span class="lines">@@ -589,6 +590,8 @@ </span><span class="cx"> for c in table.c: </span><span class="cx"> if self._getattrbycolumn(obj, c) is None: </span><span class="cx"> self._setattrbycolumn(obj, c, row[c]) </span><ins>+ if self._synchronizer is not None: + self._synchronizer.execute(obj, obj) </ins><span class="cx"> self.extension.after_insert(self, obj) </span><span class="cx"> </span><span class="cx"> def delete_obj(self, objects, uow): </span><span class="lines">@@ -878,11 +881,20 @@ </span><span class="cx"> </span><span class="cx"> class TableFinder(sql.ClauseVisitor): </span><span class="cx"> """given a Clause, locates all the Tables within it into a list.""" </span><del>- def __init__(self): </del><ins>+ def __init__(self, table): </ins><span class="cx"> self.tables = [] </span><ins>+ table.accept_visitor(self) </ins><span class="cx"> def visit_table(self, table): </span><span class="cx"> self.tables.append(table) </span><del>- </del><ins>+ def __getitem__(self, i): + return self.tables[i] + def __iter__(self): + return iter(self.tables) + def __contains__(self, obj): + return obj in self.tables + def __add__(self, obj): + return self.tables + obj + </ins><span class="cx"> def hash_key(obj): </span><span class="cx"> if obj is None: </span><span class="cx"> return 'None' </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1053 => 1054)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-26 21:45:10 UTC (rev 1053) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-26 22:23:01 UTC (rev 1054) </span><span class="lines">@@ -49,7 +49,9 @@ </span><span class="cx"> def execute(self, instance, row, identitykey, imap, isnew): </span><span class="cx"> if isnew: </span><span class="cx"> instance.__dict__[self.key] = row[self.columns[0]] </span><del>- </del><ins>+ def __repr__(self): + return "ColumnProperty(%s)" % repr([str(c) for c in self.columns]) + </ins><span class="cx"> class DeferredColumnProperty(ColumnProperty): </span><span class="cx"> """describes an object attribute that corresponds to a table column, which also </span><span class="cx"> will "lazy load" its value from the table. this is per-column lazy loading.""" </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingsyncpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/sync.py (1053 => 1054)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/sync.py 2006-02-26 21:45:10 UTC (rev 1053) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/sync.py 2006-02-26 22:23:01 UTC (rev 1054) </span><span class="lines">@@ -1,7 +1,6 @@ </span><span class="cx"> import sqlalchemy.sql as sql </span><span class="cx"> import sqlalchemy.schema as schema </span><span class="cx"> from sqlalchemy.exceptions import * </span><del>-import properties </del><span class="cx"> </span><span class="cx"> """contains the ClauseSynchronizer class which is used to map attributes between two objects </span><span class="cx"> in a manner corresponding to a SQL clause that compares column values.""" </span><span class="lines">@@ -74,7 +73,7 @@ </span><span class="cx"> if len(self.syncrules) == rules_added: </span><span class="cx"> raise ArgumentError("No syncrules generated for join criterion " + str(sqlclause)) </span><span class="cx"> </span><del>- def execute(self, source, dest, obj, child, clearkeys): </del><ins>+ def execute(self, source, dest, obj=None, child=None, clearkeys=None): </ins><span class="cx"> for rule in self.syncrules: </span><span class="cx"> rule.execute(source, dest, obj, child, clearkeys) </span><span class="cx"> </span><span class="lines">@@ -110,7 +109,7 @@ </span><span class="cx"> if isinstance(dest, dict): </span><span class="cx"> dest[self.dest_column.key] = value </span><span class="cx"> else: </span><del>- #print "SYNC VALUE", value, "TO", dest </del><ins>+ #print "SYNC VALUE", value, "TO", dest, self.source_column, self.dest_column </ins><span class="cx"> self.dest_mapper._setattrbycolumn(dest, self.dest_column, value) </span><span class="cx"> </span><span class="cx"> class BinaryVisitor(sql.ClauseVisitor): </span></span></pre></div> <a id="sqlalchemytrunktestinheritancepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/inheritance.py (1053 => 1054)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/inheritance.py 2006-02-26 21:45:10 UTC (rev 1053) +++ sqlalchemy/trunk/test/inheritance.py 2006-02-26 22:23:01 UTC (rev 1054) </span><span class="lines">@@ -127,8 +127,10 @@ </span><span class="cx"> return "Bar(%s)" % self.data </span><span class="cx"> </span><span class="cx"> Bar.mapper = mapper(Bar, bar, inherits=Foo.mapper, properties = { </span><del>- # TODO: use syncrules for this - 'id':[bar.c.bid, foo.c.id] </del><ins>+ # the old way, you needed to explicitly set up a compound + # column like this. but now the mapper uses SyncRules to match up + # the parent/child inherited columns + #'id':[bar.c.bid, foo.c.id] </ins><span class="cx"> }) </span><span class="cx"> </span><span class="cx"> Bar.mapper.add_property('foos', relation(Foo.mapper, foo_bar, primaryjoin=bar.c.bid==foo_bar.c.bar_id, secondaryjoin=foo_bar.c.foo_id==foo.c.id, lazy=False)) </span></span></pre> </div> </div> </body> </html> |
