fix: typos in builder

Author: followynne

src/Serilog.Ui.SqliteDataProvider/Extensions/SerilogUiOptionBuilderExtensions.cs

@@ -22,6 +22,8 @@ public static ISerilogUiOptionsBuilder UseSqliteServer(
         setupOptions(dbOptions);
         dbOptions.Validate();
 
+        string providerName = dbOptions.GetProviderName(SqliteDataProvider.SqliteProviderName);
+        optionsBuilder.RegisterExceptionAsStringForProviderKey(providerName);
         optionsBuilder.Services.AddScoped<IDataProvider, SqliteDataProvider>(_ => new SqliteDataProvider(dbOptions, new SqliteQueryBuilder()));
 
         return optionsBuilder;

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

@@ -4,7 +4,7 @@
     <PackageId>Serilog.UI.Sqlite</PackageId>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>1.0.0-beta.1</Version>
+    <Version>1.0.0</Version>
 
     <Description>SQLite data provider for Serilog UI.</Description>
     <PackageTags>serilog serilog-ui serilog.sinks.sqlite sqlite</PackageTags>

src/Serilog.Ui.SqliteDataProvider/SqliteDataProvider.cs

@@ -4,6 +4,7 @@
 using Serilog.Ui.Core;
 using Serilog.Ui.Core.Models;
 using Serilog.Ui.SqliteDataProvider.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -49,6 +50,9 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParam
         return logs.Select((item, i) =>
         {
             item.PropertyType = "json";
+            // both sinks save UTC but MariaDb is queried as Unspecified, MySql is queried as Local
+            var ts = DateTime.SpecifyKind(item.Timestamp, item.Timestamp.Kind == DateTimeKind.Unspecified ? DateTimeKind.Local : item.Timestamp.Kind);
+            item.Timestamp = ts.ToUniversalTime();
             item.SetRowNo(rowNoStart, i);
             return item;
         }).ToList();

src/Serilog.Ui.SqliteDataProvider/SqliteQueryBuilder.cs

@@ -30,15 +30,15 @@ public override string BuildCountLogsQuery(SinkColumnNames columns, string schem
     {
         StringBuilder queryStr = new();
 
-        queryStr.Append($"SELECT COUNT(Id) FROM {tableName}");
+        queryStr.Append($"SELECT COUNT(Id) FROM {tableName} ");
 
         GenerateWhereClause(queryStr, columns, query.Level, query.SearchCriteria, query.StartDate, query.EndDate);
 
         return queryStr.ToString();
     }
 
     protected override string GenerateSortClause(SinkColumnNames columns, SearchOptions.SortProperty sortOn, SearchOptions.SortDirection sortBy)
-        => $"ORDER BY [{GetSortColumnName(columns, sortOn)}] {sortBy.ToString().ToUpper()}";
+        => $"ORDER BY {GetSortColumnName(columns, sortOn)} {sortBy.ToString().ToUpper()}";
 
     /// <inheritdoc/>
     private static void GenerateSelectClause(StringBuilder queryBuilder, SinkColumnNames columns, string schema, string tableName)

tests/Serilog.Ui.SqliteProvider.Tests/DataProvider/DataProviderPaginationTest.cs

@@ -19,6 +19,6 @@ public override Task It_throws_when_skip_is_zero()
     {
         var query = new Dictionary<string, StringValues> { ["page"] = "0", ["count"] = "1" };
         var test = () => Provider.FetchDataAsync(FetchLogsQuery.ParseQuery(query));
-        return test.Should().ThrowAsync<SqliteException>();
+        return test.Should().NotThrowAsync<SqliteException>("because Sqlite catches the error");
     }
 }

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

@@ -8,6 +8,7 @@
 using Serilog.Ui.Core.Extensions;
 using Serilog.Ui.SqliteDataProvider;
 using Serilog.Ui.SqliteDataProvider.Extensions;
+using System;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -18,6 +19,9 @@ public class SqliteCollection : ICollectionFixture<SqliteTestProvider> { }
 
     public sealed class SqliteTestProvider : IIntegrationRunner
     {
+        private static string DbName() => $"integration-{DateTime.UtcNow:O}.db".Replace(':', '-');
+        private string _dbInstanceName = string.Empty;
+
         private LogModelPropsCollector? _collector;
 
         private SqliteDataProvider? _provider;
@@ -27,14 +31,14 @@ public SqliteTestProvider() : base()
             // No need to set up a container for SQLite - using in-memory database
         }
 
-        public SqliteDbOptions DbOptions { get; set; } = new SqliteDbOptions()
-            .WithTable("Logs")
-            .WithConnectionString("Data Source=hello.db");
-
+        public SqliteDbOptions DbOptions { get; set; } = new SqliteDbOptions().WithTable("Logs");
         private async Task CheckDbReadinessAsync()
         {
             Guard.Against.Null(DbOptions);
 
+            _dbInstanceName = DbName();
+            DbOptions.WithConnectionString($"Data Source={_dbInstanceName}");
+
             using var connection = new SqliteConnection(DbOptions.ConnectionString);
             await connection.OpenAsync();
 
@@ -48,7 +52,7 @@ private void InitializeAdditional()
             var serilog = new SerilogSinkSetup(logger =>
                 logger
                     .WriteTo
-                    .SQLite(@"hello.db", batchSize: 1));
+                    .SQLite(_dbInstanceName, batchSize: 1, storeTimestampInUtc: true));
             _collector = serilog.InitializeLogs();
 
             _provider = new SqliteDataProvider(DbOptions, new SqliteQueryBuilder());