diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 12 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/visitors.py | 2 |
5 files changed, 15 insertions, 9 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index eea4003f2..a02955c8c 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -578,7 +578,9 @@ class Executable(Generative): ":class:`.Session`.", ) def execute(self, *multiparams, **params): - """Compile and execute this :class:`.Executable`.""" + """Compile and execute this :class:`.Executable`. + + """ e = self.bind if e is None: label = getattr(self, "description", self.__class__.__name__) diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 4dc2b8bbf..e25063372 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -19,6 +19,7 @@ __all__ = [ "AliasedReturnsRows", "any_", "all_", + "CacheKey", "ClauseElement", "ColumnCollection", "ColumnElement", @@ -159,6 +160,7 @@ from .selectable import TableSample # noqa from .selectable import TextAsFrom # noqa from .selectable import TextualSelect # noqa from .selectable import Values # noqa +from .traversals import CacheKey # noqa from .visitors import Visitable # noqa from ..util.langhelpers import public_factory # noqa diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 56695708e..d65821c5c 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -787,7 +787,9 @@ class Table(DialectKWArgs, SchemaItem, TableClause): ":meth:`.Inspector.has_table`.", ) def exists(self, bind=None): - """Return True if this table exists.""" + """Return True if this table exists. + + """ if bind is None: bind = _bind_or_error(self) diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 595b1bdfa..9c593ea5d 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -3814,19 +3814,19 @@ class Select( "1.4", "The :meth:`.Select.column` method is deprecated and will " "be removed in a future release. Please use " - ":meth:`.Select.add_columns", + ":meth:`.Select.add_columns`", ) def column(self, column): """return a new select() construct with the given column expression - added to its columns clause. + added to its columns clause. - E.g.:: + E.g.:: my_select = my_select.column(table.c.new_column) - See the documentation for :meth:`.Select.with_only_columns` - for guidelines on adding /replacing the columns of a - :class:`.Select` object. + See the documentation for :meth:`.Select.with_only_columns` + for guidelines on adding /replacing the columns of a + :class:`.Select` object. """ return self.add_columns(column) diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py index 5504bf3d8..29ed01309 100644 --- a/lib/sqlalchemy/sql/visitors.py +++ b/lib/sqlalchemy/sql/visitors.py @@ -386,7 +386,7 @@ class InternalTraversal(util.with_metaclass(_InternalTraversalType, object)): """visit the values() ordered tuple list of an :class:`.Update` object.""" dp_dml_values = symbol("DML_V") - """visit the values() dictionary of a :class:`.ValuesBase + """visit the values() dictionary of a :class:`.ValuesBase` (e.g. Insert or Update) object. """ |
