From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 24 Dec 2005 15:23:14 +0000 (+0000)
Subject: ColumnProperty -> column
X-Git-Tag: rel_0_1_0~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7df1ed6199ce90bd63928c57456967b16145e3d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

ColumnProperty -> column
---

diff --git a/test/objectstore.py b/test/objectstore.py
index 9da6437d3f..63a694de2b 100644
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -181,8 +181,8 @@ class SaveTest(AssertMixin):
         usersaddresses = sql.join(users, addresses, users.c.user_id == addresses.c.user_id)
         m = mapper(User, usersaddresses, primarytable = users,  
             properties = dict(
-                email = ColumnProperty(addresses.c.email_address), 
-                foo_id = ColumnProperty(users.c.user_id, addresses.c.user_id)
+                email = column(addresses.c.email_address), 
+                foo_id = column(users.c.user_id, addresses.c.user_id)
                 )
             )