[Sqlalchemy-commits] [1270] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: Added preliminary s
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1270] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: Added preliminary support for inheritance.
|
From: <co...@sq...> - 2006-04-08 17:12:08
|
<!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>[1270] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: Added preliminary support for inheritance.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1270</dd> <dt>Author</dt> <dd>jeff</dd> <dt>Date</dt> <dd>2006-04-08 12:11:53 -0500 (Sat, 08 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>Added preliminary support for inheritance.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyextactivemapperpy">sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyextactivemapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py (1269 => 1270)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py 2006-04-07 06:34:37 UTC (rev 1269) +++ sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py 2006-04-08 17:11:53 UTC (rev 1270) </span><span class="lines">@@ -1,4 +1,4 @@ </span><del>-from sqlalchemy import objectstore, create_engine, assign_mapper, relation, mapper </del><ins>+from sqlalchemy import objectstore, create_engine, assign_mapper, relation, mapper, join </ins><span class="cx"> from sqlalchemy import and_, or_ </span><span class="cx"> from sqlalchemy import Table, Column, ForeignKey </span><span class="cx"> from sqlalchemy.ext.proxy import ProxyEngine </span><span class="lines">@@ -25,8 +25,6 @@ </span><span class="cx"> self.colname = colname </span><span class="cx"> self.foreign_key = foreign_key </span><span class="cx"> self.primary_key = primary_key </span><del>-# self.unique = kwargs.pop( 'unique', None ) -# self.index = kwargs.pop( 'indexed', None ) </del><span class="cx"> self.kwargs = kwargs </span><span class="cx"> self.args = args </span><span class="cx"> </span><span class="lines">@@ -84,7 +82,8 @@ </span><span class="cx"> private=reldesc.private, </span><span class="cx"> lazy=reldesc.lazy, </span><span class="cx"> uselist=reldesc.uselist) </span><del>- assign_mapper(klass, klass.table, properties=relations) </del><ins>+ assign_mapper(klass, klass.table, properties=relations, + inherits=getattr(klass, "_base_mapper", None)) </ins><span class="cx"> if was_deferred: __deferred_classes__.remove(klass) </span><span class="cx"> </span><span class="cx"> if not was_deferred: </span><span class="lines">@@ -128,17 +127,18 @@ </span><span class="cx"> primary_key=value.primary_key, </span><span class="cx"> *value.args, **value.kwargs) </span><span class="cx"> columns.append(col) </span><del>-# if value.indexed: -# # create a Index object for the column -# index= Index( "%s_idx" % (value.colname or name), -# col, unique= value.unique ) </del><span class="cx"> continue </span><span class="cx"> </span><span class="cx"> if isinstance(value, relationship): </span><span class="cx"> relations[name] = value </span><span class="cx"> assert _engine is not None, "No engine specified" </span><span class="cx"> cls.table = Table(table_name, _engine, *columns) </span><del>- assign_mapper(cls, cls.table) </del><ins>+ # check for inheritence + if hasattr( bases[0], "mapping" ): + cls._base_mapper= bases[0].mapper + assign_mapper(cls, cls.table, inherits=cls._base_mapper) + else: + assign_mapper(cls, cls.table) </ins><span class="cx"> cls.relations = relations </span><span class="cx"> ActiveMapperMeta.classes[clsname] = cls </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
