[ksqlDB.RestApi.Client]: HasColumnName to Fluent API unit tests

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

@@ -67,6 +67,24 @@ public void Property_IgnoreField()
       entityMetadata!.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Payment.Description)).Ignore.Should().BeTrue();
     }
 
+    [Test]
+    public void Property_HasColumnName()
+    {
+      //Arrange
+      var columnName = "desc";
+
+      //Act
+      var fieldTypeBuilder = builder.Entity<Payment>()
+        .Property(b => b.Description)
+        .HasColumnName(columnName);
+
+      //Assert
+      fieldTypeBuilder.Should().NotBeNull();
+      var entityMetadata = builder.GetEntities().FirstOrDefault(c => c.Type == typeof(Payment));
+      entityMetadata.Should().NotBeNull();
+      entityMetadata!.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Payment.Description)).ColumnName.Should().Be(columnName);
+    }
+
     [Test]
     public void MultiplePropertiesForSameType()
     {

Tests/ksqlDB.RestApi.Client.Tests/Infrastructure/Extensions/TypeExtensionsTests.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using System.Text.Json.Serialization;
 using FluentAssertions;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.Infrastructure.Extensions;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query;
@@ -373,7 +374,7 @@ public void GetMemberName()
     var member = type.GetProperty(nameof(MySensor.Title));
 
     //Act
-    var memberName = member!.GetMemberName();
+    var memberName = member!.GetMemberName(new ModelBuilder());
 
     //Assert
     memberName.Should().Be(nameof(MySensor.Title));
@@ -388,9 +389,31 @@ public void GetMemberName_JsonPropertyNameOverride()
     //Act
     var member = type.GetProperty(nameof(MySensor.SensorId2));
 
-    var memberName = member!.GetMemberName();
+    var memberName = member!.GetMemberName(new ModelBuilder());
 
     //Assert
     memberName.Should().Be("SensorId");
   }
+
+  [Test]
+  public void GetMemberName_ModelBuilderHasColumnName()
+  {
+    //Arrange
+    var columnName = "Id";
+
+    var modelBuilder = new ModelBuilder();
+    modelBuilder.Entity<MySensor>()
+      .Property(c => c.SensorId2)
+      .HasColumnName(columnName);
+
+    var type = typeof(MySensor);
+
+    //Act
+    var member = type.GetProperty(nameof(MySensor.SensorId2));
+
+    var memberName = member!.GetMemberName(modelBuilder);
+
+    //Assert
+    memberName.Should().Be(columnName);
+  }
 }

Tests/ksqlDB.RestApi.Client.Tests/KSql/Linq/QbservableGroupByExtensionsTests.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using ksqlDB.RestApi.Client.KSql.Query.Windows;
@@ -507,6 +508,12 @@ public TestableDbProvider(string ksqlDbUrl, string httpResponse)
     });
   }
 
