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.

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

Get rid of some import cycle fragility that breaks LSP #8307

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions edb/schema/unknown_pointers.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

from . import delta as sd
from . import objects as so
from . import objtypes as s_objtypes
from . import properties as s_props
from . import pointers
from . import sources
Expand Down Expand Up @@ -127,7 +126,7 @@ def apply(
# It's a link if the target is an object and so is the source.
# If the source isn't, it's a link property, which will fail.
if target.is_object_type()
and isinstance(source, s_objtypes.ObjectType)
and not isinstance(source, pointers.Pointer)
else qlast.CreateConcreteProperty
)
astnode = astnode.replace(__class__=astcls)
Expand Down Expand Up @@ -169,7 +168,7 @@ def _cmd_tree_from_ast(
source = obj.get_source(schema)
is_prop = (
isinstance(obj, s_props.Property)
or not isinstance(source, s_objtypes.ObjectType)
or isinstance(source, pointers.Pointer)
)

astcls = (
Expand Down