diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2018-02-27 14:46:30 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2018-02-27 14:46:30 -0500 |
| commit | b055132b89529aa2665321ca4216bc0f9d89e91e (patch) | |
| tree | 34a316e3346d202f0705618c50997fa42bad9650 | |
| parent | a10bc4fdaa8ff95a2b7930622cb76a1aa07806f1 (diff) | |
| parent | 31d28179c29e987a6ed844f6b8abf5dc1574e594 (diff) | |
| download | sqlalchemy-b055132b89529aa2665321ca4216bc0f9d89e91e.tar.gz | |
Merge remote-tracking branch 'origin/pr/421'
| -rw-r--r-- | doc/build/orm/session_state_management.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/orm/session_state_management.rst b/doc/build/orm/session_state_management.rst index 40fda4c75..7387ee637 100644 --- a/doc/build/orm/session_state_management.rst +++ b/doc/build/orm/session_state_management.rst @@ -350,7 +350,7 @@ Another example of unexpected state:: >>> a1 = Address(id=existing_a1.id, user_id=u1.id) >>> assert a1.user is None - >>> True + True >>> a1 = session.merge(a1) >>> session.commit() sqlalchemy.exc.IntegrityError: (IntegrityError) address.user_id |