+  public TestableDbProvider(KSqlDBContextOptions contextOptions, ModelBuilder modelBuilder) 
+    : base(contextOptions, modelBuilder)
+  {
+    RegisterKSqlQueryGenerator = false;
+  }
+
   public TestableDbProvider(KSqlDBContextOptions contextOptions) 
     : base(contextOptions)
   {

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Context/TestableDbProvider.cs

@@ -1,3 +1,4 @@
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.Query;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using ksqlDB.RestApi.Client.KSql.RestApi;
@@ -8,12 +9,20 @@ namespace ksqlDb.RestApi.Client.Tests.KSql.Query.Context;
 
 public class TestableDbProvider<TValue> : KSqlDBContext
 {
-  public TestableDbProvider(string ksqlDbUrl) : base(ksqlDbUrl)
+  public TestableDbProvider(string ksqlDbUrl)
+    : base(ksqlDbUrl)
   {
     InitMocks();
   }
 
-  public TestableDbProvider(KSqlDBContextOptions contextOptions) : base(contextOptions)
+  public TestableDbProvider(KSqlDBContextOptions contextOptions)
+    : base(contextOptions)
+  {
+    InitMocks();
+  }
+
+  public TestableDbProvider(KSqlDBContextOptions contextOptions, ModelBuilder modelBuilder)
+    : base(contextOptions, modelBuilder)
   {
     InitMocks();
   }

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/KSqlQueryLanguageVisitorTests.cs → Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/KSqlQueryGeneratorTests.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using FluentAssertions;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
@@ -19,7 +20,7 @@ namespace ksqlDb.RestApi.Client.Tests.KSql.Query;
 
 #pragma warning disable CA1861
 
-public class KSqlQueryLanguageVisitorTests : TestBase
+public class KSqlQueryGeneratorTests : TestBase
 {
   private KSqlQueryGenerator ClassUnderTest { get; set; } = null!;
 
@@ -87,6 +88,77 @@ public void BuildKSql_SelectPropertyWithJsonPropertyNameAttribute()
     ksql.Should().BeEquivalentTo(expectedKsql.ReplaceLineEndings());
   }
 
+  [Test]
+  public void BuildKSql_ModelBuilder_HasColumnNameOverride()
+  {
+    //Arrange
+    string idColumnName = "Id";
+    ModelBuilder modelBuilder = new ModelBuilder();
+    modelBuilder.Entity<MySensor>()
+      .Property(c => c.SensorId2)
+      .HasColumnName(idColumnName);
+
+    var query = new TestableDbProvider(contextOptions, modelBuilder)
+      .CreatePushQuery<MySensor>()
+      .Where(c => c.SensorId2 == "1")
+      .Select(c => c.SensorId2);
+
+    queryContext = new QueryContext()
+    {
+      ModelBuilder = modelBuilder
+    };
+
+    //Act
+    var ksql = ClassUnderTest.BuildKSql(query.Expression, queryContext);
+
+    //Assert
+    string expectedKsql =
+      @$"SELECT {idColumnName} FROM {nameof(MySensor)}s
+WHERE {idColumnName} = '1' EMIT CHANGES;";
+
+    ksql.Should().BeEquivalentTo(expectedKsql.ReplaceLineEndings());
+  }
+
+  private class Base
+  {
+    public int Id { get; set; }
+  }
+  private class Derived : Base
+  {
+    public string Description { get; set; }
+  }
+
+  [Test]
+  public void BuildKSql_ModelBuilder_HasColumnNameOverride_ForPropertyInBaseClass()
+  {
+    //Arrange
+    string idColumnName = "SensorId";
+    ModelBuilder modelBuilder = new ModelBuilder();
+    modelBuilder.Entity<Derived>()
+      .Property(c => c.Id)
+      .HasColumnName(idColumnName);
+
+    var query = new TestableDbProvider(contextOptions, modelBuilder)
+      .CreatePushQuery<Derived>()
+      .Where(c => c.Id == 1)
+      .Select(c => c.Id);
+
+    queryContext = new QueryContext()
+    {
+      ModelBuilder = modelBuilder
+    };
+
+    //Act
+    var ksql = ClassUnderTest.BuildKSql(query.Expression, queryContext);
+
+    //Assert
+    string expectedKsql =
+      @$"SELECT {idColumnName} FROM {nameof(Derived)}s
+WHERE {idColumnName} = 1 EMIT CHANGES;";
+
+    ksql.Should().BeEquivalentTo(expectedKsql.ReplaceLineEndings());
+  }
+
   [Test]
   public void BuildKSql_SelectFromJoinPropertyWithJsonPropertyNameAttribute()
   {

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/KSqlVisitorTests.cs

@@ -333,13 +333,13 @@ public void MemberAccess_BuildKSql_PrintsNameOfTheProperty()
   public void Predicate_BuildKSql_PrintsOperatorAndOperands()
   {
     //Arrange
-    Expression<Func<Location, bool>> predicate = l => l.Latitude != "ahoj svet";
+    Expression<Func<Location, bool>> predicate = l => l.Latitude != "40.71427000";
 
     //Act
     var query = ClassUnderTest.BuildKSql(predicate);
 
     //Assert
-    query.Should().BeEquivalentTo($"{nameof(Location.Latitude)} != 'ahoj svet'");
+    query.Should().BeEquivalentTo($"{nameof(Location.Latitude)} != '40.71427000'");
   }
 
   private record Update
@@ -364,7 +364,7 @@ public void Field_BuildKSql_PrintsFieldName()
   public void PredicateCompareWithVariable_BuildKSql_PrintsOperatorAndOperands()
   {
     //Arrange
-    string value = "ahoj svet";
+    string value = "40.71427000";
 
     Expression<Func<Location, bool>> predicate = l => l.Latitude != value;
 
@@ -450,6 +450,37 @@ public void PredicateDeeplyNestedArrayProperty_BuildKSql_PrintsAllFields()
     query.Should().BeEquivalentTo("ARRAY_LENGTH(After->Model->Capabilities) > 0");
   }
 
+  [Test]
+  public void MemberAccess_BuildKSql_JsonPropertyName()
+  {
+    //Arrange
+    Expression<Func<Tweet, string>> predicate = l => l.Message;
+
+    //Act
+    var query = ClassUnderTest.BuildKSql(predicate);
+
+    //Assert
+    query.Should().BeEquivalentTo($"{nameof(Tweet.Message).ToUpper()}");
+  }
+
+  [Test]
+  public void MemberAccess_BuildKSql_ModelBuilderHasColumnName()
+  {
+    //Arrange
+    var amountColumnName = "amount";
+    modelBuilder.Entity<Tweet>()
+      .Property(c => c.Amount)
+      .HasColumnName(amountColumnName);
+
+    Expression<Func<Tweet, double>> predicate = l => l.Amount;
+
+    //Act
+    var query = ClassUnderTest.BuildKSql(predicate);
+
+    //Assert
+    query.Should().BeEquivalentTo(amountColumnName);
+  }
+
   #endregion
 
   #region Generics

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/JoinVisitorTests.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using ksqlDB.RestApi.Client.KSql.Query.Functions;
@@ -24,7 +25,7 @@ public override void TestInitialize()
     base.TestInitialize();
 
     var contextOptions = new KSqlDBContextOptions(TestParameters.KsqlDbUrl);
-    KSqlDbContext = new KSqlDBContext(contextOptions);
+    KSqlDbContext = new KSqlDBContext(contextOptions, new ModelBuilder());
   }
 
   private static string MovieAlias => "movie";

Tests/ksqlDB.RestApi.Client.Tests/KSql/RestApi/Generators/StatementGeneratorTests.cs

@@ -36,7 +36,7 @@ private string GetExpectedClauses(bool isTable)
     return @$" MyMovies (
 	Id INT{keyClause} KEY,
 	Title VARCHAR,
-	Release_Year INT,
+	ReleaseYear INT,
 	NumberOfDays ARRAY<INT>,
 	Dictionary MAP<VARCHAR, INT>,
 	Dictionary2 MAP<VARCHAR, INT>,

Tests/ksqlDB.RestApi.Client.Tests/KSql/RestApi/Generators/TypeGeneratorTests.cs

@@ -1,3 +1,4 @@
+using System.Text.Json.Serialization;
 using FluentAssertions;
 using ksqlDb.RestApi.Client.FluentAPI.Builders;
 using ksqlDB.RestApi.Client.KSql.RestApi.Enums;
@@ -10,7 +11,13 @@ namespace ksqlDb.RestApi.Client.Tests.KSql.RestApi.Generators;
 
 public class TypeGeneratorTests
 {
-  private readonly ModelBuilder modelBuilder = new();
+  private ModelBuilder modelBuilder;
+
+  [SetUp]
+  public void TestInitialize()
+  {
+    modelBuilder = new();
+  }
 
   [Test]
   public void CreateType()
@@ -25,6 +32,42 @@ public void CreateType()
       .Be($"CREATE TYPE {nameof(Address)} AS STRUCT<Number INT, Street VARCHAR, City VARCHAR>;");
   }
 
+  private record Test
+  {
+    [JsonPropertyName("Id")]
+    public int Override { get; set; }
+  }
+
+  [Test]
+  public void CreateType_JsonPropertyName()
+  {
+    //Arrange
+
+    //Act
+    var statement = new TypeGenerator(modelBuilder).Print<Test>(new TypeProperties());
+
+    //Assert
+    statement.Should()
+      .Be($"CREATE TYPE {nameof(Test)} AS STRUCT<Id INT>;");
+  }
+
+  [Test]
+  public void CreateType_ModelBuilder_HasColumnName()
+  {
+    //Arrange
+    string columnName = "No";
+    modelBuilder.Entity<Address>()
+      .Property(b => b.Number)
+      .HasColumnName(columnName);
+
+    //Act
+    var statement = new TypeGenerator(modelBuilder).Print<Address>(new TypeProperties());
+
+    //Assert
+    statement.Should()
+      .Be($"CREATE TYPE {nameof(Address)} AS STRUCT<{columnName} INT, Street VARCHAR, City VARCHAR>;");
+  }
+
   [Test]
   public void CreateType_WithTypeName()
   {