]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/log
thirdparty/sqlalchemy/sqlalchemy.git
4 years agoSupport pytest 6.x
Mike Bayer [Sun, 27 Sep 2020 01:01:01 +0000 (21:01 -0400)] 
Support pytest 6.x

pytest has removed support for pytest.Class().collect()
and we need to use from_parent.

Change-Id: Ia5fed9b22e76c99f71489283acee207f996f52a4
(cherry picked from commit ffafbd4b9657a4ee8bec57c0861414144f37bdc5)

4 years agoAdd pypi shields
Mike Bayer [Wed, 23 Sep 2020 18:47:43 +0000 (14:47 -0400)] 
Add pypi shields

These are all available from the same shields.io source,
courtesy @dolfinus

Fixes: #5594
Change-Id: I985c415f50627d328384a8fddf9a1457663ee00d
(cherry picked from commit 826303baaad6c66389d1b2857688e64ab3360846)

4 years agoStringify correctly for non-str exception argument
Andrzej Bartosiński [Sat, 19 Sep 2020 16:47:46 +0000 (12:47 -0400)] 
Stringify correctly for non-str exception argument

Fixed issue where a non-string object sent to
:class:`_exc.SQLAlchemyError` or a subclass, as occurs with some third
party dialects, would fail to stringify correctly. Pull request
courtesy Andrzej Bartosiński.

Fixes: #5599
Closes: #5600
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5600
Pull-request-sha: cdccccc42a6ac8de771593a43ee8675bfd8dbeb6

Change-Id: Icd710d9015abc80f61a84893d75fbb33ee0fe46e
(cherry picked from commit c4f28fb414c342ba362fdee8a68bd169f01aa7d2)

4 years agoAdd support for Azure authentication options
Gord Thompson [Thu, 17 Sep 2020 16:32:31 +0000 (10:32 -0600)] 
Add support for Azure authentication options

Fixes: #5592
Change-Id: I0688e5ea0fc6b01a0b72f397daea8f57a2ec0766
(cherry picked from commit dcd2be16b9c9a6a52b6bb7e144e31998b7cee631)

4 years agoFix ORM gc-related test that seems to be failing on CI
Mike Bayer [Wed, 16 Sep 2020 13:50:25 +0000 (09:50 -0400)] 
Fix ORM gc-related test that seems to be failing on CI

The test relied on the primary key value not being
of a certain number.

Change-Id: I9bd76bee542da44b630a426f1102fc682ad2d7b3
(cherry picked from commit de8e53a831fdd834eb9cca697b5793a7c38b22a7)

4 years agoAdd warning for skip_locked with MariaDB backend.
Gord Thompson [Sun, 13 Sep 2020 22:38:13 +0000 (16:38 -0600)] 
Add warning for skip_locked with MariaDB backend.

The "skip_locked" keyword used with ``with_for_update()`` will emit a
warning when used on MariaDB backends, and will then be ignored.   This is
a deprecated behavior that will raise in SQLAlchemy 1.4, as an application
that requests "skip locked" is looking for a non-blocking operation which
is not available on those backends.

Fixes: #5578
Change-Id: I49ccb6c6ff46eafed12b77f51e1da8e0e397966c
(cherry picked with major changes from commit b25d0cda90fe906fda2fe8401a810c4da0bf7268)

4 years agoPass all pool parameters in recreate()
Mike Bayer [Mon, 14 Sep 2020 14:14:48 +0000 (10:14 -0400)] 
Pass all pool parameters in recreate()

The following pool parameters were not being propagated to the new pool
created when :meth:`_engine.Engine.dispose` were called: ``pre_ping``,
``use_lifo``.  Additionally the ``recycle`` and ``reset_on_return``
parameters were not propagated for the :class:`_engine.AssertionPool`
class.  These issues have been fixed.

Fixes: #5582
Change-Id: Ifdb703aa7e849652242b9ff8071c854cd1d77e71
(cherry picked from commit 3d803a8ed3e07332dff872180680bed6175dd483)

4 years agoAdd 3rd party integration issues FAQ; add numpy
Mike Bayer [Thu, 10 Sep 2020 19:48:14 +0000 (15:48 -0400)] 
Add 3rd party integration issues FAQ; add numpy

Users of numpy and pandas should refer to this section
where we will try to catalog the common issues that don't
really have an automatic solution.

Fixes: #5552
Change-Id: I02990e328616ccb21933ffda1167c52256bace07
(cherry picked from commit 96bb6dc56d1da2b4fa30afd08ac4dfa665752913)

4 years agoMerge "Include PostgreSQL in trigger test and correct documentation example" into...
mike bayer [Thu, 10 Sep 2020 16:38:31 +0000 (16:38 +0000)] 
Merge "Include PostgreSQL in trigger test and correct documentation example" into rel_1_3

4 years agoAdd more docs for populate_existing(); link with_for_update
Mike Bayer [Thu, 10 Sep 2020 15:56:34 +0000 (11:56 -0400)] 
Add more docs for populate_existing(); link with_for_update

The populate_existing() method is actually changing
to be an execution option, however it has almost no
mention in the narrative docs so add docs in terms of the
1.x version first, including that we mention you almost
definitely want to use this method if you are also using
with_for_update().

Fixes: #5572
Fixes: #4774
Change-Id: Ieca916400622c1ffc1ae81204132a02a0983594c
(cherry picked from commit e78c8f84958a031056684d7056aff0eab6ced226)

4 years agoFix typo in :paramref:`_engine.create_engine.isolation_level` names
Federico Caselli [Tue, 8 Sep 2020 21:09:21 +0000 (23:09 +0200)] 
Fix typo in :paramref:`_engine.create_engine.isolation_level` names

Fixes: #5563
Change-Id: I29204fdf679d750c66ed17daf70bc8d7cb1b7f65
(cherry picked from commit 17f7faf3df8dc3d30e632c60a5d69d342876ad3d)

4 years agoPostgreSQL dialect-level isolation_level parameter is legacy
Mike Bayer [Tue, 8 Sep 2020 15:01:28 +0000 (11:01 -0400)] 
PostgreSQL dialect-level isolation_level parameter is legacy

The isolation level section in the docs inadvertently
copied the PostgreSQL example using the PGDialect.isolation_level
parameter and not the execution_options.  ensure only
the execution_options version is documented.

