delta/python-packages/sqlalchemy.git/lib/sqlalchemy/ext/declarative/base.py, branch rel_1_2 github.com: zzzeek/sqlalchemy.git happy new year 2019-01-11T15:07:20+00:00 Mike Bayer mike_mp@zzzcomputing.com 2019-01-11T15:06:10+00:00 3cfc3c2faaf6465fef75242a17961e4cfeee405b Change-Id: I6a71f4924d046cf306961c58dffccf21e9c03911 (cherry picked from commit 6f270fb0e344016ce526e0a1ecb3e3de9ffd1e3b) 
Change-Id: I6a71f4924d046cf306961c58dffccf21e9c03911
(cherry picked from commit 6f270fb0e344016ce526e0a1ecb3e3de9ffd1e3b)
Post black reformatting 2019-01-06T16:51:20+00:00 Mike Bayer mike_mp@zzzcomputing.com 2019-01-06T06:32:41+00:00 18abd47af32136b3c94a8a787905286d279181fa Applied on top of a pure run of black -l 79 in I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9, this set of changes resolves all remaining flake8 conditions for those codes we have enabled in setup.cfg. Included are resolutions for all remaining flake8 issues including shadowed builtins, long lines, import order, unused imports, duplicate imports, and docstring issues. Change-Id: I4f72d3ba1380dd601610ff80b8fb06a2aff8b0fe 
Applied on top of a pure run of black -l 79 in
I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9,  this set of changes
resolves all remaining flake8 conditions for those codes
we have enabled in setup.cfg.

Included are resolutions for all remaining flake8 issues
including shadowed builtins, long lines, import order, unused
imports, duplicate imports, and docstring issues.

Change-Id: I4f72d3ba1380dd601610ff80b8fb06a2aff8b0fe
Run black -l 79 against all source files 2019-01-06T06:31:01+00:00 Mike Bayer mike_mp@zzzcomputing.com 2019-01-06T06:31:01+00:00 580139598f846f1ce4e2bcfb522ec51d1829c580 This is a straight reformat run using black as is, with no edits applied at all. The black run will format code consistently, however in some cases that are prevalent in SQLAlchemy code it produces too-long lines. The too-long lines will be resolved in the following commit that will resolve all remaining flake8 issues including shadowed builtins, long lines, import order, unused imports, duplicate imports, and docstring issues. Change-Id: I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9 
This is a straight reformat run using black as is, with no edits
applied at all.

The black run will format code consistently, however in
some cases that are prevalent in SQLAlchemy code it produces
too-long lines.   The too-long lines will be resolved in the
following commit that will resolve all remaining flake8 issues
including shadowed builtins, long lines, import order, unused
imports, duplicate imports, and docstring issues.

Change-Id: I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9
"left" -> "accidentally placed at" 2018-12-02T23:59:45+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-12-02T23:54:40+00:00 5945da4e41370bc71a0d3f811ea128be5663db6e since "left" is kind of ambiguous, use more explicit terminology here. Also update the test to use a positive assertion that the warning is emitted; quote the attribute name. Change-Id: Ic2284c200a26b32b2da063cfaf6d59547309d587 References: https://github.com/zzzeek/sqlalchemy/pull/488 (cherry picked from commit eacb31a89fe883edd0ada7f2724239c1f8c5b685) 
since "left" is kind of ambiguous, use more explicit terminology
here.

Also update the test to use a positive assertion that the
warning is emitted; quote the attribute name.

Change-Id: Ic2284c200a26b32b2da063cfaf6d59547309d587
References: https://github.com/zzzeek/sqlalchemy/pull/488
(cherry picked from commit eacb31a89fe883edd0ada7f2724239c1f8c5b685)
Warn for lower-case column attribute on declarative 2018-11-26T06:12:59+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-11-26T05:59:01+00:00 9e53163dbdee113f9c84311ca5804a16ac82fbf7 A warning is emitted in the case that a :func:`.column` object is applied to a declarative class, as it seems likely this intended to be a :class:`.Column` object. Fixes: #4374 Change-Id: I2e617ef65547162e3ba6587c168548ad0cf6203d (cherry picked from commit 6ec40eca1a03a9156ee82f3ce75850778220b39e) 
A warning is emitted in the case that a :func:`.column` object is applied to
a declarative class, as it seems likely this intended to be a
:class:`.Column` object.

Fixes: #4374
Change-Id: I2e617ef65547162e3ba6587c168548ad0cf6203d
(cherry picked from commit 6ec40eca1a03a9156ee82f3ce75850778220b39e)
Move pk on single-inh subclass check below conflict resolution check 2018-10-30T17:31:53+00:00 Tom Manderson me@trm.io 2018-10-30T17:05:43+00:00 6ec2246d04e3608a024b1425207c80c73fa78218 The column conflict resolution technique discussed at :ref:`declarative_column_conflicts` is now functional for a :class:`.Column` that is also a primary key column. Previously, a check for primary key columns declared on a single-inheritance subclass would occur before the column copy were allowed to pass. Fixes: #4352 Change-Id: Id4c025da53c28e58db6b549fe398f25f8a90d355 Pull-request: https://github.com/zzzeek/sqlalchemy/pull/483 (cherry picked from commit 3ed79a5c18c14d842280805d1dae8a9c99ec8f18) 
The column conflict resolution technique discussed at
:ref:`declarative_column_conflicts` is now functional for a :class:`.Column`
that is also a primary key column.  Previously, a check for primary key
columns declared on a single-inheritance subclass would occur before the
column copy were allowed to pass.

