diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2019-04-28 18:43:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2019-04-28 18:43:37 +0000 |
| commit | a3145cffe2bdce393795cf9cd51605227be00b7f (patch) | |
| tree | c8a5f86fcd39c937de624852cffebca1321aef9c /lib/sqlalchemy | |
| parent | 0ee9d61e8709ebf0e3f4bbfa0f82f8a032dac97a (diff) | |
| parent | 23a1c60982dc4799c76f0cec276a3bae8a24395b (diff) | |
| download | sqlalchemy-a3145cffe2bdce393795cf9cd51605227be00b7f.tar.gz | |
Merge "Warn on merge of already-pending object"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 0b1a3b101..eccd60fe2 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -2110,6 +2110,13 @@ class Session(_SessionClassMethods): key = state.key if key is None: + if state in self._new: + util.warn( + "Instance %s is already pending in this Session yet is " + "being merged again; this is probably not what you want " + "to do" % state_str(state) + ) + if not load: raise sa_exc.InvalidRequestError( "merge() with load=False option does not support " |