diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-03-04 02:32:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-03-04 02:32:21 +0000 |
| commit | 7768a89d6e373639b63ecb35639dd3cec15e1407 (patch) | |
| tree | 3adc3008a115f4a877a6acb1b3155513a03f82a9 /lib/sqlalchemy | |
| parent | 3c682d225d21faf751fe6c4d5bcb1efc0c5bf5f8 (diff) | |
| parent | 7fe400f54632835695f7b98f0c1a54424953dfad (diff) | |
| download | sqlalchemy-7768a89d6e373639b63ecb35639dd3cec15e1407.tar.gz | |
Merge "Restore crud flags if visiting_cte is set"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/crud.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index d31cf67f8..424282951 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -723,6 +723,7 @@ class SQLCompiler(Compiled): # a map which tracks "truncated" names based on # dialect.label_length or dialect.max_identifier_length self.truncated_names = {} + Compiled.__init__(self, dialect, statement, **kwargs) if ( diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py index 433a5fdfa..e474952ce 100644 --- a/lib/sqlalchemy/sql/crud.py +++ b/lib/sqlalchemy/sql/crud.py @@ -44,8 +44,10 @@ def _setup_crud_params(compiler, stmt, local_stmt_type, **kw): restore_isdelete = compiler.isdelete should_restore = ( - restore_isinsert or restore_isupdate or restore_isdelete - ) or len(compiler.stack) > 1 + (restore_isinsert or restore_isupdate or restore_isdelete) + or len(compiler.stack) > 1 + or "visiting_cte" in kw + ) if local_stmt_type is ISINSERT: compiler.isupdate = False |