Fixes: #4352
Change-Id: Id4c025da53c28e58db6b549fe398f25f8a90d355
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/483
(cherry picked from commit 3ed79a5c18c14d842280805d1dae8a9c99ec8f18)
Check more specifically for hybrid attr and not mapped property 2018-10-20T16:15:34+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-10-19T21:10:42+00:00 dc21de59cad03b63e8bfc4e55b2457a5b129e582 Fixed regression caused by :ticket:`4326` in version 1.2.12 where using :class:`.declared_attr` with a mixin in conjunction with :func:`.orm.synonym` would fail to map the synonym properly to an inherited subclass. Fixes: #4350 Change-Id: Ib2a9b6a125a2ac7c7ff80201746b7f10e5596226 (cherry picked from commit 9335c24d6c98033f4aa1ceafd23a70b88c8ae811) 
Fixed regression caused by :ticket:`4326` in version 1.2.12 where using
:class:`.declared_attr` with a mixin in conjunction with
:func:`.orm.synonym` would fail to map the synonym properly to an inherited
subclass.

Fixes: #4350
Change-Id: Ib2a9b6a125a2ac7c7ff80201746b7f10e5596226
(cherry picked from commit 9335c24d6c98033f4aa1ceafd23a70b88c8ae811)
Unwrap Proxy objects when scanning declared_attr 2018-08-23T16:47:24+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-08-23T16:40:26+00:00 39dccf862d94952188834ec3531ed2d6251c3c0c Fixed bug where the declarative scan for attributes would receive the expression proxy delivered by a hybrid attribute at the class level, and not the hybrid attribute itself, when receiving the descriptor via the ``@declared_attr`` callable on a subclass of an already-mapped class. This would lead to an attribute that did not report itself as a hybrid when viewed within :attr:`.Mapper.all_orm_descriptors`. Fixes: #4326 Change-Id: I582d03f05c3768b3344f93e3791240e9e69b9d1e (cherry picked from commit 626356842d77d4ec6427b3bfc04bdff93d24d246) 
Fixed bug where the declarative scan for attributes would receive the
expression proxy delivered by a hybrid attribute at the class level, and
not the hybrid attribute itself, when receiving the descriptor via the
``@declared_attr`` callable on a subclass of an already-mapped class. This
would lead to an attribute that did not report itself as a hybrid when
viewed within :attr:`.Mapper.all_orm_descriptors`.

Fixes: #4326
Change-Id: I582d03f05c3768b3344f93e3791240e9e69b9d1e
(cherry picked from commit 626356842d77d4ec6427b3bfc04bdff93d24d246)
Accommodate for classically mapped base classes in declarative 2018-08-17T17:42:02+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-08-17T15:37:30+00:00 daab9ad4cc8861a466a0856d3aec85cb08ab6a17 Fixed issue in previously untested use case, allowing a declarative mapped class to inherit from a classically-mapped class outside of the declarative base, including that it accommodates for unmapped intermediate classes. An unmapped intermediate class may specify ``__abstract__``, which is now interpreted correctly, or the intermediate class can remain unmarked, and the classically mapped base class will be detected within the hierarchy regardless. In order to anticipate existing scenarios which may be mixing in classical mappings into existing declarative hierarchies, an error is now raised if multiple mapped bases are detected for a given class. Fixes: #4321 Change-Id: I8604ecfd170d2589d9d1b1c87ba303762071fc30 (cherry picked from commit 4c931b2ec7e0f09ac8c3ebe28c794f5858d54efb) 
Fixed issue in previously untested use case, allowing a declarative mapped
class to inherit from a classically-mapped class outside of the declarative
base, including that it accommodates for unmapped intermediate classes. An
unmapped intermediate class may specify ``__abstract__``, which is now
interpreted correctly, or the intermediate class can remain unmarked, and
the classically mapped base class will be detected within the hierarchy
regardless. In order to anticipate existing scenarios which may be mixing
in classical mappings into existing declarative hierarchies, an error is
now raised if multiple mapped bases are detected for a given class.

Fixes: #4321
Change-Id: I8604ecfd170d2589d9d1b1c87ba303762071fc30
(cherry picked from commit 4c931b2ec7e0f09ac8c3ebe28c794f5858d54efb)
happy new year 2018-01-12T19:23:53+00:00 Mike Bayer mike_mp@zzzcomputing.com 2018-01-12T19:23:53+00:00 699272e4dcb9aa71ebbc0d9487fb6de82d3abc2b Change-Id: I3ef36bfd0cb0ba62b3123c8cf92370a43156cf8f 
Change-Id: I3ef36bfd0cb0ba62b3123c8cf92370a43156cf8f