[Sqlalchemy-commits] [1302] sqlalchemy/branches/schema/test: added non_primary flag to mapper, so yo
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1302] sqlalchemy/branches/schema/test: added non_primary flag to mapper, so you have to explicitly say "i want a non-primary mapper"
|
From: <co...@sq...> - 2006-04-20 01:49:47
|
<!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>[1302] sqlalchemy/branches/schema/test: added non_primary flag to mapper, so you have to explicitly say "i want a non-primary mapper"</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1302</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-19 20:49:31 -0500 (Wed, 19 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>added non_primary flag to mapper, so you have to explicitly say "i want a non-primary mapper"</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingunitofworkpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py</a></li> <li><a href="#sqlalchemybranchesschematestmapperpy">sqlalchemy/branches/schema/test/mapper.py</a></li> <li><a href="#sqlalchemybranchesschematestobjectstorepy">sqlalchemy/branches/schema/test/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py (1301 => 1302)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-19 23:07:23 UTC (rev 1301) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-20 01:49:31 UTC (rev 1302) </span><span class="lines">@@ -41,6 +41,7 @@ </span><span class="cx"> properties = None, </span><span class="cx"> primary_key = None, </span><span class="cx"> is_primary = False, </span><ins>+ non_primary = False, </ins><span class="cx"> inherits = None, </span><span class="cx"> inherit_condition = None, </span><span class="cx"> extension = None, </span><span class="lines">@@ -69,6 +70,7 @@ </span><span class="cx"> self.entity_name = entity_name </span><span class="cx"> self.class_key = ClassKey(class_, entity_name) </span><span class="cx"> self.is_primary = is_primary </span><ins>+ self.non_primary = non_primary </ins><span class="cx"> self.order_by = order_by </span><span class="cx"> self._options = {} </span><span class="cx"> self.always_refresh = always_refresh </span><span class="lines">@@ -210,7 +212,9 @@ </span><span class="cx"> if not mapper_registry.has_key(self.class_key) or self.is_primary or (inherits is not None and inherits._is_primary_mapper()): </span><span class="cx"> objectstore.global_attributes.reset_class_managed(self.class_) </span><span class="cx"> self._init_class() </span><del>- </del><ins>+ elif not non_primary: + raise ArgumentError("Class '%s' already has a primary mapper defined. Use is_primary=True to assign a new primary mapper to the class, or use non_primary=True to create a non primary Mapper" % self.class_) + </ins><span class="cx"> if inherits is not None: </span><span class="cx"> for key, prop in inherits.props.iteritems(): </span><span class="cx"> if not self.props.has_key(key): </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py (1301 => 1302)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-19 23:07:23 UTC (rev 1301) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-20 01:49:31 UTC (rev 1302) </span><span class="lines">@@ -220,7 +220,7 @@ </span><span class="cx"> if self.backref is not None: </span><span class="cx"> self.backref.compile(self) </span><span class="cx"> elif not objectstore.global_attributes.is_class_managed(parent.class_, key): </span><del>- raise ArgumentError("Non-primary property created for attribute '%s' on class '%s', but that attribute is not managed! Insure that the primary mapper for this class defines this property" % (key, parent.class_.__name__)) </del><ins>+ raise ArgumentError("Attempting to assign a new relation '%s' to a non-primary mapper on class '%s'. New relations can only be added to the primary mapper, i.e. the very first mapper created for class '%s' " % (key, parent.class_.__name__, parent.class_.__name__)) </ins><span class="cx"> </span><span class="cx"> self.do_init_subclass(key, parent) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymappingunitofworkpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py (1301 => 1302)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py 2006-04-19 23:07:23 UTC (rev 1301) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py 2006-04-20 01:49:31 UTC (rev 1302) </span><span class="lines">@@ -569,7 +569,11 @@ </span><span class="cx"> of its object list contain dependencies on each other. </span><span class="cx"> </span><span class="cx"> this is not the normal case; this logic only kicks in when something like </span><del>- a hierarchical tree is being represented.""" </del><ins>+ a hierarchical tree is being represented. + + TODO: dont understand this code ? well neither do I ! it takes me + an hour to re-understand this code completely, which is definitely an issue. + """ </ins><span class="cx"> </span><span class="cx"> allobjects = [] </span><span class="cx"> for task in cycles: </span><span class="lines">@@ -584,6 +588,7 @@ </span><span class="cx"> # get put here </span><span class="cx"> extradeplist = [] </span><span class="cx"> </span><ins>+ # this creates a map of UOWTasks mapped to individual objects. </ins><span class="cx"> def get_object_task(parent, obj): </span><span class="cx"> try: </span><span class="cx"> return objecttotask[obj] </span><span class="lines">@@ -593,6 +598,8 @@ </span><span class="cx"> objecttotask[obj] = t </span><span class="cx"> return t </span><span class="cx"> </span><ins>+ # this creates a map of UOWTasks mapped to a particular object + # and a particular dependency processor. </ins><span class="cx"> dependencies = {} </span><span class="cx"> def get_dependency_task(obj, depprocessor): </span><span class="cx"> try: </span></span></pre></div> <a id="sqlalchemybranchesschematestmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/mapper.py (1301 => 1302)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/mapper.py 2006-04-19 23:07:23 UTC (rev 1301) +++ sqlalchemy/branches/schema/test/mapper.py 2006-04-20 01:49:31 UTC (rev 1302) </span><span class="lines">@@ -257,12 +257,14 @@ </span><span class="cx"> self.assert_(False, "should have raised ArgumentError") </span><span class="cx"> except ArgumentError, e: </span><span class="cx"> self.assert_(True) </span><del>- </del><ins>+ + clear_mappers() </ins><span class="cx"> # assert that allow_column_override cancels the error </span><span class="cx"> m = mapper(User, users, properties = { </span><span class="cx"> 'user_name' : relation(mapper(Address, addresses)) </span><span class="cx"> }, allow_column_override=True) </span><span class="cx"> </span><ins>+ clear_mappers() </ins><span class="cx"> # assert that the column being named else where also cancels the error </span><span class="cx"> m = mapper(User, users, properties = { </span><span class="cx"> 'user_name' : relation(mapper(Address, addresses)), </span><span class="lines">@@ -563,8 +565,8 @@ </span><span class="cx"> closedorders = alias(orders, 'closedorders') </span><span class="cx"> m = mapper(User, users, properties = dict( </span><span class="cx"> addresses = relation(mapper(Address, addresses), lazy = False), </span><del>- open_orders = relation(mapper(Order, openorders), primaryjoin = and_(openorders.c.isopen == 1, users.c.user_id==openorders.c.user_id), lazy = True), - closed_orders = relation(mapper(Order, closedorders), primaryjoin = and_(closedorders.c.isopen == 0, users.c.user_id==closedorders.c.user_id), lazy = True) </del><ins>+ open_orders = relation(mapper(Order, openorders, non_primary=True), primaryjoin = and_(openorders.c.isopen == 1, users.c.user_id==openorders.c.user_id), lazy = True), + closed_orders = relation(mapper(Order, closedorders,non_primary=True), primaryjoin = and_(closedorders.c.isopen == 0, users.c.user_id==closedorders.c.user_id), lazy = True) </ins><span class="cx"> )) </span><span class="cx"> l = m.select() </span><span class="cx"> self.assert_result(l, User, </span><span class="lines">@@ -746,8 +748,8 @@ </span><span class="cx"> ordermapper = mapper(Order, orders) </span><span class="cx"> m = mapper(User, users, properties = dict( </span><span class="cx"> addresses = relation(mapper(Address, addresses), lazy = False), </span><del>- open_orders = relation(mapper(Order, openorders), primaryjoin = and_(openorders.c.isopen == 1, users.c.user_id==openorders.c.user_id), lazy = False), - closed_orders = relation(mapper(Order, closedorders), primaryjoin = and_(closedorders.c.isopen == 0, users.c.user_id==closedorders.c.user_id), lazy = False) </del><ins>+ open_orders = relation(mapper(Order, openorders, non_primary=True), primaryjoin = and_(openorders.c.isopen == 1, users.c.user_id==openorders.c.user_id), lazy = False), + closed_orders = relation(mapper(Order, closedorders, non_primary=True), primaryjoin = and_(closedorders.c.isopen == 0, users.c.user_id==closedorders.c.user_id), lazy = False) </ins><span class="cx"> )) </span><span class="cx"> l = m.select() </span><span class="cx"> self.assert_result(l, User, </span></span></pre></div> <a id="sqlalchemybranchesschematestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/objectstore.py (1301 => 1302)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/objectstore.py 2006-04-19 23:07:23 UTC (rev 1301) +++ sqlalchemy/branches/schema/test/objectstore.py 2006-04-20 01:49:31 UTC (rev 1302) </span><span class="lines">@@ -870,12 +870,13 @@ </span><span class="cx"> def testmanytomany(self): </span><span class="cx"> items = orderitems </span><span class="cx"> </span><ins>+ keywordmapper = mapper(Keyword, keywords) + </ins><span class="cx"> items.select().execute() </span><span class="cx"> m = mapper(Item, items, properties = dict( </span><del>- keywords = relation(mapper(Keyword, keywords), itemkeywords, lazy = False), </del><ins>+ keywords = relation(keywordmapper, itemkeywords, lazy = False), </ins><span class="cx"> )) </span><span class="cx"> </span><del>- keywordmapper = mapper(Keyword, keywords) </del><span class="cx"> </span><span class="cx"> data = [Item, </span><span class="cx"> {'item_name': 'mm_item1', 'keywords' : (Keyword,[{'name': 'big'},{'name': 'green'}, {'name': 'purple'},{'name': 'round'}])}, </span><span class="lines">@@ -971,7 +972,7 @@ </span><span class="cx"> # the reorganization of mapper construction affected this, but was fixed again </span><span class="cx"> m = mapper(Item, items, properties = dict( </span><span class="cx"> keywords = relation(mapper(IKAssociation, itemkeywords, properties = dict( </span><del>- keyword = relation(mapper(Keyword, keywords), lazy = False, uselist = False) </del><ins>+ keyword = relation(mapper(Keyword, keywords, non_primary=True), lazy = False, uselist = False) </ins><span class="cx"> ), primary_key = [itemkeywords.c.item_id, itemkeywords.c.keyword_id]), </span><span class="cx"> lazy = False) </span><span class="cx"> )) </span></span></pre> </div> </div> </body> </html> |
