Skip to content

Commit

Permalink
[ksqlDB.RestApi.Client]: fixed creation of multiple FieldMetadata for…
Browse files Browse the repository at this point in the history
… primitive field in Base class unit test #102
  • Loading branch information
tomasfabian committed Nov 23, 2024
1 parent 644b29a commit 111a03f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
12 changes: 2 additions & 10 deletions ksqlDb.RestApi.Client/FluentAPI/Builders/EntityTypeBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
string path = string.Empty;
foreach (var (memberName, memberInfo) in members)
{
var memberInfoKey = new MemberInfoKey
{
Module = memberInfo.Module,
MetadataToken = memberInfo.MetadataToken
};
var memberInfoKey = memberInfo.ToMemberInfoKey();
path += memberName;

if (!Metadata.FieldsMetadataDict.TryGetValue(memberInfoKey, out var fieldMetadata))
Expand Down Expand Up @@ -127,11 +123,7 @@ internal void IgnoreRowTime()

private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
{
var memberInfoKey = new MemberInfoKey
{
Module = memberInfo.Module,
MetadataToken = memberInfo.MetadataToken
};
var memberInfoKey = memberInfo.ToMemberInfoKey();

var fieldMetadata = new FieldMetadata
{
Expand Down
18 changes: 14 additions & 4 deletions ksqlDb.RestApi.Client/FluentAPI/Builders/MemberInfoKey.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
using System.Reflection;

namespace ksqlDb.RestApi.Client.FluentAPI.Builders
namespace ksqlDb.RestApi.Client.FluentAPI.Builders;
internal record MemberInfoKey
{
internal record MemberInfoKey
internal Module Module { get; set; }
internal int MetadataToken { get; set; }
}

internal static class MemberInfoExtensions
{
internal static MemberInfoKey ToMemberInfoKey(this MemberInfo memberInfo)
{
internal Module Module { get; set; }
internal int MetadataToken { get; set; }
return new MemberInfoKey
{
Module = memberInfo.Module,
MetadataToken = memberInfo.MetadataToken
};
}
}

0 comments on commit 111a03f

Please sign in to comment.