- fix to the "column_prefix" flag so that the mapper does not

trip over synonyms (and others) that are named after the column's actual
"key" (since, column_prefix means "dont use the key").

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 994264cc7..461b9da7a 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -555,7 +555,7 @@ class Mapper(object):
                 self.columns[column.key] = self.select_table.corresponding_column(column, keys_ok=True, raiseerr=True)
 
             column_key = (self.column_prefix or '') + column.key
-            prop = self.__props.get(column.key, None)
+            prop = self.__props.get(column_key, None)
             if prop is None:
                 prop = ColumnProperty(column)
                 self.__props[column_key] = prop