merge tip

diff --cc lib/sqlalchemy/ext/declarative.py
Simple merge

diff --cc lib/sqlalchemy/orm/attributes.py
Simple merge

diff --cc lib/sqlalchemy/orm/dynamic.py
Simple merge

diff --cc lib/sqlalchemy/orm/interfaces.py
Simple merge

diff --cc lib/sqlalchemy/orm/mapper.py
index 3374ea72d2aa69e36fd00f0f476205a59bd63239,9e38ac8119ec59461b490acc0fe7e0a03fe84380..b75583c6e3ccb99a036670775dd9a2c2b12b1f92
--- 1/lib/sqlalchemy/orm/mapper.py
--- 2/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@@ -912,12 -914,36 +912,24 @@@ class Mapper(object)
  
          if _compile_mappers and not self.compiled:
              self.compile()
 -        
 -        if not resolve_synonyms:
 -            prop = self._props.get(key, None)
 -            if prop is None and raiseerr:
 -                raise sa_exc.InvalidRequestError(
 -                        "Mapper '%s' has no property '%s'" % 
 -                        (self, key))
 -            return prop
 -        else:
 -            try:
 -                return getattr(self.class_, key).property
 -            except AttributeError:
 -                if raiseerr:
 -                    raise sa_exc.InvalidRequestError(
 -                        "Mapper '%s' has no property '%s'" % (self, key))
 -                else:
 -                    return None
 -    
 +        try:
 +            return getattr(self.class_, key).property
 +        except AttributeError:
 +            raise sa_exc.InvalidRequestError(
 +                    "Mapper '%s' has no property '%s'" % (self, key))
 +            
+     @util.deprecated('0.6.4',
+                      'Call to deprecated function mapper._get_col_to_pr'
+                      'op(). Use mapper.get_property_by_column()')
+     def _get_col_to_prop(self, col):
+         return self._columntoproperty[col]
+         
+     def get_property_by_column(self, column):
+         """Given a :class:`.Column` object, return the
+         :class:`.MapperProperty` which maps this column."""
+ 
+         return self._columntoproperty[column]
+         
      @property
      def iterate_properties(self):
          """return an iterator of all MapperProperty objects."""

diff --cc lib/sqlalchemy/orm/properties.py
Simple merge

diff --cc lib/sqlalchemy/orm/query.py
Simple merge

diff --cc lib/sqlalchemy/orm/scoping.py
Simple merge

diff --cc lib/sqlalchemy/orm/strategies.py
Simple merge

diff --cc lib/sqlalchemy/orm/util.py
Simple merge

diff --cc test/orm/test_query.py
Simple merge