summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-01-15 10:49:36 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2019-01-15 10:49:36 -0500
commit885f15a306efc4c907ca82fa13871992ee556466 (patch)
treeb0a483144c7bffd479691dfcb47a7f45a666a619 /lib/sqlalchemy/sql
parenta7d6cb13ac96f2abc9366f5ed26fd91cd69ac7cd (diff)
downloadsqlalchemy-885f15a306efc4c907ca82fa13871992ee556466.tar.gz
Remove version directives for 0.6, 0.7, 0.8
- fix a few "seealso"s - ComparableProprerty's "superseded in 0.7" becomes deprecated in 0.7 Backport to currently maintained doc versions 1.2, 1.1 Change-Id: Ib1fcb2df8673dbe5c4ffc47f3896a60d1dfcb4b2
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/ddl.py11
-rw-r--r--lib/sqlalchemy/sql/dml.py7
-rw-r--r--lib/sqlalchemy/sql/elements.py5
-rw-r--r--lib/sqlalchemy/sql/functions.py15
-rw-r--r--lib/sqlalchemy/sql/operators.py10
-rw-r--r--lib/sqlalchemy/sql/schema.py16
-rw-r--r--lib/sqlalchemy/sql/selectable.py27
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py3
-rw-r--r--lib/sqlalchemy/sql/type_api.py16
9 files changed, 0 insertions, 110 deletions
diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 4ad7f3e58..3deb588ab 100644
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -448,8 +448,6 @@ class _CreateDropBase(DDLElement):
class CreateSchema(_CreateDropBase):
"""Represent a CREATE SCHEMA statement.
- .. versionadded:: 0.7.4
-
The argument here is the string name of the schema.
"""
@@ -468,8 +466,6 @@ class DropSchema(_CreateDropBase):
The argument here is the string name of the schema.
- .. versionadded:: 0.7.4
-
"""
__visit_name__ = "drop_schema"
@@ -617,13 +613,6 @@ class CreateColumn(_DDLCompiles):
which only includes the ``id`` column in the string; the ``xmin`` column
will be omitted, but only against the PostgreSQL backend.
- .. versionadded:: 0.8.3 The :class:`.CreateColumn` construct supports
- skipping of columns by returning ``None`` from a custom compilation
- rule.
-
- .. versionadded:: 0.8 The :class:`.CreateColumn` construct was added
- to support custom column creation styles.
-
"""
__visit_name__ = "create_column"
diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py
index f803af9e6..3c40e7914 100644
--- a/lib/sqlalchemy/sql/dml.py
+++ b/lib/sqlalchemy/sql/dml.py
@@ -183,8 +183,6 @@ class UpdateBase(
mytable.insert().with_hint("WITH (PAGLOCK)", dialect_name="mssql")
- .. versionadded:: 0.7.6
-
:param text: Text of the hint.
:param selectable: optional :class:`.Table` that specifies
an element of the FROM clause within an UPDATE or DELETE
@@ -599,8 +597,6 @@ class Insert(ValuesBase):
deals with an arbitrary number of rows, so the
:attr:`.ResultProxy.inserted_primary_key` accessor does not apply.
- .. versionadded:: 0.8.3
-
"""
if self.parameters:
raise exc.InvalidRequestError(
@@ -685,9 +681,6 @@ class Update(ValuesBase):
as_scalar()
)
- .. versionchanged:: 0.7.4
- The WHERE clause of UPDATE can refer to multiple tables.
-
:param values:
Optional dictionary which specifies the ``SET`` conditions of the
``UPDATE``. If left as ``None``, the ``SET``
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index aa6f268b2..fae25cc2c 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -1068,11 +1068,6 @@ class BindParameter(ColumnElement):
parameters are present, then :paramref:`.bindparam.required`
defaults to ``False``.
- .. versionchanged:: 0.8 If the ``required`` flag is not specified,
- it will be set automatically to ``True`` or ``False`` depending
- on whether or not the ``value`` or ``callable`` parameters
- were specified.
-
:param quote:
True if this parameter name requires quoting and is not
currently known as a SQLAlchemy reserved word; this currently
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index cc145cf51..075a2f826 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -129,8 +129,6 @@ class FunctionElement(Executable, ColumnElement, FromClause):
See :func:`~.expression.over` for a full description.
- .. versionadded:: 0.7
-
"""
return Over(
self,
@@ -505,10 +503,6 @@ func = _FunctionGenerator()
but are not exactly the same as "functions" from a SQLAlchemy
perspective.
- .. versionadded:: 0.8 :data:`.func` can return non-function expression
- constructs for common quasi-functional names like :func:`.cast`
- and :func:`.extract`.
-
Functions which are interpreted as "generic" functions know how to
calculate their return type automatically. For a listing of known generic
functions, see :ref:`generic_functions`.
@@ -645,15 +639,6 @@ class GenericFunction(util.with_metaclass(_GenericMeta, Function)):
>>> print func.geo.buffer()
ST_Buffer()
- .. versionadded:: 0.8 :class:`.GenericFunction` now supports
- automatic registration of new functions as well as package
- and custom naming support.
-
- .. versionchanged:: 0.8 The attribute name ``type`` is used
- to specify the function's return type at the class level.
- Previously, the name ``__return_type__`` was used. This
- name is still recognized for backwards-compatibility.
-
"""
coerce_arguments = True
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 8242a9db2..5a29d2ce8 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -153,8 +153,6 @@ class Operators(object):
A value of 100 will be higher or equal to all operators, and -100
will be lower than or equal to all operators.
- .. versionadded:: 0.8 - added the 'precedence' argument.
-
:param is_comparison: if True, the operator will be considered as a
"comparison" operator, that is which evaluates to a boolean
true/false value, like ``==``, ``>``, etc. This flag should be set
@@ -629,8 +627,6 @@ class ColumnOperators(Operators):
This is equivalent to using negation with
:meth:`.ColumnOperators.like`, i.e. ``~x.like(y)``.
- .. versionadded:: 0.8
-
.. seealso::
:meth:`.ColumnOperators.like`
@@ -644,8 +640,6 @@ class ColumnOperators(Operators):
This is equivalent to using negation with
:meth:`.ColumnOperators.ilike`, i.e. ``~x.ilike(y)``.
- .. versionadded:: 0.8
-
.. seealso::
:meth:`.ColumnOperators.ilike`
@@ -661,8 +655,6 @@ class ColumnOperators(Operators):
usage of ``IS`` may be desirable if comparing to boolean values
on certain platforms.
- .. versionadded:: 0.7.9
-
.. seealso:: :meth:`.ColumnOperators.isnot`
"""
@@ -676,8 +668,6 @@ class ColumnOperators(Operators):
usage of ``IS NOT`` may be desirable if comparing to boolean values
on certain platforms.
- .. versionadded:: 0.7.9
-
.. seealso:: :meth:`.ColumnOperators.is_`
"""
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 918f2b949..43a2e5d0f 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -232,8 +232,6 @@ class Table(DialectKWArgs, SchemaItem, TableClause):
replace existing columns of the same name when
:paramref:`.Table.extend_existing` is ``True``.
- .. versionadded:: 0.7.5
-
.. seealso::
:paramref:`.Table.autoload`
@@ -277,10 +275,6 @@ class Table(DialectKWArgs, SchemaItem, TableClause):
:class:`.Table`, potentially overwriting existing columns
and options of the same name.
- .. versionchanged:: 0.7.4 :paramref:`.Table.extend_existing` will
- invoke a new reflection operation when combined with
- :paramref:`.Table.autoload` set to True.
-
As is always the case with :paramref:`.Table.autoload`,
:class:`.Column` objects can be specified in the same :class:`.Table`
constructor, which will take precedence. Below, the existing
@@ -1242,9 +1236,6 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause):
conditionally rendered differently on different backends,
consider custom compilation rules for :class:`.CreateColumn`.
- .. versionadded:: 0.8.3 Added the ``system=True`` parameter to
- :class:`.Column`.
-
:param comment: Optional string that will render an SQL comment on
table creation.
@@ -1660,11 +1651,6 @@ class ForeignKey(DialectKWArgs, SchemaItem):
(defaults to the column name itself), unless ``link_to_name`` is
``True`` in which case the rendered name of the column is used.
- .. versionadded:: 0.7.4
- Note that if the schema name is not included, and the
- underlying :class:`.MetaData` has a "schema", that value will
- be used.
-
:param name: Optional string. An in-database name for the key if
`constraint` is not provided.
@@ -3520,8 +3506,6 @@ class Index(DialectKWArgs, ColumnCollectionMixin, SchemaItem):
Index("some_index", func.lower(sometable.c.name))
- .. versionadded:: 0.8 support for functional and expression-based indexes.
-
An :class:`.Index` can also be manually associated with a :class:`.Table`,
either through inline declaration or using
:meth:`.Table.append_constraint`. When this approach is used, the names
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index fc45ffe64..0b2155a68 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -1463,8 +1463,6 @@ class CTE(Generative, HasSuffixes, Alias):
:meth:`.SelectBase.cte` method from any selectable.
See that method for complete examples.
- .. versionadded:: 0.7.6
-
"""
__visit_name__ = "cte"
@@ -3261,8 +3259,6 @@ class Select(HasPrefixes, HasSuffixes, GenerativeSelect):
to those which have the same name as the equivalent. Otherwise,
all columns that are equivalent to another are removed.
- .. versionadded:: 0.8
-
"""
return self.with_only_columns(
sqlutil.reduce_columns(
@@ -3454,21 +3450,6 @@ class Select(HasPrefixes, HasSuffixes, GenerativeSelect):
constructs, or other compatible constructs (i.e. ORM-mapped
classes) to become part of the correlate collection.
- .. versionchanged:: 0.8.0 ORM-mapped classes are accepted by
- :meth:`.Select.correlate`.
-
- .. versionchanged:: 0.8.0 The :meth:`.Select.correlate` method no
- longer unconditionally removes entries from the FROM clause;
- instead, the candidate FROM entries must also be matched by a FROM
- entry located in an enclosing :class:`.Select`, which ultimately
- encloses this one as present in the WHERE clause, ORDER BY clause,
- HAVING clause, or columns clause of an enclosing :meth:`.Select`.
-
- .. versionchanged:: 0.8.2 explicit correlation takes place
- via any level of nesting of :class:`.Select` objects; in previous
- 0.8 versions, correlation would only occur relative to the
- immediate enclosing :class:`.Select` construct.
-
.. seealso::
:meth:`.Select.correlate_except`
@@ -3496,17 +3477,9 @@ class Select(HasPrefixes, HasSuffixes, GenerativeSelect):
all other FROM elements remain subject to normal auto-correlation
behaviors.
- .. versionchanged:: 0.8.2 The :meth:`.Select.correlate_except`
- method was improved to fully prevent FROM clauses specified here
- from being omitted from the immediate FROM clause of this
- :class:`.Select`.
-
If ``None`` is passed, the :class:`.Select` object will correlate
all of its FROM entries.
- .. versionchanged:: 0.8.2 calling ``correlate_except(None)`` will
- correctly auto-correlate all FROM clauses.
-
:param \*fromclauses: a list of one or more :class:`.FromClause`
constructs, or other compatible constructs (i.e. ORM-mapped
classes) to become part of the correlate-exception collection.
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 2c813c515..2c0a03123 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -165,9 +165,6 @@ class String(Concatenable, TypeEngine):
>>> print select([cast('some string', String(collation='utf8'))])
SELECT CAST(:param_1 AS VARCHAR COLLATE utf8) AS anon_1
- .. versionadded:: 0.8 Added support for COLLATE to all
- string types.
-
:param convert_unicode: When set to ``True``, the
:class:`.String` type will assume that
input is to be passed as Python Unicode objects under Python 2,
diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py
index 1875c6054..a283b60dc 100644
--- a/lib/sqlalchemy/sql/type_api.py
+++ b/lib/sqlalchemy/sql/type_api.py
@@ -130,9 +130,6 @@ class TypeEngine(Visitable):
of existing types, or alternatively by using :class:`.TypeDecorator`.
See the documentation section :ref:`types_operators` for examples.
- .. versionadded:: 0.8 The expression system was enhanced to support
- customization of operators on a per-type level.
-
"""
should_evaluate_none = False
@@ -423,8 +420,6 @@ class TypeEngine(Visitable):
:param dialect_name: base name of the dialect which uses
this type. (i.e. ``'postgresql'``, ``'mysql'``, etc.)
- .. versionadded:: 0.7.2
-
"""
return Variant(self, {dialect_name: to_instance(type_)})
@@ -688,11 +683,6 @@ class UserDefinedType(util.with_metaclass(VisitableCheckKWArg, TypeEngine)):
the same type as this one. See
:meth:`.TypeDecorator.coerce_compared_value` for more detail.
- .. versionchanged:: 0.8 :meth:`.UserDefinedType.coerce_compared_value`
- now returns ``self`` by default, rather than falling onto the
- more fundamental behavior of
- :meth:`.TypeEngine.coerce_compared_value`.
-
"""
return self
@@ -910,10 +900,6 @@ class TypeDecorator(SchemaEventTarget, TypeEngine):
return an empty tuple, in which case no values will be coerced to
constants.
- .. versionadded:: 0.8.2
- Added :attr:`.TypeDecorator.coerce_to_is_types` to allow for easier
- control of ``__eq__()`` ``__ne__()`` operations.
-
"""
class Comparator(TypeEngine.Comparator):
@@ -1363,8 +1349,6 @@ class Variant(TypeDecorator):
The :class:`.Variant` type is typically constructed
using the :meth:`.TypeEngine.with_variant` method.
- .. versionadded:: 0.7.2
-
.. seealso:: :meth:`.TypeEngine.with_variant` for an example of use.
"""