From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 12 Feb 2006 06:39:29 +0000 (+0000)
Subject: 'column' function (make a ColumnClause) is more useful from sql module, removed ... 
X-Git-Tag: rel_0_1_0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5993e0ba3731bf22d34f5743e916c46cb0edbde;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

'column' function (make a ColumnClause) is more useful from sql module, removed 'column' (make a ColumnProperty) from __init__
---

diff --git a/lib/sqlalchemy/mapping/__init__.py b/lib/sqlalchemy/mapping/__init__.py
index f3a2ac5094..538559e43c 100644
--- a/lib/sqlalchemy/mapping/__init__.py
+++ b/lib/sqlalchemy/mapping/__init__.py
@@ -18,8 +18,7 @@ from mapper import *
 from properties import *
 import mapper as mapperlib
 
-__all__ = ['relation', 'eagerload', 'lazyload', 'noload', 'deferred',  'column', 
-        'defer', 'undefer',
+__all__ = ['relation', 'eagerload', 'lazyload', 'noload', 'deferred', 'defer', 'undefer',
         'mapper', 'clear_mappers', 'objectstore', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension',
         'assign_mapper'
         ]
@@ -39,9 +38,6 @@ def _relation_loader(mapper, secondary=None, primaryjoin=None, secondaryjoin=Non
     else:
         return EagerLoader(mapper, secondary, primaryjoin, secondaryjoin, **kwargs)
 
-def column(*columns, **kwargs):
-    return ColumnProperty(*columns, **kwargs)
-    
 def deferred(*columns, **kwargs):
     return DeferredColumnProperty(*columns, **kwargs)