summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2023-05-09 14:39:18 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2023-05-09 14:39:18 +0000
commita7d8063171d87eef0f89e114e919ea8e07023db3 (patch)
treee0858fc9c2218aaf71a3dbee1a2540beb432b7b3 /lib/sqlalchemy/sql
parenta517e14ee4c44488a2a765c588fa9a2a440b0662 (diff)
parentf45f4a3afc3c260d50773c647eb7b1c270bb8e00 (diff)
downloadsqlalchemy-a7d8063171d87eef0f89e114e919ea8e07023db3.tar.gz
Merge "Improve oracle index reflection" into main
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/base.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index 309555338..ee80b0514 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -1962,13 +1962,16 @@ class DedupeColumnCollection(ColumnCollection[str, _NAMEDCOL]):
# in a _make_proxy operation
util.memoized_property.reset(named_column, "proxy_set")
else:
- l = len(self._collection)
- self._collection.append(
- (key, named_column, _ColumnMetrics(self, named_column))
- )
- self._colset.add(named_column._deannotate())
- self._index[l] = (key, named_column)
- self._index[key] = (key, named_column)
+ self._append_new_column(key, named_column)
+
+ def _append_new_column(self, key: str, named_column: _NAMEDCOL) -> None:
+ l = len(self._collection)
+ self._collection.append(
+ (key, named_column, _ColumnMetrics(self, named_column))
+ )
+ self._colset.add(named_column._deannotate())
+ self._index[l] = (key, named_column)
+ self._index[key] = (key, named_column)
def _populate_separate_keys(
self, iter_: Iterable[Tuple[str, _NAMEDCOL]]
@@ -2057,6 +2060,9 @@ class DedupeColumnCollection(ColumnCollection[str, _NAMEDCOL]):
if column.key in self._index:
remove_col.add(self._index[column.key][1])
+ if not remove_col:
+ self._append_new_column(column.key, column)
+ return
new_cols: List[Tuple[str, _NAMEDCOL, _ColumnMetrics[_NAMEDCOL]]] = []
replaced = False
for k, col, metrics in self._collection: