diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-02-22 13:41:14 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2018-02-22 13:41:14 -0500 |
| commit | 5614bffb2549b0aae2e7e41fe10bed12e06f457d (patch) | |
| tree | b5863635c770260a2843aa6103af4f1a808608e0 /lib/sqlalchemy | |
| parent | 14eae5108d655e71bb80572109b4cd8f8a0fe51c (diff) | |
| parent | 8ab7c9639881e75eb93014438d30cc7208d3f796 (diff) | |
| download | sqlalchemy-5614bffb2549b0aae2e7e41fe10bed12e06f457d.tar.gz | |
Merge "Ensure mapping has no version_id_generator when checking missing version_id"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index dc0ae1c38..4f1e08afa 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -1127,7 +1127,8 @@ def _finalize_insert_update_commands(base_mapper, uowtransaction, states): else: mapper.dispatch.after_update(mapper, connection, state) - if mapper.version_id_col is not None: + if mapper.version_id_generator is False and \ + mapper.version_id_col is not None: if state_dict[mapper._version_id_prop.key] is None: raise orm_exc.FlushError( "Instance does not contain a non-NULL version value") |