Change-Id: I94e02ede62d3dded40e3fcbce8d04608dc063108
(cherry picked from commit 6dc8d1dc6955db8107b683f2c2f3e4b62aad574b)

4 years agoMerge "Add new MySQL reserved words: `cube`, `lateral`." into rel_1_3
mike bayer [Thu, 3 Sep 2020 16:17:40 +0000 (16:17 +0000)] 
Merge "Add new MySQL reserved words: `cube`, `lateral`." into rel_1_3

4 years agoAdd caveat re: with_expression and already-loaded object
Mike Bayer [Wed, 2 Sep 2020 18:47:03 +0000 (14:47 -0400)] 
Add caveat re: with_expression and already-loaded object

Adds a test for the populate_existing() behavior as well.

Fixes: #5553
Change-Id: Ib0db6227c3fec7d0065f2a7caa36b3fd94ef14fd
(cherry picked from commit b050169600019ef249a8b315e7435c752623c900)

4 years agoAdd new MySQL reserved words: `cube`, `lateral`.
StefanosChaliasos [Thu, 27 Aug 2020 17:53:35 +0000 (13:53 -0400)] 
Add new MySQL reserved words: `cube`, `lateral`.

Closes: #5539
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5539
Pull-request-sha: 8c228be322023041b11691d93dafa1be090f01a0

Change-Id: Ic756472a19563e793cf7e33b24eb1ad5e913dbc0

4 years agoMerge "Provide more detailed error message for Query.join()" into rel_1_3
mike bayer [Tue, 1 Sep 2020 13:50:24 +0000 (13:50 +0000)] 
Merge "Provide more detailed error message for Query.join()" into rel_1_3

4 years agoProvide more detailed error message for Query.join()
RamonWill [Thu, 6 Aug 2020 20:08:13 +0000 (16:08 -0400)] 
Provide more detailed error message for Query.join()

An :class:`.ArgumentError` with more detail is now raised if the target
parameter for :meth:`_query.Query.join` is set to an unmapped object.
Prior to this change a less detailed ``AttributeError`` was raised.
Pull request courtesy Ramon Williams.

Fixes: #4428
Closes: #5452
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5452
Pull-request-sha: b148df547037e9a254fe331eff8e922c78426261

Change-Id: I873453d1fdb651178216aac698baac63ae5a94e8

4 years agoInclude PostgreSQL in trigger test and correct documentation example
RamonWill [Sun, 30 Aug 2020 13:05:06 +0000 (09:05 -0400)] 
Include PostgreSQL in trigger test and correct documentation example

Include PostgreSQL dialect in trigger test and correct DDL example in documentation

A user highlighted that the syntax in the DDL trigger example was incorrect for PostgreSQL. The trigger tests where also skipping the PostgreSQL dialect until the syntax was corrected. This PR fixes both of these issues.

This pull request is:

- [X ] A documentation / typographical error fix
- Good to go, no issue or tests are needed
- [ ] A short code fix
- please include the issue number, and create an issue if none exists, which
  must include a complete example of the issue.  one line code fixes without an
  issue and demonstration will not be accepted.
- Please include: `Fixes: #<issue number>` in the commit message
- please include tests.   one line code fixes without tests will not be accepted.
- [ ] A new feature implementation
- please include the issue number, and create an issue if none exists, which must
  include a complete example of how the feature would look.
- Please include: `Fixes: #<issue number>` in the commit message
- please include tests.

**Have a nice day!**
Fixes: #4037
Closes: #5548
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5548
Pull-request-sha: 1db5e47adb90f9d51e247711dcfdbb274fb7bf73

Change-Id: I06edbcab99c82a3ce25581b81f8d2a4a028c07c3
(cherry picked from commit 2e887c7a4105a973a015b9ecbb4ea5a11dafb26a)

4 years agoMerge "internal test framework files for standardization of is_not/not_in;" into...
mike bayer [Sun, 30 Aug 2020 14:33:16 +0000 (14:33 +0000)] 
Merge "internal test framework files for standardization of is_not/not_in;" into rel_1_3

4 years agoUpdate connection docs for migrating off of nesting
Mike Bayer [Sat, 29 Aug 2020 22:24:18 +0000 (18:24 -0400)] 
Update connection docs for migrating off of nesting

Change-Id: I3a81140f00a4a9945121bfb8ec4c0e3953b4085f

4 years agointernal test framework files for standardization of is_not/not_in;
jonathan vanasco [Mon, 24 Aug 2020 22:53:31 +0000 (18:53 -0400)] 
internal test framework files for standardization of is_not/not_in;

this is safe for 1.3.x

Change-Id: Icba38fdc20f5d8ac407383a4278ccb346e09af38
(cherry picked from commit 672087176eaf3d0e867c6b5c67bfea3c713be42e)

4 years agoMerge "ARM64 Support to Github Actions For Testing And Development Of Wheels" into...
Federico Caselli [Fri, 28 Aug 2020 20:25:22 +0000 (20:25 +0000)] 
Merge "ARM64 Support to Github Actions For Testing And Development Of Wheels" into rel_1_3

4 years agoRaise NotImplemenedError for association proxy __clause_element__
Mike Bayer [Thu, 27 Aug 2020 19:50:47 +0000 (15:50 -0400)] 
Raise NotImplemenedError for association proxy __clause_element__

It's not possible right now to use an association proxy element as a plain
column expression to be SELECTed from or used in a SQL function.  An
informative error is now raised when this occurs.

Fixes: #5542
Change-Id: I334e767ebc0b56c1dccc4a1e5185b0435af77b93
(cherry picked from commit d78686b4f109fdc78ca6239e5a5af791717bc48d)

4 years agoDocument caveat about backrefs and attribute_mapped_collection
Mike Bayer [Wed, 26 Aug 2020 15:44:34 +0000 (11:44 -0400)] 
Document caveat about backrefs and attribute_mapped_collection

Fixes: #5538
Change-Id: I2bda6bed40d35560a71bf0ed09d141047ce59e82
(cherry picked from commit fe772672b4fc00df0b66aca92e2092779a844a2d)

4 years agoMerge "More descriptive error for non-mapped string prop name" into rel_1_3
mike bayer [Wed, 26 Aug 2020 02:43:41 +0000 (02:43 +0000)] 
Merge "More descriptive error for non-mapped string prop name" into rel_1_3

