summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/mapper.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-10-17 00:12:30 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-10-17 00:12:30 +0000
commitd9d39f0a8de4bc94f5c6b1a8cbc9f17d0ec511d8 (patch)
treea4d9aefc856dcc7343697ef6ca4377772439e8fd /lib/sqlalchemy/mapper.py
parent988bf12461740244f8a4baef52779cf79eea48e0 (diff)
downloadsqlalchemy-d9d39f0a8de4bc94f5c6b1a8cbc9f17d0ec511d8.tar.gz
Diffstat (limited to 'lib/sqlalchemy/mapper.py')
-rw-r--r--lib/sqlalchemy/mapper.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index cb5ba8b62..eee91f3b0 100644
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -630,8 +630,8 @@ class PropertyLoader(MapperProperty):
self.key = key
self.parent = parent
- if self.parent.table is self.target and self.foreignkey is None:
- raise "Circular relationship requires explicit 'foreignkey' parameter"
+# if self.parent.table is self.target and self.foreignkey is None:
+ # raise "Circular relationship requires explicit 'foreignkey' parameter"
# if join conditions were not specified, figure them out based on foreign keys
if self.secondary is not None:
@@ -666,11 +666,6 @@ class PropertyLoader(MapperProperty):
objectstore.uow().register_attribute(parent.class_, key, uselist = self.uselist, deleteremoved = self.private)
def _get_direction(self):
-# if self.thiscol is not None:
- # if self.thiscol.primary_key:
- # return PropertyLoader.LEFT
- # else:
- # return PropertyLoader.RIGHT
if self.parent.primarytable is self.target:
if self.foreignkey.primary_key:
return PropertyLoader.RIGHT