- 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 a96eddd8accc6577f9dd8cd47ca986e47f3fea8a..71d2f1b56dc4fa3391fdbbf763c25c46fd46e050 100644 (file)
--- 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 d794fd2b8c5756ecd65c5e8f0f8fd78e30e837a1..ace63d446fb45ff80c42adaa77b83fa372c83094 100644 (file)
--- 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')