4 years agoMore descriptive error for non-mapped string prop name
jonathan vanasco [Mon, 20 Apr 2020 17:56:49 +0000 (13:56 -0400)] 
More descriptive error for non-mapped string prop name

Fixed issue where using a loader option against a string attribute name
that is not actually a mapped attribute, such as a plain Python descriptor,
would raise an uninformative AttributeError;  a descriptive error is now
raised.

Fixes: #4589
Closes: #4594
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/4594
Pull-request-sha: 2b7ed5240f49be90f9390e3d041c9cb957083465

Change-Id: I66b9937991eb7cdbe074a92f490af1c80d16449e
(cherry picked from commit 7700005a1f3504e26633a55db5cddeac114cb78f)

4 years agoARM64 Support to Github Actions For Testing And Development Of Wheels
odidev [Sun, 23 Aug 2020 18:54:56 +0000 (14:54 -0400)] 
ARM64 Support to Github Actions For Testing And Development Of Wheels

**Added**:
1. ARM64 jobs in Github Workflows For Testing And Development Of Wheels
2. Two script files for creating wheels and testing.

Resolves #5436

Signed-off-by: odidev <odidev@puresoftware.com>
Co-authored-by: Federico Caselli <cfederico87@gmail.com>
Closes: #5480
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5480
Pull-request-sha: 131ef520bbf863ad9b65ca3bf3c2d2d214405702

Change-Id: Ia10dadd93365ba4beeefbd27c060bc077c2d7aeb
(cherry picked from commit 7f9caaa7ea893a1803f7bdf7b4355740cf940a3d)

4 years agoFix typo in docs examples of psycopg2.connect
Federico Caselli [Mon, 24 Aug 2020 21:05:10 +0000 (23:05 +0200)] 
Fix typo in docs examples of psycopg2.connect

Fixes: #5535
Change-Id: I7341137ec63c5a7978f9fe15ad1a932e068321c2
(cherry picked from commit eb8cf282103b0b3d57e620152a451b059745f8df)

4 years agoImplement DDL visitor for PG ENUM with schema translate support
Mike Bayer [Wed, 19 Aug 2020 02:53:09 +0000 (22:53 -0400)] 
Implement DDL visitor for PG ENUM with schema translate support

Fixed issue where the :class:`_postgresql.ENUM` type would not consult the
schema translate map when emitting a CREATE TYPE or DROP TYPE during the
test to see if the type exists or not.  Additionally, repaired an issue
where if the same enum were encountered multiple times in a single DDL
sequence, the "check" query would run repeatedly rather than relying upon a
cached value.

Fixes: #5520
Change-Id: I79f46e29ac0168e873ff178c242f8d78f6679aeb
(cherry picked from commit c290a40a543f8355ee712e2e565698b6ebdb162f)

4 years agoDeliver straight BinaryExpr w/ no negate for any() / all()
Mike Bayer [Tue, 18 Aug 2020 18:17:06 +0000 (14:17 -0400)] 
Deliver straight BinaryExpr w/ no negate for any() / all()

Adjusted the :meth:`_types.ARRAY.Comparator.any` and
:meth:`_types.ARRAY.Comparator.all` methods to implement a straight "NOT"
operation for negation, rather than negating the comparison operator.

Fixes: #5518
Change-Id: I87ee9278c321aafe51a679fcfcbb5fbb11307fda
(cherry picked from commit 8bc793c4dbc876722dfaad0ca731938c70b54b6c)

4 years agoClarify that session.close() is like reset
Mike Bayer [Tue, 18 Aug 2020 14:52:04 +0000 (10:52 -0400)] 
Clarify that session.close() is like reset

This is a manual edit, not really a cherry-pick, but the
below ref is where this is from.

Fixes: #5517
Change-Id: I86809cf84de3ec19a279ae13f4e5e71336d8b359
(cherry picked from commit 7277c12e4d1bdc9647b9b306d89b5847d1c5a4d7)

4 years agoFix wheel check in linux workflow and improve it
Federico Caselli [Mon, 17 Aug 2020 21:29:50 +0000 (23:29 +0200)] 
Fix wheel check in linux workflow and improve it

Change-Id: I3b208674649e41bca0285d00aa11cc5975eb971a
(cherry picked from commit e7875b39f8e28e0c27d96926f7cab3f7839c0250)

4 years agoVersion 1.3.20 placeholder
Mike Bayer [Mon, 17 Aug 2020 20:12:11 +0000 (16:12 -0400)] 
Version 1.3.20 placeholder

4 years ago- 1.3.19 rel_1_3_19
Mike Bayer [Mon, 17 Aug 2020 19:59:44 +0000 (15:59 -0400)] 
- 1.3.19

4 years agoMake discriminator column used by ConcreteBase configurable
Jesse Bakker [Mon, 17 Aug 2020 14:35:35 +0000 (10:35 -0400)] 
Make discriminator column used by ConcreteBase configurable

The name of the virtual column used when using the
:class:`_declarative.AbstractConcreteBase` and
:class:`_declarative.ConcreteBase` classes can now be customized, to allow
for models that have a column that is actually named ``type``.  Pull
request courtesy Jesse-Bakker.

Fixes: #5513
Closes: #5514
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5514
Pull-request-sha: 5e7429f3531e2e22fffe996c9760905578d16ef9

Change-Id: I733737844d4f4e1f52dd2475a66c7044ff7292f5
(cherry picked from commit db2b2e21d6458d29a156a8532a52425333e0317a)

4 years agoerror message for Lookup
RamonWill [Wed, 12 Aug 2020 18:50:20 +0000 (14:50 -0400)] 
error message for Lookup

Th proposed change will provide the user with the target Enum Class name as well as up to four possible enum values when a LookupError is raised in the Enum Class.

A user requested that the enum name and possible values are included to the LookupError message to make debugging easier. The criteria included using ellipses for Enums containing more than four values and using ellipses for enum values that were greater than a certain number of characters (for this resolution the limit is 11 characters).

This pull request is:

- [ ] A documentation / typographical error fix
- Good to go, no issue or tests are needed
- [X ] A short code fix
- please include the issue number, and create an issue if none exists, which
  must include a complete example of the issue.  one line code fixes without an
  issue and demonstration will not be accepted.
- Please include: `Fixes: #<issue number>` in the commit message
- please include tests.   one line code fixes without tests will not be accepted.
- [ ] A new feature implementation
- please include the issue number, and create an issue if none exists, which must
  include a complete example of how the feature would look.
