delta/python-packages/sqlalchemy.git/lib/sqlalchemy/orm, branch pr/62

Fix TypeError for class_mapper called w/ iterable

2014-01-15T01:24:04+00:00

When the class_ passed is not a mapped class but is actually an iterable, the string formatting operation fails with a TypeError, and the expected ArgumentError is not raised. Calling code which is using reflection and expects this error will fail (e.g. the sadisplay module).
Conflicts:
	lib/sqlalchemy/orm/base.py

- An adjustment to the :func:`.subqueryload` strategy which ensures that

2013-12-17T00:22:26+00:00

the query runs after the loading process has begun; this is so that
the subqueryload takes precedence over other loaders that may be
hitting the same attribute due to other eager/noload situations
at the wrong time. [ticket:2887]

- Fixed bug when using joined table inheritance from a table to a

2013-12-16T20:26:19+00:00

select/alias on the base, where the PK columns were also not same
named; the persistence system would fail to copy primary key values
from the base table to the inherited table upon INSERT.
[ticket:2885]

wrong method name...

2013-12-16T19:36:30+00:00

load_on_pending is different from enable_relationship_loading and should

2013-12-16T01:07:59+00:00

not be superseded.  both have a potential use.

Conflicts:
	lib/sqlalchemy/orm/relationships.py

make the error message for [ticket:2889] more accurate, as we support

2013-12-12T18:36:25+00:00

composites to many-to-ones now also

- :func:`.composite` will raise an informative error message when the

2013-12-12T18:32:57+00:00

columns/attribute (names) passed don't resolve to a Column or mapped
attribute (such as an erroneous tuple); previously raised an unbound
local. [ticket:2889]

Conflicts:
	test/orm/test_composites.py

- Error message when a string arg sent to :func:`.relationship` which

2013-12-12T17:53:34+00:00

doesn't resolve to a class or mapper has been corrected to work
the same way as when a non-string arg is received, which indicates
the name of the relationship which had the configurational error.
[ticket:2888]

Conflicts:
	lib/sqlalchemy/orm/relationships.py

- documentation cleanup in ORM including [ticket:2816]

2013-12-07T23:03:05+00:00

Conflicts:
	lib/sqlalchemy/orm/mapper.py

Fix cross references

2013-11-15T02:52:54+00:00