summaryrefslogtreecommitdiff
path: root/doc/build/orm/scalar_mapping.rst
diff options
context:
space:
mode:
authorSławek Ehlert <slafs@op.pl>2015-01-27 22:04:38 +0100
committerSławek Ehlert <slafs@op.pl>2015-01-27 22:04:38 +0100
commit57b2bd5dcba6140b511c898c0f682234f13d5c51 (patch)
treea0899b2a35d27e177001b163054c3c9a8f7f1c06 /doc/build/orm/scalar_mapping.rst
parent6a1f16d09958e549502a0991890d64964c71b357 (diff)
parent8aaa8dd6bdfb85fa481efa3115b9080d935d344c (diff)
downloadsqlalchemy-pr/152.tar.gz
Merge branch 'master' into oracle-servicename-optionpr/152
Diffstat (limited to 'doc/build/orm/scalar_mapping.rst')
-rw-r--r--doc/build/orm/scalar_mapping.rst18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/build/orm/scalar_mapping.rst b/doc/build/orm/scalar_mapping.rst
new file mode 100644
index 000000000..65efd5dbd
--- /dev/null
+++ b/doc/build/orm/scalar_mapping.rst
@@ -0,0 +1,18 @@
+.. module:: sqlalchemy.orm
+
+===============================
+Mapping Columns and Expressions
+===============================
+
+The following sections discuss how table columns and SQL expressions are
+mapped to individual object attributes.
+
+.. toctree::
+ :maxdepth: 2
+
+ mapping_columns
+ mapped_sql_expr
+ mapped_attributes
+ composites
+
+