Merge pull request #104 from mrt181/main

fix: check for ModelBuilder set PseudoColumns

Author: tomasfabian

Tests/ksqlDB.RestApi.Client.Tests/KSql/Linq/PullQueries/PullQueryExtensionsTests.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.Linq.PullQueries;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using ksqlDB.RestApi.Client.KSql.Query.Functions;
@@ -245,4 +246,39 @@ public string SelectColumnsUsingPullQueryThatHaveJsonPropertyNameAndWhere(Identi
     //Assert
     return ksql.ReplaceLineEndings();
   }
+
+  private class Record
+  {
+    public long? RowOffset { get; set; }
+    public short? RowPartition { get; set; }
+    public long RowTime { get; set; }
+  }
+
+  private class Test : Record
+  {
+    public string Name { get; set; }
+  }
+
+  [TestCase(Never, ExpectedResult = $"SELECT RowTime, RowOffset, RowPartition, Name FROM {nameof(Test)};")]
+  [TestCase(Keywords, ExpectedResult = $"SELECT RowTime, RowOffset, RowPartition, Name FROM {nameof(Test)};")]
+  [TestCase(Always, ExpectedResult = $"SELECT RowTime, RowOffset, RowPartition, `Name` FROM `{nameof(Test)}`;")]
+  public string SelectColumnsUsingModelBuilderWithPseudoColum(IdentifierEscaping escaping)
+  {
+    //Arrange
+    var modelBuilder = new ModelBuilder();
+    modelBuilder.Entity<JsonPropertyNameTestData>().Property(i => i.RowOffset).AsPseudoColumn();
+    modelBuilder.Entity<JsonPropertyNameTestData>().Property(i => i.RowPartition).AsPseudoColumn();
+    modelBuilder.Entity<JsonPropertyNameTestData>().Property(i => i.RowTime).AsPseudoColumn();
+
+    var dbContext = new KSqlDBContext(new KSqlDBContextOptions(TestParameters.KsqlDbUrl)
+      { IdentifierEscaping = escaping, ShouldPluralizeFromItemName = false }, modelBuilder);
+
+    //Act
+    var ksql = dbContext.CreatePullQuery<Test>()
+      .Select(c => new { c.RowTime, c.RowOffset, c.RowPartition, c.Name })
+      .ToQueryString();
+
+    //Assert
+    return ksql.ReplaceLineEndings();
+  }
 }

ksqlDb.RestApi.Client/ChangeLog.md

@@ -8,7 +8,12 @@
 ## 💥 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 
+- upgraded `System.Text.Json` to v9.0.0
+
+# 6.5.2
+
+## 🐛 Bug Fixes
+- fixed `IdentifierUtil.IsPseudoColumn` to handle PseudoColumns that are set using `ModelBuilder` correctly
 
 # 6.5.1
 

ksqlDb.RestApi.Client/KSql/RestApi/Parsers/IdentifierUtil.cs

@@ -96,7 +96,8 @@ private static bool IsPseudoColumn(MemberInfo memberInfo, IMetadataProvider? met
       if (memberInfo.GetCustomAttribute<PseudoColumnAttribute>() != null)
         return true;
 
-      var entityMetadata = metadataProvider?.GetEntities().FirstOrDefault(c => c.Type == memberInfo.DeclaringType);
+      var entityMetadata = metadataProvider?.GetEntities().FirstOrDefault(c =>
+        c.FieldsMetadata.FirstOrDefault(fmd => fmd.Path == memberInfo.Name)?.IsPseudoColumn ?? false);
 
       var fieldMetadata =
         entityMetadata?.FieldsMetadata.FirstOrDefault(c => c.MemberInfo.Name == memberInfo.Name);