[Sqlalchemy-commits] [1391] sqlalchemy/branches/schema/doc/build/content: polymorphic_ident=>polymor
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1391] sqlalchemy/branches/schema/doc/build/content: polymorphic_ident=>polymorphic_identity
|
From: <co...@sq...> - 2006-05-04 21:36:11
|
<!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>[1391] sqlalchemy/branches/schema/doc/build/content: polymorphic_ident=>polymorphic_identity</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1391</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-04 16:36:01 -0500 (Thu, 04 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>polymorphic_ident=>polymorphic_identity</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcontentadv_datamappingtxt">sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt</a></li> <li><a href="#sqlalchemybranchesschemaexamplespolymorphconcretepy">sqlalchemy/branches/schema/examples/polymorph/concrete.py</a></li> <li><a href="#sqlalchemybranchesschemaexamplespolymorphpolymorphpy">sqlalchemy/branches/schema/examples/polymorph/polymorph.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="sqlalchemybranchesschemadocbuildcontentadv_datamappingtxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt (1390 => 1391)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt 2006-05-04 21:25:45 UTC (rev 1390) +++ sqlalchemy/branches/schema/doc/build/content/adv_datamapping.txt 2006-05-04 21:36:01 UTC (rev 1391) </span><span class="lines">@@ -411,8 +411,8 @@ </span><span class="cx"> }, 'type', 'pjoin') </span><span class="cx"> </span><span class="cx"> employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type) </span><del>- manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_ident='manager') - engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, concrete=True, polymorphic_ident='engineer') </del><ins>+ manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='manager') + engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='engineer') </ins><span class="cx"> </span><span class="cx"> A future release of SQLALchemy might better merge the generated UNION into the mapper construction phase. </span><span class="cx"> </span><span class="lines">@@ -441,9 +441,9 @@ </span><span class="cx"> 'person':people.select(people.c.type=='person'), </span><span class="cx"> }, None, 'pjoin') </span><span class="cx"> </span><del>- person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_ident='person') - mapper(Engineer, engineers, inherits=person_mapper, polymorphic_ident='engineer') - mapper(Manager, managers, inherits=person_mapper, polymorphic_ident='manager') </del><ins>+ person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_identity='person') + mapper(Engineer, engineers, inherits=person_mapper, polymorphic_identity='engineer') + mapper(Manager, managers, inherits=person_mapper, polymorphic_identity='manager') </ins><span class="cx"> </span><span class="cx"> The join condition in an inheritance relationship can be specified explicitly, using `inherit_condition`: </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemaexamplespolymorphconcretepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/polymorph/concrete.py (1390 => 1391)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/polymorph/concrete.py 2006-05-04 21:25:45 UTC (rev 1390) +++ sqlalchemy/branches/schema/examples/polymorph/concrete.py 2006-05-04 21:36:01 UTC (rev 1391) </span><span class="lines">@@ -45,8 +45,8 @@ </span><span class="cx"> }, 'type', 'pjoin') </span><span class="cx"> </span><span class="cx"> employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type) </span><del>-manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_ident='manager') -engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, concrete=True, polymorphic_ident='engineer') </del><ins>+manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='manager') +engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='engineer') </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> session = create_session(bind_to=engine) </span></span></pre></div> <a id="sqlalchemybranchesschemaexamplespolymorphpolymorphpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/polymorph/polymorph.py (1390 => 1391)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/polymorph/polymorph.py 2006-05-04 21:25:45 UTC (rev 1390) +++ sqlalchemy/branches/schema/examples/polymorph/polymorph.py 2006-05-04 21:36:01 UTC (rev 1391) </span><span class="lines">@@ -63,9 +63,9 @@ </span><span class="cx"> 'person':people.select(people.c.type=='person'), </span><span class="cx"> }, None, 'pjoin') </span><span class="cx"> </span><del>-person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_ident='person') -mapper(Engineer, engineers, inherits=person_mapper, polymorphic_ident='engineer') -mapper(Manager, managers, inherits=person_mapper, polymorphic_ident='manager') </del><ins>+person_mapper = mapper(Person, people, select_table=person_join, polymorphic_on=person_join.c.type, polymorphic_identity='person') +mapper(Engineer, engineers, inherits=person_mapper, polymorphic_identity='engineer') +mapper(Manager, managers, inherits=person_mapper, polymorphic_identity='manager') </ins><span class="cx"> </span><span class="cx"> mapper(Company, companies, properties={ </span><span class="cx"> 'employees': relation(Person, lazy=True, private=True, backref='company') </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1390 => 1391)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-04 21:25:45 UTC (rev 1390) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-04 21:36:01 UTC (rev 1391) </span><span class="lines">@@ -53,7 +53,7 @@ </span><span class="cx"> version_id_col = None, </span><span class="cx"> polymorphic_on=None, </span><span class="cx"> polymorphic_map=None, </span><del>- polymorphic_ident=None, </del><ins>+ polymorphic_identity=None, </ins><span class="cx"> concrete=False, </span><span class="cx"> select_table=None): </span><span class="cx"> </span><span class="lines">@@ -136,9 +136,9 @@ </span><span class="cx"> else: </span><span class="cx"> self._synchronizer = None </span><span class="cx"> self.inherits = inherits </span><del>- if polymorphic_ident is not None: - inherits.add_polymorphic_mapping(polymorphic_ident, self) - self.polymorphic_ident = polymorphic_ident </del><ins>+ if polymorphic_identity is not None: + inherits.add_polymorphic_mapping(polymorphic_identity, self) + self.polymorphic_identity = polymorphic_identity </ins><span class="cx"> if self.polymorphic_on is None: </span><span class="cx"> self.effective_polymorphic_on = inherits.effective_polymorphic_on </span><span class="cx"> else: </span><span class="lines">@@ -147,9 +147,9 @@ </span><span class="cx"> self._synchronizer = None </span><span class="cx"> self.inherits = None </span><span class="cx"> self.mapped_table = self.local_table </span><del>- if polymorphic_ident is not None: - self.add_polymorphic_mapping(polymorphic_ident, self) - self.polymorphic_ident = polymorphic_ident </del><ins>+ if polymorphic_identity is not None: + self.add_polymorphic_mapping(polymorphic_identity, self) + self.polymorphic_identity = polymorphic_identity </ins><span class="cx"> self.effective_polymorphic_on = self.polymorphic_on </span><span class="cx"> </span><span class="cx"> if select_table is not None: </span><span class="lines">@@ -608,7 +608,7 @@ </span><span class="cx"> params[col.key] = value </span><span class="cx"> elif self.effective_polymorphic_on is not None and col.original is self.effective_polymorphic_on.original: </span><span class="cx"> if isinsert: </span><del>- value = self.polymorphic_ident </del><ins>+ value = self.polymorphic_identity </ins><span class="cx"> if col.default is None or value is not None: </span><span class="cx"> params[col.key] = value </span><span class="cx"> else: </span></span></pre> </div> </div> </body> </html> |
