[Sqlalchemy-commits] [1492] sqlalchemy/branches/schema/lib/sqlalchemy/orm: single table inheritance
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1492] sqlalchemy/branches/schema/lib/sqlalchemy/orm: single table inheritance fix, if local_table is None it gets set to that of the inheriting mapper
<!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>[1492] sqlalchemy/branches/schema/lib/sqlalchemy/orm: single table inheritance fix, if local_table is None it gets set to that of the inheriting mapper</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1492</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-23 10:40:29 -0500 (Tue, 23 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>single table inheritance fix, if local_table is None it gets set to that of the inheriting mapper</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemaexamplespolymorphsinglepy">sqlalchemy/branches/schema/examples/polymorph/single.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemaexamplespolymorphsinglepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/polymorph/single.py (1491 => 1492)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/polymorph/single.py 2006-05-23 15:02:00 UTC (rev 1491) +++ sqlalchemy/branches/schema/examples/polymorph/single.py 2006-05-23 15:40:29 UTC (rev 1492) </span><span class="lines">@@ -12,6 +12,7 @@ </span><span class="cx"> Column('company_id', Integer, ForeignKey('companies.company_id')), </span><span class="cx"> Column('name', String(50)), </span><span class="cx"> Column('type', String(20)), </span><ins>+ Column('status', String(20)), </ins><span class="cx"> Column('engineer_name', String(50)), </span><span class="cx"> Column('primary_language', String(50)), </span><span class="cx"> Column('manager_name', String(50)) </span><span class="lines">@@ -39,8 +40,8 @@ </span><span class="cx"> return "Company %s" % self.name </span><span class="cx"> </span><span class="cx"> person_mapper = mapper(Person, employees_table, polymorphic_on=employees_table.c.type, polymorphic_identity='person') </span><del>-manager_mapper = mapper(Manager, inherits=employee_mapper, polymorphic_identity='manager') -engineer_mapper = mapper(Engineer, inherits=employee_mapper, polymorphic_identity='engineer') </del><ins>+manager_mapper = mapper(Manager, inherits=person_mapper, polymorphic_identity='manager') +engineer_mapper = mapper(Engineer, inherits=person_mapper, polymorphic_identity='engineer') </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1491 => 1492)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-23 15:02:00 UTC (rev 1491) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-23 15:40:29 UTC (rev 1492) </span><span class="lines">@@ -127,6 +127,8 @@ </span><span class="cx"> if self.class_.__mro__[1] != inherits.class_: </span><span class="cx"> raise exceptions.ArgumentError("Class '%s' does not inherit from '%s'" % (self.class_.__name__, inherits.class_.__name__)) </span><span class="cx"> # inherit_condition is optional. </span><ins>+ if local_table is None: + self.local_table = local_table = inherits.local_table </ins><span class="cx"> if not local_table is inherits.local_table: </span><span class="cx"> if concrete: </span><span class="cx"> self._synchronizer= None </span><span class="lines">@@ -147,6 +149,7 @@ </span><span class="cx"> self._synchronizer.compile(self.mapped_table.onclause, util.HashSet([inherits.local_table]), sqlutil.TableFinder(self.local_table)) </span><span class="cx"> else: </span><span class="cx"> self._synchronizer = None </span><ins>+ self.mapped_table = self.local_table </ins><span class="cx"> self.inherits = inherits </span><span class="cx"> if polymorphic_identity is not None: </span><span class="cx"> inherits.add_polymorphic_mapping(polymorphic_identity, self) </span></span></pre> </div> </div> </body> </html> |
