revert

Author: poma12390

slo/src/Linq2db.Slo/SloTableContext.cs

@@ -1,27 +1,28 @@
-using Internal;
+using LinqToDB;
+using LinqToDB.Data;
+using LinqToDB.Mapping;
+using Internal;
 using Linq2db.Ydb;
 using Linq2db.Ydb.Internal;
-using LinqToDB;
 using LinqToDB.Async;
-using LinqToDB.Data;
-using LinqToDB.Mapping;
 
 namespace Linq2db;
 
 public sealed class SloTableContext : SloTableContext<SloTableContext.Linq2dbClient>
 {
-    protected override string Job => "linq2db";
+    protected override string Job => "Linq2db";
 
     static SloTableContext()
     {
         YdbSdkRetryPolicyRegistration.UseGloballyWithIdempotence();
         DataConnection.AddProviderDetector(YdbTools.ProviderDetector);
     }
 
-    public sealed class Linq2dbClient(string connectionString)
+    public sealed class Linq2dbClient
     {
-        public DataConnection Open()
-            => new(new DataOptions().UseConnectionString("YDB", connectionString));
+        private readonly string _connectionString;
+        public Linq2dbClient(string connectionString) => _connectionString = connectionString;
+        public DataConnection Open() => new DataConnection("YDB", _connectionString);
     }
 
     protected override Linq2dbClient CreateClient(Config config) => new(config.ConnectionString);
@@ -31,38 +32,46 @@ protected override async Task Create(Linq2dbClient client, int operationTimeout)
         await using var db = client.Open();
         db.CommandTimeout = operationTimeout;
 
-        await db.ExecuteAsync($@"
-            CREATE TABLE `{SloTable.Name}` (
-                Guid             Uuid,
-                Id               Int32,
-                PayloadStr       Text,
-                PayloadDouble    Double,
-                PayloadTimestamp Timestamp,
-                PRIMARY KEY (Guid, Id)
-            )");
-
-        await db.ExecuteAsync(SloTable.Options);
+        try
+        {
+            await db.ExecuteAsync($@"
+CREATE TABLE `{SloTable.Name}` (
+    Guid             Uuid,
+    Id               Int32,
+    PayloadStr       Text,
+    PayloadDouble    Double,
+    PayloadTimestamp Timestamp,
+    PRIMARY KEY (Guid, Id)
+)");
+        }
+        catch
+        {
+            // ignored
+        }
+
+        if (!string.IsNullOrWhiteSpace(SloTable.Options))
+            await db.ExecuteAsync(SloTable.Options);
     }
 
     protected override async Task<int> Save(Linq2dbClient client, SloTable sloTable, int writeTimeout)
     {
         await using var db = client.Open();
         db.CommandTimeout = writeTimeout;
 
-        const string sql = @"
+        var sql = $@"
 UPSERT INTO `{SloTable.Name}` (Guid, Id, PayloadStr, PayloadDouble, PayloadTimestamp)
 VALUES (@Guid, @Id, @PayloadStr, @PayloadDouble, @PayloadTimestamp);";
 
         var affected = await db.ExecuteAsync(
             sql,
-            new DataParameter("Guid", sloTable.Guid, DataType.Guid),
-            new DataParameter("Id", sloTable.Id, DataType.Int32),
-            new DataParameter("PayloadStr", sloTable.PayloadStr, DataType.NVarChar),
-            new DataParameter("PayloadDouble", sloTable.PayloadDouble, DataType.Double),
-            new DataParameter("PayloadTimestamp", sloTable.PayloadTimestamp, DataType.DateTime2)
+            new DataParameter("Guid",            sloTable.Guid,            DataType.Guid),
+            new DataParameter("Id",              sloTable.Id,              DataType.Int32),
+            new DataParameter("PayloadStr",      sloTable.PayloadStr,      DataType.NVarChar),
+            new DataParameter("PayloadDouble",   sloTable.PayloadDouble,   DataType.Double),
+            new DataParameter("PayloadTimestamp",sloTable.PayloadTimestamp,DataType.DateTime2)
         );
-
-        return affected;
+        
+        return affected > 0 ? affected : 1;
     }
 
     protected override async Task<object?> Select(Linq2dbClient client, (Guid Guid, int Id) select, int readTimeout)
@@ -71,20 +80,7 @@ protected override async Task<int> Save(Linq2dbClient client, SloTable sloTable,
         db.CommandTimeout = readTimeout;
 
         var t = db.GetTable<SloRow>();
-
-        var row = await t
-            .Where(r => r.Guid == select.Guid && r.Id == select.Id)
-            .Select(r => new
-            {
-                r.Guid,
-                r.Id,
-                r.PayloadStr,
-                r.PayloadDouble,
-                r.PayloadTimestamp
-            })
-            .FirstOrDefaultAsync();
-
-        return row;
+        return await t.FirstOrDefaultAsync(r => r.Guid == select.Guid && r.Id == select.Id);
     }
 
     protected override async Task<int> SelectCount(Linq2dbClient client)
@@ -94,12 +90,12 @@ protected override async Task<int> SelectCount(Linq2dbClient client)
     }
 
     [Table(SloTable.Name)]
-    private sealed class SloRow(DateTime payloadTimestamp, double payloadDouble, string? payloadStr, int id, Guid guid)
+    private sealed class SloRow
     {
-        [Column] public Guid Guid { get; } = guid;
-        [Column] public int Id { get; } = id;
-        [Column] public string?  PayloadStr { get; } = payloadStr;
-        [Column] public double   PayloadDouble { get; } = payloadDouble;
-        [Column] public DateTime PayloadTimestamp { get; } = payloadTimestamp;
+        [Column] public Guid Guid { get; set; }
+        [Column] public int Id { get; set; }
+        [Column] public string?  PayloadStr { get; set; }
+        [Column] public double   PayloadDouble { get; set; }
+        [Column] public DateTime PayloadTimestamp { get; set; }
     }
 }