Skip to content

Commit 288f527

Browse files
committed
better string usage
1 parent 03ba147 commit 288f527

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
<PackageVersion Include="Verify" Version="28.14.0" />
2525
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
2626
<PackageVersion Include="Verify.NUnit" Version="28.14.0" />
27-
<PackageVersion Include="Verify.SqlServer" Version="11.0.1" />
27+
<PackageVersion Include="Verify.SqlServer" Version="11.1.0" />
2828
</ItemGroup>
2929
</Project>

src/Verify.EntityFramework/Converters/LogEntryConverter.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ public override void Write(VerifyJsonWriter writer, LogEntry logEntry)
88
writer.WriteMember(logEntry, logEntry.HasTransaction, "HasTransaction");
99
writer.WriteMember(logEntry, logEntry.Exception, "Exception");
1010
writer.WriteMember(logEntry, logEntry.Parameters, "Parameters");
11-
ReadOnlySpan<char> text;
1211
if (logEntry.IsSqlServer)
1312
{
14-
text = SqlFormatter.Format(logEntry.Text);
13+
var text = SqlFormatter.Format(logEntry.Text);
14+
writer.WriteMember(logEntry, text.ToString(), "Text");
1515
}
1616
else
1717
{
18-
text = logEntry.Text.AsSpan();
18+
writer.WriteMember(logEntry, logEntry.Text, "Text");
1919
}
2020

21-
writer.WriteMember(logEntry, text, "Text");
2221

2322
writer.WriteEndObject();
2423
}

src/Verify.EntityFramework/SqlFormatter.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
static class SqlFormatter
1+
using System.Globalization;
2+
3+
static class SqlFormatter
24
{
3-
public static ReadOnlySpan<char> Format(string input)
5+
public static StringBuilder Format(string input)
46
{
57
var parser = new TSql170Parser(false);
68
using var reader = new StringReader(input);
@@ -26,10 +28,21 @@ Failed to parse sql.
2628
SqlVersion = SqlVersion.Sql170,
2729
KeywordCasing = KeywordCasing.Lowercase,
2830
IndentationSize = 2,
29-
AlignClauseBodies = true,
31+
AlignClauseBodies = true
3032
});
3133

32-
generator.GenerateScript(fragment, out var output);
33-
return output.AsSpan().TrimEnd().TrimEnd(';');
34+
var builder = new StringBuilder();
35+
using (var writer = new StringWriter(builder, CultureInfo.InvariantCulture))
36+
{
37+
generator.GenerateScript(fragment, writer);
38+
}
39+
40+
builder.TrimEnd();
41+
if (builder[^1] == ';')
42+
{
43+
builder.Length--;
44+
}
45+
46+
return builder;
3447
}
3548
}

0 commit comments

Comments
 (0)