- Please include: `Fixes: #<issue number>` in the commit message
- please include tests.

**Have a nice day!**
Fixes: #4733
Closes: #5490
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5490
Pull-request-sha: 55e76f2ae796b59b7de157cfaae5235dffa359cb

Change-Id: I4541f9efed1c05401587a413e9e748d46938bcd1
(cherry picked from commit a8bd2116764fb6039742a34409254175846bb700)

4 years agoupdate for pytest-xdist terminology
Mike Bayer [Fri, 14 Aug 2020 16:22:17 +0000 (12:22 -0400)] 
update for pytest-xdist terminology

With version 2.0.0 they removed the old terminology, which
I had no idea had been changed in any case for several years.

pushing this out for all branches

Change-Id: I51e4f577aeb9ef8205348b50489549f77072a613
(cherry picked from commit f91d335e31e5e14794e349b74edc08aad0f361e3)

4 years agoFurther fixes for ticket 5470
Mike Bayer [Thu, 13 Aug 2020 14:43:53 +0000 (10:43 -0400)] 
Further fixes for ticket 5470

The fix for #5470 didn't actually take into account that
the "distinct" logic in query was also doubling up the criteria.
Added many more tests.   the 1.3 version here will be different
than 1.4 as the regression is not quite the same.

Fixes: #5470
Change-Id: I16a23917cab175761de9c867d9d9ac55031d9b97
(cherry picked from commit 7ac2d5c93b6334528aff93939559eee133f3e9fc)

4 years agoMerge "Fix mysql CREATE TABLE / COLLATE issue" into rel_1_3
mike bayer [Wed, 12 Aug 2020 15:04:31 +0000 (15:04 +0000)] 
Merge "Fix mysql CREATE TABLE / COLLATE issue" into rel_1_3

4 years agoupdate deterministic sort ordering doc
Mike Bayer [Tue, 11 Aug 2020 16:27:10 +0000 (12:27 -0400)] 
update deterministic sort ordering doc

reword the sorting in terms of the actual behavior,
put correct changed version

References: #5494
Change-Id: I725338526afe28454910d029c153e4476f8c686f
(cherry picked from commit 5b44be7a13ccefc46b8a69fd95677051de5f3bf7)

4 years agoFix mysql CREATE TABLE / COLLATE issue
Gord Thompson [Thu, 6 Aug 2020 23:19:52 +0000 (17:19 -0600)] 
Fix mysql CREATE TABLE / COLLATE issue

Fixes: #5411
Change-Id: Ib0c53f5ed3f9d3ff0586580c9a9cce73b4b870f4
(cherry picked from commit 32e0b128f6c077017673f7049e2b667bf96f53e3)

4 years agoFix typos
Karthikeyan Singaravelan [Sun, 9 Aug 2020 10:02:57 +0000 (10:02 +0000)] 
Fix typos

(cherry picked from commit 71f14f6de8ee1865fd68d7989f751eed95dde719)

Change-Id: Ie5e32ee12696aa0234dc6282b83220100c2288a0

4 years agoMerge "Add complete platform data to profiling data" into rel_1_3
mike bayer [Fri, 7 Aug 2020 17:27:29 +0000 (17:27 +0000)] 
Merge "Add complete platform data to profiling data" into rel_1_3

4 years agoMerge "Pass schema_translate_map from DDLCompiler to SQLCompiler" into rel_1_3
mike bayer [Fri, 7 Aug 2020 17:22:35 +0000 (17:22 +0000)] 
Merge "Pass schema_translate_map from DDLCompiler to SQLCompiler" into rel_1_3

4 years agoPass schema_translate_map from DDLCompiler to SQLCompiler
Mike Bayer [Fri, 7 Aug 2020 15:24:29 +0000 (11:24 -0400)] 
Pass schema_translate_map from DDLCompiler to SQLCompiler

Fixed issue where the
:paramref:`_engine.Connection.execution_options.schema_translate_map`
feature would not take effect when the :meth:`_schema.Sequence.next_value`
function function for a :class:`_schema.Sequence` were used in the
:paramref:`_schema.Column.server_default` parameter and the create table
DDL were emitted.

Fixes: #5500
Change-Id: I74a9fa13d22749d06c8202669f9ea220d9d984d9
(cherry picked from commit ed50a003e296ac6bfb998f2b401091d87874cb4c)

4 years agoAdd complete platform data to profiling data
Federico Caselli [Mon, 27 Jul 2020 19:57:32 +0000 (21:57 +0200)] 
Add complete platform data to profiling data

Initially to distinsuish between arm and x86_64
architecture, expand out the profile key to include
machine, system, python impl in all cases.

For 1.3, also bump cpython version to 3.8 to match CI

Ref: #5436
Change-Id: I7e48f0462ba7d9c680b2dac45ce7b0cf709b9b22
(cherry picked from commit 24a9e6974c177e90d2213080b1f6d8270d78f69b)

4 years agoInclude bulk update/delete in RoutingSession example
Mike Bayer [Fri, 7 Aug 2020 16:32:50 +0000 (12:32 -0400)] 
Include bulk update/delete in RoutingSession example

Fixes: #5407
Change-Id: Ia0965dbc88d744cded5c23021898388f2cf95f8d
(cherry picked from commit 7f52c10357cbc98e467f317128b3fea2018eaf7c)

4 years agobase all_orm_descriptors ordering on cls.__dict__ + cls.__mro__
Mike Bayer [Thu, 6 Aug 2020 19:53:17 +0000 (15:53 -0400)] 
base all_orm_descriptors ordering on cls.__dict__ + cls.__mro__

Adjusted the workings of the :meth:`_orm.Mapper.all_orm_descriptors`
accessor to represent the attributes in the order that they are located in
a deterministic way, assuming the use of Python 3.6 or higher which
maintains the sorting order of class attributes based on how they were
declared.   This sorting is not guaranteed to match the declared order of
attributes in all cases however; see the method documentation for the exact
scheme.

Fixes: #5494
Change-Id: I6ee8d4ace3eb8b3f7c9c0f2a3d7e27b5f62abfd3
(cherry picked from commit 9a3fee2cb6b608eb5c0263cf5a7e9085f74f2e73)

4 years agoFixes for MySQL 8
Mike Bayer [Thu, 6 Aug 2020 00:32:02 +0000 (20:32 -0400)] 
Fixes for MySQL 8

MySQL 8.0.19 has some changes to how it reports on display widths
for int types (seems like it omits it in some cases), and also
no longer cares about the length for YEAR.   Another adjustment
to the ordering of constraints reported in one case also.
At least one CI machine is at 8.0.21 now.

Change-Id: Ie2101bed3ad75dcbb62cd05abe95ef14ad895cf5
(cherry picked from commit 5668fd73ea51bffbccb8b1ae8923ef2d545efacb)

4 years agoAdd MariaDB 1927 to is_disconnect codes
Mike Bayer [Wed, 5 Aug 2020 14:31:21 +0000 (10:31 -0400)] 
Add MariaDB 1927 to is_disconnect codes

Added MariaDB code 1927 to the list of "disconnect" codes, as recent
MariaDB versions apparently use this code when the database server was
stopped.

Fixes: #5493
Change-Id: I63f1d692f36cb0411ead278556e3f8c64ab72ea4
(cherry picked from commit 2a946254023135eddd222974cf300ffaa5583f02)

4 years agofix formatting
Mike Bayer [Tue, 4 Aug 2020 14:40:46 +0000 (10:40 -0400)] 
fix formatting

Change-Id: I8315cfef6e5c4b87d64fc770998a1229cc690870
(cherry picked from commit c813fe1678c4edbce32f0652353ed70f0a14566f)

4 years agoAdd note that fast_executemany uses memory
Mike Bayer [Tue, 4 Aug 2020 14:13:51 +0000 (10:13 -0400)] 
Add note that fast_executemany uses memory

Ideally this would be a per-execution option, or Pyodbc
could perhaps run the data in chunks.

Fixes: #5334
Change-Id: If4a11b312346b8e4c2b8cd38840b3a2ba56dec3b
(cherry picked from commit 64f3c097970dd8f2e141ef9bc71c685b19671267)

4 years agoMerge "Improve github action workflows" into rel_1_3
mike bayer [Sun, 2 Aug 2020 00:11:46 +0000 (00:11 +0000)] 
Merge "Improve github action workflows" into rel_1_3

4 years agoMerge "Consider default FROM DUAL for MySQL" into rel_1_3
mike bayer [Wed, 29 Jul 2020 18:44:40 +0000 (18:44 +0000)] 
Merge "Consider default FROM DUAL for MySQL" into rel_1_3

4 years agoConsider default FROM DUAL for MySQL
Mike Bayer [Tue, 28 Jul 2020 20:46:53 +0000 (16:46 -0400)] 
Consider default FROM DUAL for MySQL

MySQL claims it doesn't require FROM DUAL for no
FROM clause even though the issue at #5481 locates
a case which requires one.  See if FROM DUAL the same
way as Oracle without attempting to guess is potentially
feasible.

Fixes: #5481
Change-Id: I2a28876c10a8ce2d121cd344dcdd837db321d4ab
(cherry picked from commit 59b65b3008de5d6c5e4318846d04e50e5851e957)

4 years agoPassive deletes edits
Mike Bayer [Wed, 29 Jul 2020 17:14:49 +0000 (13:14 -0400)] 
Passive deletes edits

Change-Id: I863df033cae9bda4ce96d446a92984ae82797565
(cherry picked from commit 1ec03c15234f54a4d6387141a99b24bedf3b13c2)

4 years agoRemove errant link
Mike Bayer [Wed, 29 Jul 2020 16:51:29 +0000 (12:51 -0400)] 
Remove errant link

The link to "passive_deletes" has moved in
9e1ee412b8650761af6df993e119906682604728 however the tag
stayed here and caused a self link.

Fixes: #5484
Change-Id: I3ac5970be30504367294b9e9a83eb5a2c579cc71
(cherry picked from commit 4ac56e6ca3bbf5c42e4c187460bf7109e09992a2)

4 years agoImprove github action workflows
Federico Caselli [Mon, 27 Jul 2020 20:31:29 +0000 (22:31 +0200)] 
Improve github action workflows

- in create wheel set minimum versions of setuptools and wheel to avoid
  failure in python 3.5 with metadata configured in setup.cfg
- update action versions
- test also cext in the pull requests

Change-Id: Iaa5e4e4000c7faa688b51f2f41428c7dd7cae9c3
(cherry picked from commit 8e89f040391cddad1bec9002bbb6b3c39f43445e)

4 years agoEnsure is_comparison passed for PG RANGE op() methods
Jim Bosch [Sun, 26 Jul 2020 20:50:14 +0000 (16:50 -0400)] 
Ensure is_comparison passed for PG RANGE op() methods

Fixed issue where the return type for the various RANGE comparison
operators would itself be the same RANGE type rather than BOOLEAN, which
would cause an undesirable result in the case that a
:class:`.TypeDecorator` that defined result-processing behavior were in
use.  Pull request courtesy Jim Bosch.

Fixes: #5476
Closes: #5477
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5477
Pull-request-sha: 925b117e0c91cdd67d9ddbd9d65f5ca3e88af91f

Change-Id: I52ab4d4362d379c8253990f9d328a40990a64520
(cherry picked from commit 07e57a0330fb7b1bbe0c59f442111a34e4b7c960)

4 years agoImprove delete cascade and passive deletes sections
Mike Bayer [Sun, 26 Jul 2020 17:17:56 +0000 (13:17 -0400)] 
Improve delete cascade and passive deletes sections

Add cross linking from Core to ORM and also add new sections
and examples regarding many-to-many.    Move the section
out of "collections" and into the "cascades" chapter
where it's more likely to be found.

Change-Id: If29360e463e5745279bc5335bd12352d50ad8953
(cherry picked from commit 9e1ee412b8650761af6df993e119906682604728)

4 years agoUpdate docs with actual MariaDB JSON support
DefteZ [Fri, 24 Jul 2020 23:45:41 +0000 (01:45 +0200)] 
Update docs with actual MariaDB JSON support

(cherry picked from commit a26b88cd6b2034b7048d5b4729d3fa90ddfb255d)

4 years agoAllow Grouping to pass along proxy_set of element
Mike Bayer [Tue, 21 Jul 2020 16:36:20 +0000 (12:36 -0400)] 
Allow Grouping to pass along proxy_set of element

Repaired an issue where the "ORDER BY" clause rendering a label name rather
than a complete expression, which is particularly important for SQL Server,
would fail to occur if the expression were enclosed in a parenthesized
grouping in some cases.   This case has been added to test support.

Fixes: #5470
Change-Id: Ie0e27c39e5d53be78b32f7810f93d2d0536375e7
(cherry picked from commit 30ec982ba697eb320d804164c6bc965ae239abe8)

4 years agoFix mssql dialect escaping object names containing ']'
Gord Thompson [Sat, 18 Jul 2020 00:06:41 +0000 (18:06 -0600)] 
Fix mssql dialect escaping object names containing ']'

Fixes: #5467
Change-Id: I054ec219717ba62847a9daf1214e215dd6b70633
(cherry picked from commit 547e959157f841f4f6d1e405ceed14755fcbd0bd)

4 years agoAdd requirement for test_get_view_definition
Gord Thompson [Wed, 15 Jul 2020 22:00:56 +0000 (16:00 -0600)] 
Add requirement for test_get_view_definition

Bypass the test if the views are not being created.

Change-Id: I3945acb418575d12e5fe0e4657eb5e3b1c08b90e
(cherry picked from commit 6158fe6cbf69c29d51a8e57aab4e36d6b4598079)

4 years agoRepair doubled "using engines in fork()" section
Mike Bayer [Wed, 15 Jul 2020 23:14:46 +0000 (19:14 -0400)] 
Repair doubled "using engines in fork()" section

This section was written twice in two different ways with
the same recipe.  consolidate into one section and
add additional caveats regading dispose.

Change-Id: I20524935e7c10e3624d561ea2735312fd04e673d
References: #5460
(cherry picked from commit f4aa9def8f35136d1fe3bba81aaeddb72e7772a2)

5 years agoMerge "Add missing function to documentation: cte, Exits" into rel_1_3
mike bayer [Mon, 13 Jul 2020 19:08:46 +0000 (19:08 +0000)] 
Merge "Add missing function to documentation: cte, Exits" into rel_1_3

5 years agotest single and double quote inspection scenarios
Mike Bayer [Mon, 13 Jul 2020 14:49:57 +0000 (10:49 -0400)] 
test single and double quote inspection scenarios

Applied a sweep through all included dialects to ensure names that contain
single or double quotes are properly escaped when querying system tables,
for all :class:`.Inspector` methods that accept object names as an argument
(e.g. table names, view names, etc).   SQLite and MSSQL contained two
quoting issues that were repaired.

Fixes: #5456
Change-Id: I3bc98806f5166f3d82275650079ff561446f2aef
(cherry picked from commit 4351f7183c81bdb64a9a3ba47aa4b9891f42ffdb)

5 years agoMerge "more docs for autocommit isolation level" into rel_1_3
mike bayer [Mon, 13 Jul 2020 03:28:53 +0000 (03:28 +0000)] 
Merge "more docs for autocommit isolation level" into rel_1_3

5 years agomore docs for autocommit isolation level
Mike Bayer [Sun, 12 Jul 2020 23:52:54 +0000 (19:52 -0400)] 
more docs for autocommit isolation level

this concept is not clear that we offer real
DBAPI autocommit everywhere.  backport 1.3 with edits
as well

Change-Id: I2e8328b7fb6e1cdc5453ab29c94276f60c7ca149
(cherry picked from commit 28fbb0cb94ddf92a014adbfe63a15b7d0797ccee)

5 years agoMake call-count profiling tests on osx have their own platform key
Federico Caselli [Sat, 11 Jul 2020 17:03:46 +0000 (19:03 +0200)] 
Make call-count profiling tests on osx have their own platform key

They previously would use the linux profiles, but recently some discrepancies in
the function call count on osx would make the tests fail.

Change-Id: Ifdfdca1676972de4179f59cdaae196f6805d4a21
(cherry picked from commit 2ada9686ffb86d39ea25aa146593dde2340fee03)

5 years agoLimit init_subclass test above python 3.6
Mike Bayer [Wed, 8 Jul 2020 19:48:32 +0000 (15:48 -0400)] 
Limit init_subclass test above python 3.6

The commit for I1654befe9eb1c8b8e7fc0784bdbe64284614f0ea #5357
runs the test on all Python 3 versions, however we need to limit
at least python 3.6 for this.

Change-Id: Ie86b78bbfd8c7bd013ff9aa7f8905328d792c1b3
(cherry picked from commit 43a111e326acae85f4623b8dd507468d99d5ef3a)

5 years agoPropose --nomemory by default
Mike Bayer [Wed, 8 Jul 2020 19:32:38 +0000 (15:32 -0400)] 
Propose --nomemory by default

the memory tests are solely responsible for the largest chunk of
time and CPU energy taken up in running the tests.   Regressions
in this area are nonexistent unless major changes are being
taken up.   Try to revert them to False and see if a single
gerrit job can perhaps run these.

Change-Id: Ibaead2d1c0a76f1339bee63652a8aead689e8b75
(cherry picked from commit e2d4b2e72cb97bc5612fa9d1ec7d0ab15d38efe1)

5 years agoresolves #3757
RamonWill [Sat, 4 Jul 2020 17:17:40 +0000 (18:17 +0100)] 
resolves #3757

(cherry picked from commit cf7bfb79847266148f6add22120479d287a259ab)

5 years agoMerge "Add **kw support to DeclarativeMeta.__init__" into rel_1_3
mike bayer [Tue, 7 Jul 2020 00:18:31 +0000 (00:18 +0000)] 
Merge "Add **kw support to DeclarativeMeta.__init__" into rel_1_3

5 years agoadded semicolon (;) to improve warning message clarity
jonathan vanasco [Tue, 30 Jun 2020 16:31:58 +0000 (12:31 -0400)] 
added semicolon (;) to improve warning message clarity

### Description

Added a semicolon to improve the clarity of warning message.  I actually had a table named `backend`, and thought it was involved!

While updating the code, I noticed no test that directly tests for this warning message. There are tests for the `Can't sort tables for DROP;` prefix of this message and the `exc.CircularDependencyError`; and some tests for the `exc.CircularDependencyError` message itself. I couldn't find any test for this particular message though.  (Just thought I'd bring that up)

No issue created, because this is minor.

Closes: #5431
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5431
Pull-request-sha: 87fb5733ff4fc1a13dd94277716814ea852f654c

Change-Id: I87a504d30a7dd5155c34f7d7f30b2116d0d3cd3f
(cherry picked from commit b421c51b94fdef2bc542b0a40bfb21490b23ca15)

5 years agoAdd **kw support to DeclarativeMeta.__init__
EwenGillies [Sun, 5 Jul 2020 14:50:50 +0000 (10:50 -0400)] 
Add **kw support to DeclarativeMeta.__init__

Added a ``**kw`` argument to the :meth:`.DeclarativeMeta.__init__` method.
This allows a class to support the :pep:`487` metaclass hook
``__init_subclass__``.  Pull request courtesy Ewen Gillies.

Fixes: #5357
Closes: #5363
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5363
Pull-request-sha: 0ad05a768316cba03a4d312ab39d3e8fbca7ac54

Change-Id: I1654befe9eb1c8b8e7fc0784bdbe64284614f0ea
(cherry picked from commit 67504137e96547664754691bdd3269b473a488d1)

5 years agoConsolidate connection customization documentation
Mike Bayer [Mon, 6 Jul 2020 15:11:54 +0000 (11:11 -0400)] 
Consolidate connection customization documentation

1. move all discussion of how to customize connection
to the engines.rst section.   have the section in pooling.rst
point to engines.

2. ensure all of the common use cases for connection modification
are listed out in order of level of modification.   the use
case of modifying an existing connection is separate from that of
modifying how connect is called; ensure that poolevents.connect
is referred to just as prominently as dialectevents.do_connect.

3. completely replace any discussion of create_engine.creator, as this
hook does not offer anything beyond what do_connect() does.
"creator" is more about using a Pool object directly without an
Engine, which is no longer a documented use case.

Change-Id: Ibe366d2a6e63eb420a6136fdc71ce0fb545edf8f
(cherry picked from commit b5c4a4cbe632e7dfa243121377a4a8d73b4da1ab)

5 years agoDocument pyodbc built-in pooling
Mike Bayer [Sun, 5 Jul 2020 14:28:20 +0000 (10:28 -0400)] 
Document pyodbc built-in pooling

PyODBC apparently pools connections by default and this
is a module-wide setting only.    Documenent that this happens
and how to disable it.

Fixes: #5440
Change-Id: I415bda7beb2211c66991b6c804b0ddb4d79e427f
(cherry picked from commit 9204b6610c9667ba2e4f73440339d2f520631777)

5 years agoAdd missing function to documentation: cte, Exits
Federico Caselli [Tue, 30 Jun 2020 19:40:56 +0000 (21:40 +0200)] 
Add missing function to documentation: cte, Exits

Fixes: #5432
Change-Id: I22e4ba3a7131165c551bcba7e377fa45d71d70e0
(cherry picked from commit f2ec52c232dbbe59282e9b9740ede52887f9ee8d)

5 years agoInclude DATETIME / DateTime with the MySQL TIMESTAMP examples
Mike Bayer [Mon, 29 Jun 2020 19:45:20 +0000 (15:45 -0400)] 
Include DATETIME / DateTime with the MySQL TIMESTAMP examples

To eliminate any remaining confusion, clarify that
DATETIME (as well as DateTime) and TIMESTAMP are treated
similarly with the MySQL dialect regarding ON UPDATE.

Change-Id: I222522440706902d5d2d11e670e76f16000438e0
References: #5427
(cherry picked from commit 30f8843e97a49121323a4f75d9341f77c9935312)

5 years agoMerge "Provide example for exists" into rel_1_3
mike bayer [Mon, 29 Jun 2020 19:05:39 +0000 (19:05 +0000)] 
Merge "Provide example for exists" into rel_1_3

5 years agoDocuemnt current workarounds for MySQL TIMESTAMP
Mike Bayer [Mon, 29 Jun 2020 18:35:22 +0000 (14:35 -0400)] 
Docuemnt current workarounds for MySQL TIMESTAMP

MySQL 8 no longer generates the DEFAULT or ON UPDATE
clauses for TIMESTAMP by default, hence users will begin to hit
this regularly.  add warnings that this non-standard SQL is not
accommodated by server_onupdate and docuemnt the workaround
used in issues such as #4652.

Fixes: #5427
Change-Id: Ie048dcc91c648dd0b80ed395208c1d665b6c968b
(cherry picked from commit a2c2dcaf082ecf97c7e06cd23adf5a614b5a4a2b)

5 years agoProvide example for exists
Federico Caselli [Sat, 27 Jun 2020 19:46:28 +0000 (21:46 +0200)] 
Provide example for exists

Fixes: #5423
Change-Id: I716f8de17c49d7eefbbce5ddd9da203bfc9fe47f
(cherry picked from commit 90a97ad9b63d5aa80439a20e7a9db450026d58de)

5 years agoEnsure Oracle < 8 used for python 2 in tox
Mike Bayer [Mon, 29 Jun 2020 15:23:19 +0000 (11:23 -0400)] 
Ensure Oracle < 8 used for python 2 in tox

this is already in master, backporting to 1.3.

the issue of the oracle extras_require in setup.py
is a separate issue as master still has no version
qualification in this area either.

Change-Id: Ib612401aaa2d5d109b26bc18a0fc817a15a98bf8

5 years agoFix a wide variety of typos and broken links
aplatkouski [Thu, 25 Jun 2020 20:38:06 +0000 (16:38 -0400)] 
Fix a wide variety of typos and broken links

Cherry pick from I9c36e8d8804483950db4b42c38ee456e384c59e3

Signed-off-by: aplatkouski <5857672+aplatkouski@users.noreply.github.com>
Closes: #5416
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5416
Pull-request-sha: 8b742b67285d1fc16323cc23f63d539a6a9ae62e

Change-Id: I85985199858ec881eaea98fc190d12b459aeb733

5 years agoVersion 1.3.19 placeholder
Mike Bayer [Thu, 25 Jun 2020 19:00:50 +0000 (15:00 -0400)] 
Version 1.3.19 placeholder

5 years ago- 1.3.18 rel_1_3_18
Mike Bayer [Thu, 25 Jun 2020 18:33:21 +0000 (14:33 -0400)] 
- 1.3.18

5 years agoUse index name to determine if an index is for the PK
Mike Bayer [Thu, 25 Jun 2020 15:12:40 +0000 (11:12 -0400)] 
Use index name to determine if an index is for the PK

Fixed bug in Oracle dialect where indexes that contain the full set of
primary key columns would be mistaken as the primary key index itself,
which is omitted, even if there were multiples.  The check has been refined
to compare the name of the primary key constraint against the index name
itself, rather than trying to guess based on the columns present in the
index.

Fixes: #5421
Change-Id: I47c2ccdd0b13977cfd9ef249d4de06371c4fb241
(cherry picked from commit ca56d8dc32f939b2bdb1f590986d4c46d280d186)

5 years agoAdd pip list to workflow, update setuptools
Federico Caselli [Mon, 22 Jun 2020 18:01:38 +0000 (20:01 +0200)] 
Add pip list to workflow, update setuptools

Change-Id: I2e32ba315a79dcfc7c5f79ed6517ac0cee4f55e3
(cherry picked from commit 28c13f9092d457d9e476e2987ba9e83ae868407a)

5 years agoApply dialect_options copy fix
Gord Thompson [Sat, 6 Jun 2020 16:04:34 +0000 (10:04 -0600)] 
Apply dialect_options copy fix

Fixes: #5276
Change-Id: Ic608310d4a85934fc9fa4d72daef66323c6e2525
(cherry picked from commit 5d7d96b53ef6b046fcd4d19a42e31f99898d1c81)

5 years agoMerge "Propose black py27 + py35 mode for the rest of Py2K" into rel_1_3
mike bayer [Fri, 19 Jun 2020 21:44:28 +0000 (21:44 +0000)] 
Merge "Propose black py27 + py35 mode for the rest of Py2K" into rel_1_3

5 years agoAdd note indicating order of join() calls are important
Mike Bayer [Fri, 19 Jun 2020 15:06:08 +0000 (11:06 -0400)] 
Add note indicating order of join() calls are important

Fixes: #5406
Change-Id: I186792b32bd156d5ddf256dcd018af32ad5b515e
(cherry picked from commit 332b8b78f6ba728b0994457420cb66e1c9bd5846)

5 years agoPropose black py27 + py35 mode for the rest of Py2K
Mike Bayer [Fri, 19 Jun 2020 14:25:42 +0000 (10:25 -0400)] 
Propose black py27 + py35 mode for the rest of Py2K

py27 mode produces one failure for flake8 which is the
space added between exec and parenthesis.  however apparently
we can add multiple versions to target-versions which allows
the exec() calls to come out in python 3 style.

The issue we want to improve is issues of trailing
commas being added.  I'm not really able to get black to
consistently add or remove these trailing commas in any
case no matter what I set target-version towards.

Change-Id: Iceb9e9aeb5f5e0d317fb877ef06eca0290997fe4
(cherry picked from commit 5850dbca071a565cc00f613618b4fcddd13a5eee)

5 years agoAdd version token to error URL
Mike Bayer [Thu, 11 Jun 2020 18:31:57 +0000 (14:31 -0400)] 
Add version token to error URL

the sqlalche.me redirector now supports the numerical version
code in the URL, e.g. /13/, /14/, /20/, etc., so that we can
redirect to the error codes for the appropriate version
of SQLAlchemy in use without going through the catch-all "latest"
link.   If a particular version of the docs is no longer on the
site, the redirect will revert to falling through the "latest"
link (which ultimately lands on the current release version,
/13/ at the time of this writing).

Change-Id: I3bb463fd6fb6c8767c95a57f3699aba715a9a72d
(cherry picked from commit dbaf82d258cc12d92ef28de4677d147fdb7808fd)

5 years agoAdd 'exists' to SQLite's reserved keywords
Thodoris Sotiropoulos [Thu, 11 Jun 2020 14:50:41 +0000 (10:50 -0400)] 
Add 'exists' to SQLite's reserved keywords

Added "exists" to the list of reserved words for SQLite so that this word
will be quoted when used as a label or column name. Pull request courtesy
Thodoris Sotiropoulos.

Fixes: #5395
Closes: #5396
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5396
Pull-request-sha: 5608317a38db7b63115e3b467d182a3e5cc31580

Change-Id: Ia4769de2dec159dcf282eb4b30c11560da51a5c7
(cherry picked from commit ed4a4896aea7dd77dd5d8a9861302811ac421e47)

5 years agoAdd documentation regarding row constructo in PostgreSQL
Federico Caselli [Mon, 25 May 2020 19:43:58 +0000 (21:43 +0200)] 
Add documentation regarding row constructo in PostgreSQL

Fixes: #5331
Change-Id: Ia795a4d4d8ae4944d8a160d18f8b917177acf0de
(cherry picked from commit 95106a9175741528cebfde8b6d0fd9756f82bd20)

5 years agoMerge "Improve ``Rendering Bound Parameters Inline`` documentation" into rel_1_3
mike bayer [Thu, 11 Jun 2020 03:13:40 +0000 (03:13 +0000)] 
Merge "Improve ``Rendering Bound Parameters Inline`` documentation" into rel_1_3

5 years agoMerge "updated historical terms with modern equivalents" into rel_1_3
mike bayer [Tue, 9 Jun 2020 16:28:08 +0000 (16:28 +0000)] 
Merge "updated historical terms with modern equivalents" into rel_1_3

5 years agoFix capitalization typos in engines.rst
Abraham Sangha [Mon, 8 Jun 2020 16:17:09 +0000 (10:17 -0600)] 
Fix capitalization typos in engines.rst

(cherry picked from commit 6322cb20974b1d702b9fa0cfc07dbef2c549797c)

5 years agoupdated historical terms with modern equivalents
jonathan vanasco [Sat, 6 Jun 2020 01:58:23 +0000 (21:58 -0400)] 
updated historical terms with modern equivalents

### Description
There were a few remnant uses of master/slave in the code and docs. The project previously made a decision to move away from them to use modern and inclusive terminology.

This PR does not cover a bug or necessitate a documented entry into the changelog, so an issue ticket was not created.

### Checklist
This pull request is:

- [x] A documentation / typographical error fix
- [x] A short code fix
- [ ] A new feature implementation

Closes: #5381
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5381
Pull-request-sha: 92597e83d0e1e18960dbb39b604b313e7a1cbb30

Change-Id: I1fb34fe5ab6c19fd7360568d7b51cdea9d271b3b
(cherry picked from commit 3512d51600c250f72911313e3f204552c250ece7)