Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove a hack only necessary on our stable branches #5719

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove a hack only necessary on our stable branches #5719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a9c1ef
Remove a hack only necessary on our stable branches
msullivan Jun 29, 2023
9b6af47
Merge remote-tracking branch 'origin/master' into type-undo
aljazerzen Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions edb/schema/inheriting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,6 @@ def get_inherited_ref_layout(
for v in sd.sort_by_cross_refs(schema, base_refs.values())
}

# HACK: Because of issue #5661, we previously did not always
# properly discover dependencies on __type__ in computeds.
# This was fixed, but it may persist in existing databases.
# Currently, expr refs are not compared when diffing schemas,
# so a schema repair can't fix this. Thus, in addition to
# actually fixing the bug, we hack around it by forcing
# __type__ to sort to the front.
# TODO: Drop this after cherry-picking.
if (tname := sn.UnqualName('__type__')) in base_refs:
base_refs[tname] = base_refs.pop(tname)

for k, v in reversed(base_refs.items()):
if not v.should_propagate(schema):
continue
Expand Down
Loading