From 6840fc6bb635f78df85077beeaaca52d31836aff Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 9 May 2008 19:20:49 +0000 Subject: - more portable tests for eager/inheritance joins - bumped 2.4 call count for profile test_select - don't need initialize_properties() during reentrant compile() call (for now) --- lib/sqlalchemy/orm/mapper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 6d79f6cd5..f8cf4e6ed 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -347,7 +347,9 @@ class Mapper(object): _COMPILE_MUTEX.acquire() global _already_compiling if _already_compiling: - self.__initialize_properties() + # re-entrance to compile() occurs rarely, when a class-mapped construct is + # used within a ForeignKey, something that is possible + # when using the declarative layer return _already_compiling = True try: -- cgit v1.2.1