summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-12-27 15:55:30 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-12-27 16:22:41 -0500
commit544e72bcb6af1ca657b1762f105634372eca3bc0 (patch)
treee574944f2b8e11ca5560188317f6611adac886c3 /lib/sqlalchemy/sql
parentef6dc0cf2ef581e7cb53dcb4840f678aa1fa5ba6 (diff)
downloadsqlalchemy-544e72bcb6af1ca657b1762f105634372eca3bc0.tar.gz
- corrections
- attempt to add a script to semi-automate the fixing of links
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/expression.py2
-rw-r--r--lib/sqlalchemy/sql/schema.py8
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py2
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 2ffc5468c..2218bd660 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -47,7 +47,7 @@ from .base import ColumnCollection, Generative, Executable, \
from .selectable import Alias, Join, Select, Selectable, TableClause, \
CompoundSelect, CTE, FromClause, FromGrouping, SelectBase, \
alias, GenerativeSelect, \
- subquery, HasPrefixes, Exists, ScalarSelect, TextAsFrom
+ subquery, HasPrefixes, HasSuffixes, Exists, ScalarSelect, TextAsFrom
from .dml import Insert, Update, Delete, UpdateBase, ValuesBase
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index b90f7fc53..b134b3053 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -2345,6 +2345,14 @@ def _to_schema_column_or_string(element):
class ColumnCollectionMixin(object):
+ columns = None
+ """A :class:`.ColumnCollection` of :class:`.Column` objects.
+
+ This collection represents the columns which are referred to by
+ this object.
+
+ """
+
def __init__(self, *columns):
self.columns = ColumnCollection()
self._pending_colargs = [_to_schema_column_or_string(c)
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 9a2de39b4..7bb5c5515 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -1657,7 +1657,7 @@ class NullType(TypeEngine):
class MatchType(Boolean):
"""Refers to the return type of the MATCH operator.
- As the :meth:`.Operators.match` is probably the most open-ended
+ As the :meth:`.ColumnOperators.match` is probably the most open-ended
operator in generic SQLAlchemy Core, we can't assume the return type
at SQL evaluation time, as MySQL returns a floating point, not a boolean,
and other backends might do something different. So this type