[Sqlalchemy-commits] [1085] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: rudimentary support
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1085] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: rudimentary support for many-to-many relation.
|
From: <co...@sq...> - 2006-03-03 14:46:49
|
<!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>[1085] sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py: rudimentary support for many-to-many relation.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1085</dd> <dt>Author</dt> <dd>jeff</dd> <dt>Date</dt> <dd>2006-03-03 08:46:39 -0600 (Fri, 03 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>rudimentary support for many-to-many relation. Still requires a separately defined intermediate table.</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 (1084 => 1085)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py 2006-03-03 00:24:41 UTC (rev 1084) +++ sqlalchemy/trunk/lib/sqlalchemy/ext/activemapper.py 2006-03-03 14:46:39 UTC (rev 1085) </span><span class="lines">@@ -25,8 +25,8 @@ </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', False ) - self.indexed = kwargs.pop( 'indexed', self.unique ) </del><ins>+# self.unique = kwargs.pop( 'unique', None ) +# self.index = kwargs.pop( 'indexed', None ) </ins><span class="cx"> self.kwargs = kwargs </span><span class="cx"> self.args = args </span><span class="cx"> </span><span class="lines">@@ -34,15 +34,16 @@ </span><span class="cx"> # declarative relationship declaration </span><span class="cx"> # </span><span class="cx"> class relationship(object): </span><del>- def __init__(self, classname, colname=None, backref=None, private=False, lazy=True, uselist=True): </del><ins>+ def __init__(self, classname, colname=None, backref=None, private=False, + lazy=True, uselist=True, secondary=None): </ins><span class="cx"> self.classname = classname </span><span class="cx"> self.colname = colname </span><span class="cx"> self.backref = backref </span><span class="cx"> self.private = private </span><span class="cx"> self.lazy = lazy </span><span class="cx"> self.uselist = uselist </span><ins>+ self.secondary = secondary </ins><span class="cx"> </span><del>- </del><span class="cx"> class one_to_many(relationship): </span><span class="cx"> def __init__(self, classname, colname=None, backref=None, private=False, lazy=True): </span><span class="cx"> relationship.__init__(self, classname, colname, backref, private, lazy, uselist=True) </span><span class="lines">@@ -52,6 +53,10 @@ </span><span class="cx"> def __init__(self, classname, colname=None, backref=None, private=False, lazy=True): </span><span class="cx"> relationship.__init__(self, classname, colname, backref, private, lazy, uselist=False) </span><span class="cx"> </span><ins>+class many_to_many(relationship): + def __init__(self, classname, secondary, backref=None, lazy=True): + relationship.__init__(self, classname, None, backref, False, lazy, + uselist=True, secondary=secondary) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> # </span><span class="lines">@@ -73,7 +78,8 @@ </span><span class="cx"> relations = {} </span><span class="cx"> for propname, reldesc in klass.relations.items(): </span><span class="cx"> relclass = ActiveMapperMeta.classes[reldesc.classname] </span><del>- relations[propname] = relation(relclass, </del><ins>+ relations[propname] = relation(relclass.mapper, + secondary=reldesc.secondary, </ins><span class="cx"> backref=reldesc.backref, </span><span class="cx"> private=reldesc.private, </span><span class="cx"> lazy=reldesc.lazy, </span><span class="lines">@@ -122,10 +128,10 @@ </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><ins>+# if value.indexed: +# # create a Index object for the column +# index= Index( "%s_idx" % (value.colname or name), +# col, unique= value.unique ) </ins><span class="cx"> continue </span><span class="cx"> </span><span class="cx"> if isinstance(value, relationship): </span><span class="lines">@@ -155,4 +161,5 @@ </span><span class="cx"> </span><span class="cx"> def create_tables(): </span><span class="cx"> for klass in ActiveMapperMeta.classes.values(): </span><del>- klass.table.create() </del><span class="cx">\ No newline at end of file </span><ins>+ klass.table.create() + </ins></span></pre> </div> </div> </body> </html> |
