maxkratz/edgedb
1
0
Fork 0
mirror of https://github.com/maxkratz/edgedb.git synced 2024-09-16 18:59:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make ir_typeref_to_type always try a lookup before construction a collection: 3%

Browse source
This commit is contained in:
Michael J. Sullivan 2023-12-06 19:48:24 -08:00
parent d1a006c457
commit 363fcac9a4
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
edb/ir/typeutils.py
View file

@ -31,7 +31,6 @@ from edb.schema import links as s_links
from edb.schema import name as s_name
from edb.schema import properties as s_props
from edb.schema import pointers as s_pointers
from edb.schema import pseudo as s_pseudo
from edb.schema import scalars as s_scalars
from edb.schema import types as s_types
from edb.schema import objtypes as s_objtypes
@ -477,14 +476,11 @@ def ir_typeref_to_type(
a :class:`schema.types.Type` instance corresponding to the
given *typeref*.
"""
if is_anytuple(typeref):
return schema, s_pseudo.PseudoType.get(schema, 'anytuple')
if is_anyobject(typeref):
return schema, s_pseudo.PseudoType.get(schema, 'anyobject')
elif is_any(typeref):
return schema, s_pseudo.PseudoType.get(schema, 'anytype')
# Optimistically try to lookup the type by id. Sometimes for
# arrays and tuples this will fail, and we'll need to create it.
t = schema.get_by_id(typeref.id, default=None, type=s_types.Type)
if t:
return schema, t
elif is_tuple(typeref):
named = False
@ -511,9 +507,7 @@ def ir_typeref_to_type(
return s_types.Array.from_subtypes(schema, array_subtypes)
else:
t = schema.get_by_id(typeref.id)
assert isinstance(t, s_types.Type), 'expected a Type instance'
return schema, t
raise AssertionError("couldn't find type from typeref")
@overload

4
tests/test_edgeql_ir_pathid.py
View file

@ -54,6 +54,8 @@ class TestEdgeQLIRPathID(tb.BaseEdgeQLCompilerTest):
ptr_ref = irtyputils.ptrref_from_ptrcls(
schema=self.schema,
ptrcls=ptr,
cache=None,
typeref_cache=None,
)
return pid.extend(ptrref=ptr_ref, ns=ns, direction=dir)
@ -76,7 +78,7 @@ class TestEdgeQLIRPathID(tb.BaseEdgeQLCompilerTest):
start = path[0]
typ = self.schema.get(f'default::{start}')
pid = pathid.PathId.from_type(self.schema, typ, namespace=ns)
pid = pathid.PathId.from_type(self.schema, typ, namespace=ns, env=None)
return self.extend_many(pid, *path[1:])