diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-09 19:20:49 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-09 19:20:49 +0000 |
| commit | 6840fc6bb635f78df85077beeaaca52d31836aff (patch) | |
| tree | d165f49f262dca0dc349b5130fa5f91f8177e459 /lib/sqlalchemy/orm | |
| parent | 84ec085d474f5f8029a52d7f6a24deda56bdfa87 (diff) | |
| download | sqlalchemy-6840fc6bb635f78df85077beeaaca52d31836aff.tar.gz | |
- 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)
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |