diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-05 16:29:08 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-05 16:29:08 -0400 |
| commit | d39daa43fe79c40419adf4babc5ae04f814461b7 (patch) | |
| tree | 8346d3736b5f4b323ec77ea63f4342e7cad82329 /lib/sqlalchemy/orm/persistence.py | |
| parent | d2c05c36a5c5f5b4838e924b4de2280f73916c99 (diff) | |
| parent | 583287259fbb6d143696b418756ed68e6110cd2d (diff) | |
| download | sqlalchemy-d39daa43fe79c40419adf4babc5ae04f814461b7.tar.gz | |
Merge branch 'master' into ticket_3100
Diffstat (limited to 'lib/sqlalchemy/orm/persistence.py')
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index 2a697a6f9..1288c910f 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -923,9 +923,9 @@ def _postfetch(mapper, uowtransaction, table, after an INSERT or UPDATE statement has proceeded for that state.""" - prefetch_cols = result.context.prefetch_cols - postfetch_cols = result.context.postfetch_cols - returning_cols = result.context.returning_cols + prefetch_cols = result.context.compiled.prefetch + postfetch_cols = result.context.compiled.postfetch + returning_cols = result.context.compiled.returning if mapper.version_id_col is not None and \ mapper.version_id_col in mapper._cols_by_table[table]: |