From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 30 Oct 2012 20:20:45 +0000 (-0400)
Subject: add in inherited methods to many of these
X-Git-Tag: rel_0_8_0b1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a1dfd5c1d7791f47924f6815e19ea40d41c2a78;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

add in inherited methods to many of these
---

diff --git a/doc/build/core/expression_api.rst b/doc/build/core/expression_api.rst
index 71d2f1b56d..b17145c53b 100644
--- a/doc/build/core/expression_api.rst
+++ b/doc/build/core/expression_api.rst
@@ -105,14 +105,17 @@ Classes
 .. autoclass:: Alias
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: BinaryExpression
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: BindParameter
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: ClauseElement
    :members:
@@ -125,6 +128,7 @@ Classes
 .. autoclass:: ColumnClause
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: ColumnCollection
    :members:
@@ -133,6 +137,7 @@ Classes
 .. autoclass:: ColumnElement
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: sqlalchemy.sql.operators.ColumnOperators
    :members:
@@ -144,6 +149,7 @@ Classes
 .. autoclass:: CompoundSelect
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: sqlalchemy.sql.operators.custom_op
    :members:
@@ -151,6 +157,7 @@ Classes
 .. autoclass:: CTE
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: Delete
    :members:
@@ -164,10 +171,12 @@ Classes
 .. autoclass:: FunctionElement
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: Function
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: FromClause
    :members:
@@ -181,6 +190,7 @@ Classes
 .. autoclass:: Join
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: sqlalchemy.sql.operators.Operators
    :members:
@@ -202,6 +212,7 @@ Classes
 .. autoclass:: TableClause
    :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: UnaryExpression
    :members:
diff --git a/doc/build/core/internals.rst b/doc/build/core/internals.rst
index 3127127978..e0b7f1b69d 100644
--- a/doc/build/core/internals.rst
+++ b/doc/build/core/internals.rst
@@ -15,16 +15,19 @@ Some key internal constructs are listed here.
 .. autoclass:: sqlalchemy.sql.compiler.DDLCompiler
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.engine.default.DefaultDialect
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.engine.Dialect
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.engine.default.DefaultExecutionContext
     :members:
diff --git a/doc/build/orm/internals.rst b/doc/build/orm/internals.rst
index 94f4bfc0f9..d699f251c9 100644
--- a/doc/build/orm/internals.rst
+++ b/doc/build/orm/internals.rst
@@ -11,14 +11,17 @@ sections, are listed here.
 .. autoclass:: sqlalchemy.orm.state.AttributeState
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.instrumentation.ClassManager
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.properties.ColumnProperty
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.descriptor_props.CompositeProperty
     :members:
@@ -31,6 +34,7 @@ sections, are listed here.
 .. autoclass:: sqlalchemy.orm.attributes.InstrumentedAttribute
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.interfaces.MapperProperty
     :members:
@@ -39,14 +43,17 @@ sections, are listed here.
 .. autoclass:: sqlalchemy.orm.interfaces.PropComparator
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.properties.RelationshipProperty
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.descriptor_props.SynonymProperty
     :members:
     :show-inheritance:
+    :inherited-members:
 
 .. autoclass:: sqlalchemy.orm.query.QueryContext
     :members:
@@ -54,4 +61,5 @@ sections, are listed here.
 
 .. autoclass:: sqlalchemy.orm.attributes.QueryableAttribute
     :members:
-    :show-inheritance:
\ No newline at end of file
+    :show-inheritance:
+    :inherited-members: