Change cache key for aliases. Related to #571

FCO · Feb 25, 2024 · 4123910 · 4123910
1 parent d507b3d
commit 4123910
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/MetamodelX/Red/Model.rakumod b/lib/MetamodelX/Red/Model.rakumod
@@ -251,8 +251,9 @@ multi method join(\model, \to-join, $on where *.^can("relationship-ast"), :$name
 
 my UInt $alias_num = 1;
 method alias(|c (Red::Model:U \type, Str $name = "{type.^name}_{$alias_num++}", :$base, :$relationship, :$join-type, Bool :$opposite)) {
+    my $cache-key = c.WHICH;
     $!alias-cache-lock.protect: {
-        return %!alias-cache{$name} if %!alias-cache{$name}:exists;
+        return %!alias-cache{$cache-key} if %!alias-cache{$cache-key}:exists;
         my \alias = ::?CLASS.new_type(:$name);
 
         my role RAlias[Red::Model:U \rtype, Str $rname, \alias, \rel, \base, \join-type, @cols] {
@@ -312,7 +313,7 @@ method alias(|c (Red::Model:U \type, Str $name = "{type.^name}_{$alias_num++}",
             alias.^add-relationship: $rel.transfer: alias
         }
         alias.^compose;
-        %!alias-cache{$name} = alias;
+        %!alias-cache{$cache-key} = alias;
 
         return alias;
     }

diff --git a/lib/Red/ResultSeq.rakumod b/lib/Red/ResultSeq.rakumod
@@ -447,7 +447,7 @@ multi method join-model(Red::Model \model, &on, :$name = "{ self.^shortname }_{
         }
         model.^all.where: $filter
     } else {
-        self.of.^join(model, &on, :$name,  |%pars).^all.clone: :$!chain
+        self.of.^join(model, &on, :$name, |%pars).^all.clone: :$!chain
     }
 }