[ksqlDB.RestApi.Client]: Merge branch 'release/6.5' of https://github.com/tomasfabian/ksqlDB.RestApi.Client-DotNet

Author: tomasfabian

Tests/ksqlDB.RestApi.Client.Tests/FluentAPI/Builders/EntityTypeBuilderTests.cs

@@ -55,7 +55,7 @@ public void RowTime_Property_ShouldBeIgnoredInDDL()
       builder.Metadata.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Tweet.RowTime)).IgnoreInDDL.Should().BeTrue();
     }
 
-    public class Foo
+    public class Row
     {
       public long RowTime;
     }
@@ -66,10 +66,10 @@ public void RowTime_Field_ShouldBeIgnoredInDDL()
       //Arrange
 
       //Act
-      EntityTypeBuilder<Foo> fooBuilder = new();
+      EntityTypeBuilder<Row> rowBuilder = new();
 
       //Assert
-      fooBuilder.Metadata.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Foo.RowTime)).IgnoreInDDL.Should().BeTrue();
+      rowBuilder.Metadata.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Row.RowTime)).IgnoreInDDL.Should().BeTrue();
     }
 
     [Test]
@@ -87,5 +87,24 @@ public void DecimalType_ShouldHaveDecimalFieldMetadata()
         .First(c => c.MemberInfo.Name == nameof(Tweet.AccountBalance))
         .Should().NotBeNull();
     }
+
+    public class MyValue : Row
+    {
+      public int Id { get; set; }
+    }
+
+    [Test]
+    public void RowTimeField_AsPseudoColumn_ShouldBeRegisteredOnce()
+    {
+      //Arrange
+      EntityTypeBuilder<MyValue> customBuilder = new();
+
+      //Act
+      customBuilder.Property(c => c.RowTime)
+        .AsPseudoColumn();
+
+      //Assert
+      customBuilder.Metadata.FieldsMetadata.Count(c => c.MemberInfo.Name == nameof(Row.RowTime)).Should().Be(1);
+    }
   }
 }

ksqlDb.RestApi.Client/ChangeLog.md

@@ -1,13 +1,16 @@
 # ksqlDB.RestApi.Client
 
-# 7.0.0
+# 7.0.0 (unreleased)
 - added .NET 9.0 target framework
 
 # ⚠️ Breaking changes
 - removed usupported .NET 6.0, and 7.0 target frameworks
 - upgraded Microsoft packages to v9.0.0: `Microsoft.Extensions.DependencyInjection`, `Microsoft.Extensions.Http`, and `Microsoft.Extensions.Logging.Abstractions`
 - upgraded `System.Text.Json` to v9.0.0 
 
+# 6.5.1
+- fixed `IEntityTypeBuilder<TEntity>.Entity<TEntity>` automatically creates FieldMetadata for primitive field in Base class #102
+
 # 6.5.0
 - added the `AsPseudoColumn` function to the Fluent API for mapping of C# fields or properties as `ksqldb` [pseudocolumns](https://docs.ksqldb.io/en/latest/reference/sql/data-definition/#pseudocolumns).
 

ksqlDb.RestApi.Client/FluentAPI/Builders/EntityTypeBuilder.cs

@@ -57,9 +57,10 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
       string path = string.Empty;
       foreach (var (memberName, memberInfo) in members)
       {
+        var memberInfoKey = memberInfo.ToMemberInfoKey();
         path += memberName;
 
-        if (!Metadata.FieldsMetadataDict.TryGetValue(memberInfo, out var fieldMetadata))
+        if (!Metadata.FieldsMetadataDict.TryGetValue(memberInfoKey, out var fieldMetadata))
         {
           fieldMetadata = new FieldMetadata()
           {
@@ -86,7 +87,7 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
             break;
         }
 
-        Metadata.FieldsMetadataDict[memberInfo] = fieldMetadata;
+        Metadata.FieldsMetadataDict[memberInfoKey] = fieldMetadata;
         path += ".";
       }
 
@@ -122,6 +123,8 @@ internal void IgnoreRowTime()
 
     private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
     {
+      var memberInfoKey = memberInfo.ToMemberInfoKey();
+
       var fieldMetadata = new FieldMetadata
       {
         MemberInfo = memberInfo,
@@ -130,7 +133,7 @@ private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
         IgnoreInDDL = ignoreInDDL
       };
 
-      Metadata.FieldsMetadataDict[memberInfo] = fieldMetadata;
+      Metadata.FieldsMetadataDict[memberInfoKey] = fieldMetadata;
     }
   }
 }

ksqlDb.RestApi.Client/FluentAPI/Builders/MemberInfoKey.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+
+namespace ksqlDb.RestApi.Client.FluentAPI.Builders;
+
+internal record MemberInfoKey
+{
+  internal Module Module { get; set; }
+  internal int MetadataToken { get; set; }
+}
+
+internal static class MemberInfoExtensions
+{
+  internal static MemberInfoKey ToMemberInfoKey(this MemberInfo memberInfo)
+  {
+    return new MemberInfoKey
+    {
+      Module = memberInfo.Module,
+      MetadataToken = memberInfo.MetadataToken
+    };
+  }
+}

ksqlDb.RestApi.Client/Metadata/EntityMetadata.cs

@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 
 namespace ksqlDb.RestApi.Client.Metadata
 {
@@ -9,7 +10,7 @@ internal sealed class EntityMetadata
 
     internal MemberInfo? PrimaryKeyMemberInfo { get; set; }
 
-    internal readonly IDictionary<MemberInfo, FieldMetadata> FieldsMetadataDict = new Dictionary<MemberInfo, FieldMetadata>();
+    internal readonly IDictionary<MemberInfoKey, FieldMetadata> FieldsMetadataDict = new Dictionary<MemberInfoKey, FieldMetadata>();
 
     public IEnumerable<FieldMetadata> FieldsMetadata => FieldsMetadataDict.Values;