summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/properties.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
-rw-r--r--lib/sqlalchemy/orm/properties.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 05904d1a9..1022f4ef6 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -40,7 +40,7 @@ __all__ = [
class ColumnProperty(StrategizedProperty):
"""Describes an object attribute that corresponds to a table column.
- Public constructor is the :func:`.orm.column_property` function.
+ Public constructor is the :func:`_orm.column_property` function.
"""
@@ -71,12 +71,13 @@ class ColumnProperty(StrategizedProperty):
r"""Provide a column-level property for use with a mapping.
Column-based properties can normally be applied to the mapper's
- ``properties`` dictionary using the :class:`.Column` element directly.
+ ``properties`` dictionary using the :class:`_schema.Column`
+ element directly.
Use this function when the given column is not directly present within
the mapper's selectable; examples include SQL expressions, functions,
and scalar SELECT queries.
- The :func:`.orm.column_property` function returns an instance of
+ The :func:`_orm.column_property` function returns an instance of
:class:`.ColumnProperty`.
Columns that aren't present in the mapper's selectable won't be