Merge 9702ad0 into 448e7a1

microsoft · Aug 18, 2022 · 3ab49ac · 3ab49ac
2 parents 448e7a1 + 9702ad0
commit 3ab49ac
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs b/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs
@@ -2345,7 +2345,12 @@ private static DType SupertypeAggregateCore(DType type1, DType type2, bool useLe
             }
 
             Contracts.Assert(!fError);
-            return new DType(type1.Kind, treeRes, UnionDataSourceInfoMetadata(type1, type2));
+            var returnType = new DType(type1.Kind, treeRes, UnionDataSourceInfoMetadata(type1, type2), type1.DisplayNameProvider);
+
+            returnType = type2.DisplayNameProvider == null ? 
+                returnType :
+                AttachOrDisableDisplayNameProvider(returnType, type2.DisplayNameProvider);
+            return returnType;
         }
 
         // Produces the union of the two given types.

diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs
@@ -263,5 +263,40 @@ public void ValidateExpressionConversionCommaSeparatedLocale(string inputExpress
                 Assert.Equal(outputExpression, outInvariantExpression);
             }
         }
+
+        [Theory]
+        [InlineData("r1.Display1", true)]
+        [InlineData("If(true, r1).Display1", true)]
+        [InlineData("If(true, r1, r1).Display1", true)]
+        [InlineData("If(true, Blank(), r1).Display1", true)]
+
+        // If types are different, you have no access to Display name.
+        [InlineData("If(true, r1, r2).Display1", false)]
+        [InlineData("If(true, r1, r2).Display0", false)]
+        [InlineData("If(true, r1, {Display1 : 123}).Display1", false)]
+
+        // If types are different, you have access to logical name, only if the name and type are same!
+        [InlineData("If(true, r1, r2).F1", true)]
+        [InlineData("If(false, r1, r2).F1", true)]
+        [InlineData("If(true, r1, r2).F0", false)]
+        public void DisplayNameTest(string input, bool succeeds)
+        {
+            var r1 = RecordType.Empty()
+                        .Add(new NamedFormulaType("F1", FormulaType.Number, "Display1"))    
+                        .Add(new NamedFormulaType("F0", FormulaType.String, "Display0")); // F0 is Not a Common type
+
+            var r2 = RecordType.Empty()
+                        .Add(new NamedFormulaType("F1", FormulaType.Number, "Display1"))
+                        .Add(new NamedFormulaType("F0", FormulaType.Number, "Display0"));
+            var parameters = RecordType.Empty()
+                .Add("r1", r1)
+                .Add("r2", r2);
+
+            var engine = new Engine(new PowerFxConfig());
+
+            var result = engine.Check(input, parameters);
+            var actual = result.IsSuccess;
+            Assert.Equal(succeeds, actual);
+        }
     }
 }