diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-04-17 17:25:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-04-17 17:25:00 +0000 |
| commit | 4d85ec13725556f8f18a348c1657649faa9ce32a (patch) | |
| tree | 731b2f7be12939a246a78afab9dc73b87326c13e /lib/sqlalchemy/sql/selectable.py | |
| parent | e2091644678f0d5887d200c32aceca52299a6ca4 (diff) | |
| parent | 9f758d7fe328107cd3d047b8c999dce228a570d1 (diff) | |
| download | sqlalchemy-4d85ec13725556f8f18a348c1657649faa9ce32a.tar.gz | |
Merge "Don't stringify unnamed column elements when proxying"
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 3a90f77fb..adfee1737 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -4138,7 +4138,7 @@ class SelectState(util.MemoizedSlots, CompileState): if name in names: if not pa: pa.append(prefix_anon_map()) - name = c.anon_key_label % pa[0] + name = c._anon_key_label % pa[0] else: names.add(name) @@ -5683,13 +5683,13 @@ class Select( return (None, c, False) elif use_tablename_labels: if c._label is None: - repeated = c.anon_label in names - names[c.anon_label] = c + repeated = c._anon_name_label in names + names[c._anon_name_label] = c return (None, c, repeated) elif getattr(c, "name", None) is None: # this is a scalar_select(). need to improve this case - repeated = c.anon_label in names - names[c.anon_label] = c + repeated = c._anon_name_label in names + names[c._anon_name_label] = c return (None, c, repeated) if use_tablename_labels: @@ -5711,7 +5711,7 @@ class Select( if use_tablename_labels: name = c._label_anon_label else: - name = c.anon_label + name = c._anon_name_label if anon_for_dupe_key and name in names: # here, c._label_anon_label is definitely unique to @@ -5775,7 +5775,7 @@ class Select( if key is not None and key in keys_seen: if pa is None: pa = prefix_anon_map() - key = c.anon_key_label % pa + key = c._anon_key_label % pa keys_seen.add(key) else: key = c._proxy_key |