From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 20 Aug 2012 02:04:33 +0000 (-0400)
Subject: - expand out all the methods on insert/update/delete/select for now
X-Git-Tag: rel_0_8_0b1~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=099c9d39ebfc29c7b4058a0b41205bf8b47612c1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- expand out all the methods on insert/update/delete/select for now
- remove deprecation test
---

diff --git a/doc/build/core/expression_api.rst b/doc/build/core/expression_api.rst
index a96eddd8ac..71d2f1b56d 100644
--- a/doc/build/core/expression_api.rst
+++ b/doc/build/core/expression_api.rst
@@ -153,8 +153,9 @@ Classes
    :show-inheritance:
 
 .. autoclass:: Delete
-   :members: where, prefix_with
+   :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: Executable
    :members:
@@ -173,8 +174,9 @@ Classes
    :show-inheritance:
 
 .. autoclass:: Insert
-   :members: prefix_with, values, returning
+   :members:
    :show-inheritance:
+   :inherited-members:
 
 .. autoclass:: Join
    :members:
@@ -187,8 +189,7 @@ Classes
 .. autoclass:: Select
    :members:
    :show-inheritance:
-
-   ..automember:: prefix_with
+   :inherited-members:
 
 .. autoclass:: Selectable
    :members:
@@ -207,7 +208,8 @@ Classes
    :show-inheritance:
 
 .. autoclass:: Update
-  :members: prefix_with, values, where
+  :members:
+  :inherited-members:
   :show-inheritance:
 
 .. autoclass:: UpdateBase
diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index d794fd2b8c..ace63d446f 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -1147,11 +1147,6 @@ class SQLTest(fixtures.TestBase, AssertsCompiledSQL):
         eq_(gen(None), 'SELECT q')
         eq_(gen(True), 'SELECT DISTINCT q')
 
-        assert_raises(
-            exc.SADeprecationWarning,
-            gen, 'DISTINCT'
-        )
-
         eq_(gen(prefixes=['ALL']), 'SELECT ALL q')
         eq_(gen(prefixes=['DISTINCTROW']),
                 'SELECT DISTINCTROW q')