summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-05-24 16:29:49 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-05-24 16:29:49 -0400
commit4856493efc1f6b7fdecf36e020a95636f600a626 (patch)
tree7eb4a0a513ca53814397c4df0f4175f385191e60
parentc1896741d4cfb92f4b4a21de3b8b69a11cf3db03 (diff)
parent61f9e3761245a55f8997ec40b6983bb0770fdec4 (diff)
downloadsqlalchemy-4856493efc1f6b7fdecf36e020a95636f600a626.tar.gz
Merge remote-tracking branch 'origin/pr/270'
-rw-r--r--doc/build/changelog/changelog_05.rst2
-rw-r--r--doc/build/faq/ormconfiguration.rst2
-rw-r--r--lib/sqlalchemy/connectors/mxodbc.py2
-rw-r--r--lib/sqlalchemy/engine/base.py2
-rw-r--r--lib/sqlalchemy/ext/mutable.py2
-rw-r--r--lib/sqlalchemy/orm/strategies.py2
-rw-r--r--lib/sqlalchemy/sql/type_api.py2
-rw-r--r--test/engine/test_reflection.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/doc/build/changelog/changelog_05.rst b/doc/build/changelog/changelog_05.rst
index 04ab11dca..f612ceed9 100644
--- a/doc/build/changelog/changelog_05.rst
+++ b/doc/build/changelog/changelog_05.rst
@@ -3461,7 +3461,7 @@
:tickets:
Fixed query.join() when used in conjunction with a
- columns-only clause and an SQL-expression ON clause in the
+ columns-only clause and a SQL-expression ON clause in the
join.
.. change::
diff --git a/doc/build/faq/ormconfiguration.rst b/doc/build/faq/ormconfiguration.rst
index faaee449e..24eacb718 100644
--- a/doc/build/faq/ormconfiguration.rst
+++ b/doc/build/faq/ormconfiguration.rst
@@ -294,7 +294,7 @@ the two queries may not see the same results:
ORDER BY anon_1.users_id
Depending on database specifics, there is
-a chance we may get the a result like the following for the two queries::
+a chance we may get a result like the following for the two queries::
-- query #1
+--------+
diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index 9fc0ce6b5..d49ca4ba3 100644
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@ -6,7 +6,7 @@
# the MIT License: http://www.opensource.org/licenses/mit-license.php
"""
-Provide an SQLALchemy connector for the eGenix mxODBC commercial
+Provide a SQLALchemy connector for the eGenix mxODBC commercial
Python adapter for ODBC. This is not a free product, but eGenix
provides SQLAlchemy with a license for use in continuous integration
testing.
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 859819a34..ff855a539 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -877,7 +877,7 @@ class Connection(Connectable):
return self.execute(object, *multiparams, **params).scalar()
def execute(self, object, *multiparams, **params):
- """Executes the a SQL statement construct and returns a
+ """Executes a SQL statement construct and returns a
:class:`.ResultProxy`.
:param object: The statement to be executed. May be
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 571bbbda3..dd5a37bb7 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -46,7 +46,7 @@ with any type whose target Python type may be mutable, including
:class:`.PickleType`, :class:`.postgresql.ARRAY`, etc.
When using the :mod:`sqlalchemy.ext.mutable` extension, the value itself
-tracks all parents which reference it. Below, we illustrate the a simple
+tracks all parents which reference it. Below, we illustrate a simple
version of the :class:`.MutableDict` dictionary object, which applies
the :class:`.Mutable` mixin to a plain Python dictionary::
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 37cecb079..826073215 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -112,7 +112,7 @@ def _register_attribute(
@properties.ColumnProperty.strategy_for(instrument=False, deferred=False)
class UninstrumentedColumnLoader(LoaderStrategy):
- """Represent the a non-instrumented MapperProperty.
+ """Represent a non-instrumented MapperProperty.
The polymorphic_on argument of mapper() often results in this,
if the argument is against the with_polymorphic selectable.
diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py
index 2a7adf8af..0297e2c49 100644
--- a/lib/sqlalchemy/sql/type_api.py
+++ b/lib/sqlalchemy/sql/type_api.py
@@ -1096,7 +1096,7 @@ class TypeDecorator(SchemaEventTarget, TypeEngine):
the processing provided by ``self.impl`` is maintained.
:param dialect: Dialect instance in use.
- :param coltype: An SQLAlchemy data type
+ :param coltype: A SQLAlchemy data type
This method is the reverse counterpart to the
:meth:`bind_processor` method of this class.
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index 0d98147cb..1dc65d7d0 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -801,7 +801,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
@testing.provide_metadata
def test_reserved(self):
- # check a table that uses an SQL reserved name doesn't cause an
+ # check a table that uses a SQL reserved name doesn't cause an
# error
meta = self.metadata