From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 11 Feb 2006 16:33:09 +0000 (+0000)
Subject: fix to manytomany
X-Git-Tag: rel_0_1_0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b799b44954093451fa22fa4193858bf67730b7c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix to manytomany
---

diff --git a/doc/build/content/datamapping.myt b/doc/build/content/datamapping.myt
index 4130168d12..bd4f8dd912 100644
--- a/doc/build/content/datamapping.myt
+++ b/doc/build/content/datamapping.myt
@@ -598,13 +598,13 @@ VALUES (:address_id, :user_id, :email_address)
         <&|formatting.myt:code&>
     articles = Table('articles', engine,
         Column('article_id', Integer, primary_key = True),
-        Column('article_headline', String(150), key='headline'),
-        Column('article_body', TEXT, key='body'),
+        Column('headline', String(150), key='headline'),
+        Column('body', TEXT, key='body'),
     )
 
     keywords = Table('keywords', engine,
         Column('keyword_id', Integer, primary_key = True),
-        Column('keyword_name', String(50))
+        Column('name', String(50))
     )
 
     itemkeywords = Table('article_keywords', engine,
@@ -619,11 +619,11 @@ VALUES (:address_id, :user_id, :email_address)
 
     class Article(object):
         pass
-        
+    
     # define a mapper that does many-to-many on the 'itemkeywords' association 
     # table
     Article.mapper = mapper(Article, articles, properties = dict(
-            keywords = relation(Keyword, keywords, itemkeywords, lazy=False)
+            keywords = relation(mapper(Keyword, keywords), keywords, itemkeywords, lazy=False)
             )
         )