Skip to content

Commit 9df5ae3

Browse files
committed
fix base provider
1 parent d2e4d58 commit 9df5ae3

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

src/Serilog.Ui.SqliteDataProvider/Serilog.Ui.SqliteDataProvider.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Dapper" Version="2.1.35" />
15-
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.5" />
15+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.*" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

tests/Serilog.Ui.SqliteProvider.Tests/Serilog.Ui.SqliteProvider.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Serilog.Sinks.SQLite" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.*" />
1011
</ItemGroup>
1112

1213
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

tests/Serilog.Ui.SqliteProvider.Tests/Util/SqliteTestProvider.cs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.Data.Sqlite;
44
using Serilog;
55
using Serilog.Ui.Common.Tests.DataSamples;
6-
using Serilog.Ui.Common.Tests.SqlUtil;
76
using Serilog.Ui.Common.Tests.TestSuites;
87
using Serilog.Ui.Core;
98
using Serilog.Ui.Core.Extensions;
@@ -28,26 +27,28 @@ public SqliteTestProvider() : base()
2827
// No need to set up a container for SQLite - using in-memory database
2928
}
3029

31-
public SqliteDbOptions DbOptions { get; set; } = new SqliteDbOptions().WithTable("Logs");
30+
public SqliteDbOptions DbOptions { get; set; } = new SqliteDbOptions()
31+
.WithTable("Logs")
32+
.WithConnectionString("Data Source=hello.db");
3233

3334
private async Task CheckDbReadinessAsync()
3435
{
3536
Guard.Against.Null(DbOptions);
3637

37-
using var connection = new SqliteConnection("DataSource=:memory:");
38+
using var connection = new SqliteConnection(DbOptions.ConnectionString);
3839
await connection.OpenAsync();
3940

40-
DbOptions.WithConnectionString(connection.ConnectionString);
41-
4241
await connection.ExecuteAsync("SELECT 1");
42+
43+
InitializeAdditional();
4344
}
4445

4546
private void InitializeAdditional()
4647
{
4748
var serilog = new SerilogSinkSetup(logger =>
4849
logger
4950
.WriteTo
50-
.SQLite(DbOptions.ConnectionString));
51+
.SQLite(@"hello.db", batchSize: 1));
5152
_collector = serilog.InitializeLogs();
5253

5354
_provider = new SqliteDataProvider(DbOptions, new SqliteQueryBuilder());
@@ -57,20 +58,13 @@ private void InitializeAdditional()
5758

5859
public LogModelPropsCollector GetPropsCollector() => _collector!;
5960

60-
public async Task InitializeAsync()
61+
public Task InitializeAsync()
6162
{
62-
await CheckDbReadinessAsync();
63-
InitializeAdditional();
63+
return CheckDbReadinessAsync();
6464
}
6565

66-
public Task DisposeAsync()
67-
{
68-
return Task.CompletedTask;
69-
}
70-
71-
public void Dispose()
72-
{
66+
public Task DisposeAsync() => Task.CompletedTask;
7367

74-
}
68+
public void Dispose() { }
7569
}
7670
}

0 commit comments

Comments
 (0)