Look in std when using module alias.

geldata · Oct 7, 2024 · e8366b3 · e8366b3
1 parent c954d1a
commit e8366b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/edb/schema/schema.py b/edb/schema/schema.py
@@ -1128,12 +1128,7 @@ def _search_with_getter(
                 return result
 
         # Try something in std, but only if there isn't a module clash
-        if not local and (
-            orig_module is None
-            or (
-                not alias_hit and module
-            )
-        ):
+        if not local:
             # If no module was specified, look in std
             if orig_module is None:
                 mod_name = 'std'
@@ -1151,11 +1146,7 @@ def _search_with_getter(
                 self.has_module(fmod := module.split('::')[0])
                 or (disallow_module and disallow_module(fmod))
             ):
-                mod_name = (
-                    f'std::{module}'
-                    if orig_module is None
-                    else f'std::{orig_module}'
-                )
+                mod_name = f'std::{module}'
                 fqname = sn.QualName(mod_name, shortname)
                 result = getter(self, fqname)
                 if result is not None:

diff --git a/tests/test_edgeql_expressions.py b/tests/test_edgeql_expressions.py
@@ -10094,7 +10094,7 @@ async def test_edgeql_expr_with_module_03(self):
             (REF_ERR, with_mod + 'select abs(1)'),
             (NO_ERR, with_mod + 'select _test::abs(1)'),
             (NO_ERR, with_mod + 'select std::_test::abs(1)'),
-            (REF_ERR, with_mod + 'select t::abs(1)'),
+            (NO_ERR, with_mod + 'select t::abs(1)'),
         ]
         with_mod = 'with s as module std '
         queries += [
@@ -10243,7 +10243,7 @@ async def test_edgeql_expr_with_module_05(self):
             (REF_ERR, with_mod + 'select <Foo>1'),
             (NO_ERR, with_mod + 'select <test::Foo>1'),
             (NO_ERR, with_mod + 'select <std::test::Foo>1'),
-            (REF_ERR, with_mod + 'select <t::Foo>1'),
+            (NO_ERR, with_mod + 'select <t::Foo>1'),
         ]
         with_mod = 'with s as module std '
         queries += [

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -3306,7 +3306,7 @@ def test_schema_with_module_03(self):
             (REF_ERR, with_mod + 'select abs(1)'),
             (NO_ERR, with_mod + 'select _test::abs(1)'),
             (NO_ERR, with_mod + 'select std::_test::abs(1)'),
-            (REF_ERR, with_mod + 'select t::abs(1)'),
+            (NO_ERR, with_mod + 'select t::abs(1)'),
         ]
         with_mod = 'with s as module std '
         queries += [
@@ -11624,6 +11624,7 @@ def test_schema_describe_with_module_03(self):
         queries += [
             with_mod + 'select _test::abs(1)',
             with_mod + 'select std::_test::abs(1)',
+            with_mod + 'select t::abs(1)',
         ]
         with_mod = 'with s as module std '
         queries += [