Merge pull request #113 from mrt181/main

fix: empty array constructors are not valid

Author: tomasfabian

Tests/ksqlDB.RestApi.Client.Tests/KSql/RestApi/KSqlDbRestApiClientTests.cs

@@ -19,6 +19,7 @@
 using Moq;
 using Moq.Protected;
 using NUnit.Framework;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 
 namespace ksqlDb.RestApi.Client.Tests.KSql.RestApi;
 
@@ -153,7 +154,7 @@ public async Task CreateContent_KSqlContentWasSet()
 
     //Assert
     var content = await GetContent(stringContent);
-      
+
     content.Should().Be(@$"{{""ksql"":""{createOrReplaceTableStatement}"",""streamsProperties"":{{}}}}");
   }
 
@@ -307,7 +308,7 @@ public async Task GetAllTopicsExtendedAsync()
     //Assert
     responses.Should().NotBeNull();
     var expectedContent = GetExpectedContent(StatementTemplates.ShowAllTopicsExtended);
-      
+
     VerifySendAsync(expectedContent);
   }
 
@@ -355,7 +356,7 @@ public async Task TerminatePushQueryAsync()
     {
       QueryId = queryId
     };
-      
+
     var expectedContent = await KSqlDbRestApiClient.CreateContent(closeQuery, Encoding.UTF8).ReadAsStringAsync();
 
     VerifySendAsync(expectedContent, "/close-query");
@@ -459,7 +460,7 @@ public async Task DropStreamAsync_WithDropEntityProperties()
     //Assert
     response.Should().NotBeNull();
     var expectedContent = GetExpectedContent(StatementTemplates.DropStream(streamName, properties.UseIfExistsClause, properties.DeleteTopic));
-      
+
     VerifySendAsync(expectedContent);
   }
 
@@ -479,7 +480,7 @@ public async Task DropStreamAsync_IfExistsAndDeleteTopic()
     //Assert
     response.Should().NotBeNull();
     var expectedContent = GetExpectedContent(StatementTemplates.DropStream(streamName, useIfExistsClause, deleteTopic));
-      
+
     VerifySendAsync(expectedContent);
   }
 
@@ -517,7 +518,7 @@ public async Task DropTableAsync_IfExistsAndDeleteTopic()
     //Assert
     response.Should().NotBeNull();
     var expectedContent = GetExpectedContent(StatementTemplates.DropTable(tableName, useIfExistsClause, deleteTopic));
-      
+
     VerifySendAsync(expectedContent);
   }
 
@@ -543,7 +544,7 @@ public async Task DropTableAsync_WithDropEntityProperties()
     //Assert
     response.Should().NotBeNull();
     var expectedContent = GetExpectedContent(StatementTemplates.DropTable(tableName, properties.UseIfExistsClause, properties.DeleteTopic));
-      
+
     VerifySendAsync(expectedContent);
   }
 
@@ -583,6 +584,54 @@ public void ToInsertStatement()
     insertStatement.Sql.Should().Be("INSERT INTO Movies (Title, Id, Release_Year) VALUES (NULL, 1, 0);");
   }
 
+  public class POC
+  {
+    public int Id { get; init; }
+    public string? Description { get; init; }
+    public POC2[]? Entities { get; init; }
+  }
+
+  public class POC2
+  {
+    public POC3[]? Poc3 { get; set; }
+    public POC4[]? Poc4 { get; set; }
+  }
+
+  public class POC3
+  {
+    public string? Description { get; init; }
+  }
+
+  public class POC4
+  {
+    public string? Description { get; init; }
+  }
+
+  public static IEnumerable<(POC, string)> NullTestCases()
+  { // empty array constructors are invalid
+    yield return (new POC { Id = 1 }, "INSERT INTO POCS (Id, Description, Entities) VALUES (1, NULL, NULL);");
+    yield return (new POC { Id = 1, Entities = new POC2[0] }, "INSERT INTO POCS (Id, Description, Entities) VALUES (1, NULL, ARRAY_REMOVE(ARRAY[0], 0));");
+    yield return (new POC { Id = 1, Entities = new POC2[] { new POC2 { Poc3 = new POC3[0] } } }, "INSERT INTO POCS (Id, Description, Entities) VALUES (1, NULL, ARRAY[STRUCT(Poc3 := ARRAY_REMOVE(ARRAY[0], 0), Poc4 := ARRAY_REMOVE(ARRAY[0], 0))]);");
+    yield return (new POC { Id = 1, Entities = new POC2[] { new POC2 { Poc3 = new POC3[0], Poc4 = new POC4[0] } } }, "INSERT INTO POCS (Id, Description, Entities) VALUES (1, NULL, ARRAY[STRUCT(Poc3 := ARRAY_REMOVE(ARRAY[0], 0), Poc4 := ARRAY_REMOVE(ARRAY[0], 0))]);");
+  }
+
+  [TestCaseSource(nameof(NullTestCases))]
+  public void ToInsertStatement_WithNullHandling((POC, string) testCase)
+  {
+    //Arrange
+    var (entity, expected) = testCase;
+    var modelBuilder = new ModelBuilder();
+    modelBuilder.Entity<POC>().HasKey(i => i.Id);
+    modelBuilder.Entity<POC>().Property(c => c.Entities).AsStruct();
+    var sut = new KSqlDbRestApiClient(HttpClientFactory, modelBuilder, LoggerFactoryMock.Object);
+
+    //Act
+    var actual = sut.ToInsertStatement(entity);
+
+    //Assert
+    actual.Sql.Should().Be(expected);
+  }
+
   [KSqlFunction]
   public static string FormatTimestamp(long input, string format) => throw new NotSupportedException();
 

ksqlDb.RestApi.Client/KSql/RestApi/Statements/CreateKSqlValue.cs

@@ -13,6 +13,8 @@ namespace ksqlDB.RestApi.Client.KSql.RestApi.Statements;
 #nullable disable
 internal sealed class CreateKSqlValue(IMetadataProvider metadataProvider) : EntityInfo(metadataProvider)
 {
+  private const string CREATE_EMPTY_ARRAY = "ARRAY_REMOVE(ARRAY[0], 0)";
+
   public object ExtractValue<T>(T inputValue, IValueFormatters valueFormatters, MemberInfo memberInfo, Type type, Func<MemberInfo, string> formatter)
   {
     Type valueType = inputValue.GetType();
@@ -25,7 +27,7 @@ public object ExtractValue<T>(T inputValue, IValueFormatters valueFormatters, Me
       value = valueType.GetField(memberInfo.Name)?.GetValue(inputValue);
 
     if (value == null)
-      return "NULL";
+      return KSqlTypes.Null;
 
     if (type == typeof(decimal))
     {
@@ -79,9 +81,7 @@ public object ExtractValue<T>(T inputValue, IValueFormatters valueFormatters, Me
       GenerateMap(valueFormatters, type, formatter, ref value);
     else if (type.IsArray)
     {
-      var source = ((IEnumerable)value).Cast<object>();
-      var array = source.Select(c => ExtractValue(c, valueFormatters, null, type.GetElementType(), formatter)).ToArray();
-      value = PrintArray(array);
+      value = GenerateEnumerableValue(type, value, valueFormatters, formatter);
     }
     else if (!type.IsGenericType && (type.IsClass || type.IsStruct()))
     {
@@ -150,7 +150,11 @@ private void GenerateStruct<T>(IValueFormatters valueFormatters, Type type, Func
 
       var innerValue = ExtractValue(value, valueFormatters, memberInfo2, type, formatter);
       var name = formatter(memberInfo2);
-      sb.Append($"{name} := {innerValue}");
+      if (type.IsArray && KSqlTypes.Null.Equals(innerValue))
+        sb.Append($"{name} := {CREATE_EMPTY_ARRAY}");
+      else
+        sb.Append($"{name} := {innerValue}");
+
     }
 
     sb.Append(')');
@@ -162,21 +166,21 @@ private object GenerateEnumerableValue(Type type, object value, IValueFormatters
     Func<MemberInfo, string> formatter)
   {
     if (value == null)
-      return "NULL";
+      return KSqlTypes.Null;
 
     var enumerableType = type.GetEnumerableTypeDefinition();
 
     if (enumerableType == null || !enumerableType.Any())
       return value;
 
-    type = enumerableType.First();
-    type = type.GetGenericArguments()[0];
+    var elementType = type.IsArray ? type.GetElementType() : enumerableType.First();
+    elementType = type.IsArray ? elementType : elementType.GetGenericArguments()[0];
 
     var source = ((IEnumerable)value).Cast<object>();
-    var array = source.Select(c => ExtractValue(c, valueFormatters, null, type, formatter)).ToArray();
+    var array = source.Select(c => ExtractValue(c, valueFormatters, null, elementType, formatter)).ToArray();
 
     if (array.Length == 0)
-      return "ARRAY_REMOVE(ARRAY[0], 0)";
+      return CREATE_EMPTY_ARRAY;
 
     return PrintArray(array);
   }

ksqlDb.RestApi.Client/KSql/RestApi/Statements/KSqlTypes.cs

@@ -15,5 +15,6 @@ internal static class KSqlTypes
     internal const string Array = "ARRAY";
     internal const string Struct = "STRUCT";
     internal const string Map = "MAP";
+    internal const string Null = "NULL";
   }
 }