summaryrefslogtreecommitdiff
path: root/test/orm/test_merge.py
Commit message (Expand)AuthorAgeFilesLines
* Consider merge key with (None, ) as non-persistentMike Bayer2017-08-311-0/+36
* Make all tests to be PEP8 compliantKhairi Hafsham2017-02-071-221/+213
* Memoize load_path in all cases, run quick populators for path changeMike Bayer2016-10-171-1/+1
* - don't load deferred columns on unexpire for merge with load=False,Diana Clarke2016-04-061-4/+100
* - Fixed bug in :meth:`.Session.merge` where an object with a compositeMike Bayer2016-02-111-1/+50
* - The :meth:`.Session.merge` method now tracks pending objects byMike Bayer2015-12-041-0/+95
* Fix many typos throughout the codebasepr/85Alex Gaynor2014-04-261-3/+3
* - the raw 2to3 runMike Bayer2013-04-271-3/+3
* trying different approaches to test layout. in this one, the testing modulesMike Bayer2012-09-271-5/+5
* -whitespace bonanza, contdMike Bayer2012-07-281-45/+45
* - [removed] Deprecated identifiers removed:Mike Bayer2012-06-211-77/+87
* - [feature] The of_type() construct on attributesMike Bayer2012-06-201-3/+3
* - [bug] Fixed bug whereby polymorphic_onMike Bayer2012-03-311-2/+61
* - [bug] Fixed bug where "merge" cascade couldMike Bayer2012-01-281-2/+50
* - add tests to try to find the case that [ticket:2221] is looking for.Mike Bayer2011-11-131-3/+133
* - Added checks inside the UOW to detect the unusualMike Bayer2011-04-101-1/+1
* - move all the comments that got shoved below the fixture grabs back upMike Bayer2011-03-271-23/+34
* - remove test.sql._base, test.engine._base, test.orm._base, move those classe...Mike Bayer2011-03-271-5/+6
* - move all the setup_classes(cls) and setup_mappers(cls) to use aMike Bayer2011-03-271-2/+2
* - remove @testing.resolve_artifact_names, replace with direct attributeMike Bayer2011-03-261-32/+122
* - Session constructor emits a warning when autoflush=TrueMike Bayer2011-02-071-2/+2
* - whitespace removal bonanzaMike Bayer2011-01-021-55/+55
* - add QueryContext to load(), refresh()Mike Bayer2010-12-311-1/+1
* - removes the "on_" prefix.Mike Bayer2010-12-301-55/+55
* new calling style: event.listen(target, identifier, fn)Mike Bayer2010-12-011-1/+1
* merge backoutMike Bayer2010-11-281-16/+6
|\
| * after some usage, its clear that [ticket:1974] should not be implemented. b...Mike Bayer2010-11-281-16/+6
* | - sqlalchemy.test and nose plugin moves back to being entirelyMike Bayer2010-11-281-4/+4
|\ \ | |/ |/|
| * - move sqlalchemy.test to test.libMike Bayer2010-11-151-4/+4
* | - cascade_backrefs flag on relationship() now set to False by default.Mike Bayer2010-11-281-6/+16
* | - reorganizationMike Bayer2010-09-141-2/+2
* | - pretty much all tests passing, maybe some callcounts are offMike Bayer2010-07-251-1/+1
|/
* - session.merge() will not expire attributes on the returnedMike Bayer2010-05-081-0/+13
* - To accomodate the fact that there are now two kinds of eagerMike Bayer2010-03-241-1/+1
* - The official name for the relation() function is nowMike Bayer2010-03-171-24/+24
* - session.merge() will not expire existing scalar attributesMike Bayer2010-02-231-3/+93
* - The "allow_null_pks" flag is now called "allow_partial_pks",Mike Bayer2010-02-221-3/+35
* Fixed bug in session.merge() blocking dict-like collections from merging.Jason Kirtland2010-02-111-1/+17
* - merge() will not issue a needless merge of attributes if theMike Bayer2010-01-101-0/+58
* - Session.merge() is performance optimized, using half theMike Bayer2010-01-071-1/+39
* - Session.merge() now properly overwrites a many-to-one orMike Bayer2009-12-141-0/+22
* - Fixed a needless select which would occur when mergingMike Bayer2009-12-071-0/+10
* merge 0.6 series to trunk.Mike Bayer2009-08-061-33/+53
* - Fixed bug whereby list-based attributes, like pickletypeMike Bayer2009-06-151-3/+33
* - unit tests have been migrated from unittest to nose.Mike Bayer2009-06-101-0/+735