still fixing compilation.....dum de dum.....

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index c90f83e5979674df19eac263f693b6d2d629fd54..7261bde2d77ba255c25d000265a2b71ebe0e11d7 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -220,7 +220,6 @@ class Mapper(object):
         triggerset = _compile_triggers.pop(self.class_key, None)
         if triggerset is not None:
             for rec in triggerset:
-                print "looking at:", rec
                 rec.compiled(self.class_key)
                 if rec.can_compile():
                     rec.mapper._do_compile()
@@ -417,7 +416,7 @@ class Mapper(object):
             # the column properties will attempt to be translated from the selectable unit
             # of the parent mapper to this mapper's selectable unit.
             self.inherits._inheriting_mappers.add(self)
-            for key, prop in self.inherits.props.iteritems():
+            for key, prop in self.inherits.__props.iteritems():
                 if not self.__props.has_key(key):
                     p = prop.copy()
                     if p.adapt(self):
@@ -469,7 +468,7 @@ class Mapper(object):
                         props[key] = self.select_table.corresponding_column(prop)
                     elif (isinstance(prop, list) and sql.is_column(prop[0])):
                         props[key] = [self.select_table.corresponding_column(c) for c in prop]
-            self.__surrogate_mapper = Mapper(self.class_, self.select_table, non_primary=True, properties=props, polymorphic_map=self.polymorphic_map, polymorphic_on=self.select_table.corresponding_column(self.polymorphic_on))._do_compile()
+            self.__surrogate_mapper = Mapper(self.class_, self.select_table, non_primary=True, properties=props, polymorphic_map=self.polymorphic_map, polymorphic_on=self.select_table.corresponding_column(self.polymorphic_on))
 
     def _compile_class(self):
         """if this mapper is to be a primary mapper (i.e. the non_primary flag is not set),

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index b4eac467674929fd5ec6438b7db8caf34ab5fc16..846c7d125be6877a8da624d99535a8d679695910 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -196,15 +196,15 @@ class PropertyLoader(mapper.MapperProperty):
     def do_init(self, key, parent):
         import sqlalchemy.orm
         if isinstance(self.argument, type):
-            self.mapper = mapper.class_mapper(self.argument)
+            self.mapper = mapper.class_mapper(self.argument, compile=False)._do_compile()
         else:
             self.mapper = self.argument._do_compile()
 
-        self.mapper = self.mapper.get_select_mapper()
+        self.mapper = self.mapper.get_select_mapper()._do_compile()
             
         if self.association is not None:
             if isinstance(self.association, type):
-                self.association = mapper.class_mapper(self.association)
+                self.association = mapper.class_mapper(self.association, compile=False)
         
         self.target = self.mapper.mapped_table
 

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index e3365b40788e5cb2b7e9049644448bf7017291ed..dc910d16426b8d66d0b4e26f446fbd05954baef6 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -23,7 +23,7 @@ class Query(object):
         self.order_by = kwargs.pop('order_by', self.mapper.order_by)
         self.extension = kwargs.pop('extension', self.mapper.extension)
         self._session = session
-        if not hasattr(mapper, '_get_clause'):
+        if not hasattr(self.mapper, '_get_clause'):
             _get_clause = sql.and_()
             for primary_key in self.mapper.pks_by_table[self.table]:
                 _get_clause.clauses.append(primary_key == sql.bindparam("pk_"+primary_key._label, type=primary_key.type))