Fix globals in nested modules (#474)

Fixes #472.
edgedb · Feb 1, 2024 · 004c87e · 004c87e
1 parent c916eef
commit 004c87e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/edgedb/options.py b/edgedb/options.py
@@ -182,15 +182,15 @@ def with_config(self, *args, **config):
         )
 
     def resolve(self, name: str) -> str:
-        parts = name.split("::")
+        parts = name.split("::", 1)
         if len(parts) == 1:
             return f"{self._module or 'default'}::{name}"
         elif len(parts) == 2:
             mod, name = parts
             mod = self._aliases.get(mod, mod)
             return f"{mod}::{name}"
         else:
-            raise errors.InvalidArgumentError(f"Illegal name: {name}")
+            raise AssertionError('broken split')
 
     def with_globals(self, *args, **globals_):
         if len(args) > 1:

diff --git a/tests/test_globals.py b/tests/test_globals.py
@@ -36,6 +36,9 @@ async def test_globals_01(self):
             CREATE GLOBAL def_glob -> str {
                 SET default := '!';
             };
+            CREATE MODULE foo;
+            CREATE MODULE foo::bar;
+            CREATE GLOBAL foo::bar::baz -> str;
         ''')
 
         async with db.with_globals(glob='test') as gdb:
@@ -61,6 +64,10 @@ async def test_globals_01(self):
             x = await gdb.query_single('select global def_glob')
             self.assertEqual(x, None)
 
+        async with db.with_globals({'foo::bar::baz': 'asdf'}) as gdb:
+            x = await gdb.query_single('select global foo::bar::baz')
+            self.assertEqual(x, 'asdf')
+
     async def test_client_state_mismatch(self):
         db = self.client
         if db.is_proto_lt_1_0: