Improve UDT debug formatting

Author: C0nquistadore

src/Dibix/Diagnostics/TSqlDebugStatementFormatter.cs

@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Xml.Linq;
 #if NET
 using Microsoft.Data.SqlClient.Server;
@@ -66,8 +67,10 @@ string FormatParameterDeclaration(string declaration, int maxDeclarationLength,
             string debugStatements = String.Join(Environment.NewLine, parameterDeclarations.Select(x => FormatParameterDeclaration(x.Declaration, maxDeclarationLength, x.Parameter)));
             if (udtInitializers.Length > 0)
             {
-                debugStatements = $@"{debugStatements}
-{udtInitializers}";
+                debugStatements = $"""
+                                   {debugStatements}
+                                   {udtInitializers}
+                                   """;
             }
 
             return debugStatements;
@@ -83,6 +86,24 @@ string[] CollectValues(SqlDataRecord record)
                 return strValues;
             }
 
+            string FormatRow(string[] values, IList<int> maxLengths)
+            {
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < values.Length; i++)
+                {
+                    string value = values[i];
+                    sb.Append(value);
+
+                    if (i + 1 < values.Length)
+                    {
+                        sb.Append(',');
+                        sb.Append(new string(' ', maxLengths[i]));
+                    }
+                }
+
+                return $"({sb})";
+            }
+
             string GenerateUdtInitializer(ParameterDescriptor parameter)
             {
                 if (parameter.Value is not StructuredType structuredType)
@@ -95,8 +116,10 @@ string GenerateUdtInitializer(ParameterDescriptor parameter)
 
                 IList<int> maxLengths = metadata.Select((x, i) => Math.Max(rows.Max(y => y[i].Length), x.Name.Length + 2)).ToArray();
                 string padding = new string(' ', parameter.Name.Length);
-                string initializer = $@"INSERT INTO @{parameter.Name} ({String.Join(", ", metadata.Select((x, i) => $"[{x.Name}]".PadRight(maxLengths[i])))})
-      {padding} VALUES {String.Join($"{Environment.NewLine}{padding}            , ", rows.Select(x => $"({String.Join(", ", x.Select((y, i) => y.PadRight(maxLengths[i])))})"))}";
+                string initializer = $"""
+                                      INSERT INTO @{parameter.Name} ({String.Join(", ", metadata.Select((x, i) => $"[{x.Name}]".PadRight(maxLengths[i])))})
+                                            {padding} VALUES {String.Join($"{Environment.NewLine}{padding}            , ", rows.Select(x => FormatRow(x, maxLengths)))}
+                                      """;
                 return initializer;
             }
 

tests/Dibix.Http.Server.Tests/HttpActionInvokerTest.cs

@@ -180,8 +180,8 @@ 2                II
 DECLARE @b [x]
 DECLARE @c NVARCHAR(5)    = N'value'
 INSERT INTO @b ([intValue], [stringValue])
-        VALUES (1         , N'I'         )
-             , (2         , N'II'        )
+        VALUES (1,          N'I')
+             , (2,          N'II')
 
 EXEC x @a = @a
      , @b = @b
@@ -194,8 +194,8 @@ DECLARE @a VARBINARY(MAX) = 0x01
 DECLARE @b [x]
 DECLARE @c NVARCHAR(5)    = N'value'
 INSERT INTO @b ([intValue], [stringValue])
-        VALUES (1         , N'I'         )
-             , (2         , N'II'        )
+        VALUES (1,          N'I')
+             , (2,          N'II')
 
 EXEC x @a = @a
      , @b = @b
@@ -240,8 +240,8 @@ 2                II
 DECLARE @b [x]
 DECLARE @c NVARCHAR(5)    = N'value'
 INSERT INTO @b ([intValue], [stringValue])
-        VALUES (1         , N'I'         )
-             , (2         , N'II'        )", ex.TSqlDebugStatement);
+        VALUES (1,          N'I')
+             , (2,          N'II')", ex.TSqlDebugStatement);
                 Assert.AreEqual(@"Dibix.DatabaseAccessException: Oops
 CommandType: Text
 CommandText: <Inline>
@@ -250,8 +250,8 @@ DECLARE @a VARBINARY(MAX) = 0x01
 DECLARE @b [x]
 DECLARE @c NVARCHAR(5)    = N'value'
 INSERT INTO @b ([intValue], [stringValue])
-        VALUES (1         , N'I'         )
-             , (2         , N'II'        )", GetExceptionTextWithoutCallStack(ex));
+        VALUES (1,          N'I')
+             , (2,          N'II')", GetExceptionTextWithoutCallStack(ex));
             }
         }
         private static void Invoke_DML_WithSqlException_WrappedExceptionIsThrown_Target(IDatabaseAccessorFactory databaseAccessorFactory) => throw CreateException(errorInfoNumber: default, errorMessage: "Oops", CommandType.Text, commandText: "x", (InputParameterVisitor visitParameter) =>