summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorFederico Caselli <cfederico87@gmail.com>2023-04-25 13:47:04 +0200
committerFederico Caselli <cfederico87@gmail.com>2023-04-28 20:38:24 +0200
commitf45f4a3afc3c260d50773c647eb7b1c270bb8e00 (patch)
tree5486c2a26cc7e868161c97a326cd20291f305a18 /lib/sqlalchemy/sql
parent0596adcc27e4e14c4692a58cd32d39df6f48b09a (diff)
downloadsqlalchemy-f45f4a3afc3c260d50773c647eb7b1c270bb8e00.tar.gz
Improve oracle index reflection
Added reflection support in the Oracle dialect to expression based indexes and the ordering direction of index expressions. Fixes: #9597 Change-Id: I40e163496789774e9930f46823d2208c35eab6f8
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: