[Sqlalchemy-commits] [1042] sqlalchemy/trunk/doc/build/content/datamapping.myt: fixed many-to-many e
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1042] sqlalchemy/trunk/doc/build/content/datamapping.myt: fixed many-to-many example, which was utterly incorrect in many ways
|
From: <co...@sq...> - 2006-02-26 00:04:57
|
<!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>[1042] sqlalchemy/trunk/doc/build/content/datamapping.myt: fixed many-to-many example, which was utterly incorrect in many ways</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1042</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-25 18:04:43 -0600 (Sat, 25 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixed many-to-many example, which was utterly incorrect in many ways</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkdocbuildcontentdatamappingmyt">sqlalchemy/trunk/doc/build/content/datamapping.myt</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkdocbuildcontentdatamappingmyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/content/datamapping.myt (1041 => 1042)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/content/datamapping.myt 2006-02-25 17:50:46 UTC (rev 1041) +++ sqlalchemy/trunk/doc/build/content/datamapping.myt 2006-02-26 00:04:43 UTC (rev 1042) </span><span class="lines">@@ -619,7 +619,7 @@ </span><span class="cx"> </span><span class="cx"> keywords = Table('keywords', engine, </span><span class="cx"> Column('keyword_id', Integer, primary_key = True), </span><del>- Column('name', String(50)) </del><ins>+ Column('keyword_name', String(50)) </ins><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> itemkeywords = Table('article_keywords', engine, </span><span class="lines">@@ -630,7 +630,7 @@ </span><span class="cx"> # class definitions </span><span class="cx"> class Keyword(object): </span><span class="cx"> def __init__(self, name = None): </span><del>- self.name = name </del><ins>+ self.keyword_name = name </ins><span class="cx"> </span><span class="cx"> class Article(object): </span><span class="cx"> pass </span><span class="lines">@@ -638,7 +638,7 @@ </span><span class="cx"> # define a mapper that does many-to-many on the 'itemkeywords' association </span><span class="cx"> # table </span><span class="cx"> Article.mapper = mapper(Article, articles, properties = dict( </span><del>- keywords = relation(mapper(Keyword, keywords), keywords, itemkeywords, lazy=False) </del><ins>+ keywords = relation(mapper(Keyword, keywords), itemkeywords, lazy=False) </ins><span class="cx"> ) </span><span class="cx"> ) </span><span class="cx"> </span><span class="lines">@@ -666,7 +666,7 @@ </span><span class="cx"> [{'keyword_id': 1, 'article_id': 1}, {'keyword_id': 2, 'article_id': 1}] </span><span class="cx"> </&> </span><span class="cx"> # select articles based on a keyword. select_by will handle the extra joins. </span><del>- <&formatting.myt:poplink&>articles = Article.mapper.select_by(keyword='politics') </del><ins>+ <&formatting.myt:poplink&>articles = Article.mapper.select_by(keyword_name='politics') </ins><span class="cx"> <&|formatting.myt:codepopper, link="sql" &> </span><span class="cx"> SELECT articles.article_id AS articles_article_id, </span><span class="cx"> articles.article_headline AS articles_article_headline, </span></span></pre> </div> </div> </body> </html> |
