Added YdbDbType property to YdbParameter, allowing to explicitly specify YDB-specific data types for parameter mapping. (#509)

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Added `YdbDbType` property to `YdbParameter`, allowing to explicitly specify YDB-specific data types for parameter mapping.
 - ADO.NET: Now `YdbConnection.OpenAsync` and `YdbCommand.Execute*` throw `OperationCanceledException`,
   if the CancellationToken has already been cancelled before the method is called.
 - Feat ADO.NET: decimal type with arbitrary precision/scale ([#498](https://github.com/ydb-platform/ydb-dotnet-sdk/issues/498)).

src/Ydb.Sdk/src/Ado/BulkUpsert/BulkUpsertImporter.cs

@@ -36,13 +36,16 @@ public async ValueTask AddRowAsync(params object[] values)
         if (values.Length != _columns.Count)
             throw new ArgumentException("Values count must match columns count", nameof(values));
 
-        var ydbValues = values.Select(v =>
-            v as YdbValue ?? (v is YdbParameter param ? param.YdbValue : new YdbParameter { Value = v }.YdbValue)
+        var ydbValues = values.Select(v => v switch
+            {
+                YdbValue ydbValue => ydbValue.GetProto(),
+                YdbParameter param => param.TypedValue,
+                _ => new YdbParameter { Value = v }.TypedValue
+            }
         ).ToArray();
 
         var protoStruct = new Ydb.Value();
-        foreach (var value in ydbValues)
-            protoStruct.Items.Add(value.GetProto().Value);
+        foreach (var value in ydbValues) protoStruct.Items.Add(value.Value);
 
         var rowSize = protoStruct.CalculateSize();
 
@@ -55,16 +58,7 @@ public async ValueTask AddRowAsync(params object[] values)
         _currentBytes += rowSize;
 
         _structType ??= new StructType
-        {
-            Members =
-            {
-                _columns.Select((col, i) => new StructMember
-                {
-                    Name = col,
-                    Type = ydbValues[i].GetProto().Type
-                })
-            }
-        };
+            { Members = { _columns.Select((col, i) => new StructMember { Name = col, Type = ydbValues[i].Type }) } };
     }
 
     public async ValueTask FlushAsync()

src/Ydb.Sdk/src/Ado/Internal/SqlParam.cs

@@ -1,4 +1,4 @@
-using Ydb.Sdk.Value;
+using Ydb.Sdk.Ado.YdbType;
 
 namespace Ydb.Sdk.Ado.Internal;
 
@@ -8,13 +8,12 @@ internal interface ISqlParam
 
     string Name { get; }
 
-    YdbValue YdbValueFetch(Dictionary<string, YdbValue> ydbParameters);
+    TypedValue YdbValueFetch(Dictionary<string, TypedValue> ydbParameters);
 }
 
 internal record PrimitiveParam(string Name, bool IsNative) : ISqlParam
 {
-    public YdbValue YdbValueFetch(Dictionary<string, YdbValue> ydbParameters) =>
-        ydbParameters.Get(Name);
+    public TypedValue YdbValueFetch(Dictionary<string, TypedValue> ydbParameters) => ydbParameters.Get(Name);
 }
 
 internal class ListPrimitiveParam : ISqlParam
@@ -33,14 +32,14 @@ public ListPrimitiveParam(IReadOnlyList<string> paramNames, int globalNumber)
 
     public bool IsNative => false;
 
-    public YdbValue YdbValueFetch(Dictionary<string, YdbValue> ydbParameters) => YdbValue
-        .MakeList(_paramNames.Select(ydbParameters.Get).ToArray());
+    public TypedValue YdbValueFetch(Dictionary<string, TypedValue> ydbParameters) =>
+        _paramNames.Select(ydbParameters.Get).ToArray().List();
 }
 
 internal static class YdbParametersExtension
 {
-    internal static YdbValue Get(this Dictionary<string, YdbValue> ydbParameters, string name)
-        => ydbParameters.TryGetValue(name, out var ydbValue)
-            ? ydbValue
+    internal static TypedValue Get(this Dictionary<string, TypedValue> ydbParameters, string name)
+        => ydbParameters.TryGetValue(name, out var typedValue)
+            ? typedValue
             : throw new YdbException($"Not found YDB parameter [name: {name}]");
 }

src/Ydb.Sdk/src/Ado/Session/ISession.cs

@@ -1,5 +1,4 @@
 using Ydb.Query;
-using Ydb.Sdk.Value;
 using TransactionControl = Ydb.Query.TransactionControl;
 
 namespace Ydb.Sdk.Ado.Session;
@@ -12,7 +11,7 @@ internal interface ISession
 
     ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
         string query,
-        Dictionary<string, YdbValue> parameters,
+        Dictionary<string, TypedValue> parameters,
         GrpcRequestSettings settings,
         TransactionControl? txControl
     );

src/Ydb.Sdk/src/Ado/Session/ImplicitSession.cs

@@ -1,6 +1,5 @@
 using Ydb.Query;
 using Ydb.Query.V1;
-using Ydb.Sdk.Value;
 
 namespace Ydb.Sdk.Ado.Session;
 
@@ -16,7 +15,7 @@ public ImplicitSession(IDriver driver)
 
     public ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
         string query,
-        Dictionary<string, YdbValue> parameters,
+        Dictionary<string, TypedValue> parameters,
         GrpcRequestSettings settings,
         TransactionControl? txControl
     )
@@ -33,7 +32,7 @@ public ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
             StatsMode = StatsMode.None,
             TxControl = txControl
         };
-        request.Parameters.Add(parameters.ToDictionary(p => p.Key, p => p.Value.GetProto()));
+        request.Parameters.Add(parameters);
 
         return Driver.ServerStreamCall(QueryService.ExecuteQueryMethod, request, settings);
     }

src/Ydb.Sdk/src/Ado/Session/PoolingSession.cs

@@ -2,7 +2,6 @@
 using Ydb.Query;
 using Ydb.Query.V1;
 using Ydb.Sdk.Ado.Internal;
-using Ydb.Sdk.Value;
 using CommitTransactionRequest = Ydb.Query.CommitTransactionRequest;
 using TransactionControl = Ydb.Query.TransactionControl;
 
@@ -43,7 +42,7 @@ ILogger<PoolingSession> logger
 
     public override ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
         string query,
-        Dictionary<string, YdbValue> parameters,
+        Dictionary<string, TypedValue> parameters,
         GrpcRequestSettings settings,
         TransactionControl? txControl
     )
@@ -58,7 +57,7 @@ public override ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
             StatsMode = StatsMode.None,
             TxControl = txControl
         };
-        request.Parameters.Add(parameters.ToDictionary(p => p.Key, p => p.Value.GetProto()));
+        request.Parameters.Add(parameters);
 
         return Driver.ServerStreamCall(QueryService.ExecuteQueryMethod, request, settings);
     }

src/Ydb.Sdk/src/Ado/Session/PoolingSessionSource.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Ydb.Query;
-using Ydb.Sdk.Value;
 
 namespace Ydb.Sdk.Ado.Session;
 
@@ -325,9 +324,12 @@ internal bool CompareAndSet(PoolingSessionState expected, PoolingSessionState ac
 
     internal abstract Task DeleteSession();
 
-    public abstract ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(string query,
-        Dictionary<string, YdbValue> parameters, GrpcRequestSettings settings,
-        TransactionControl? txControl);
+    public abstract ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
+        string query,
+        Dictionary<string, TypedValue> parameters,
+        GrpcRequestSettings settings,
+        TransactionControl? txControl
+    );
 
     public abstract Task CommitTransaction(string txId, CancellationToken cancellationToken = default);
 

src/Ydb.Sdk/src/Ado/YdbCommand.cs

@@ -3,7 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Ydb.Sdk.Ado.Internal;
-using Ydb.Sdk.Value;
+using Ydb.Sdk.Ado.YdbType;
 
 namespace Ydb.Sdk.Ado;
 
@@ -185,7 +185,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
                 : throw new InvalidOperationException("CommandText property has not been initialized")
         );
         var preparedSql = new StringBuilder();
-        var ydbParameters = new Dictionary<string, YdbValue>();
+        var ydbParameters = new Dictionary<string, TypedValue>();
 
         foreach (var sqlParam in sqlParams)
         {
@@ -194,14 +194,14 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
                 continue;
             }
 
-            var ydbValue = sqlParam.YdbValueFetch(ydbParameterCollection);
+            var typedValue = sqlParam.YdbValueFetch(ydbParameterCollection);
 
             if (!sqlParam.IsNative)
             {
-                preparedSql.Append($"DECLARE {sqlParam.Name} AS {ydbValue.ToYql()};\n");
+                preparedSql.Append($"DECLARE {sqlParam.Name} AS {typedValue.ToYql()};\n");
             }
 
-            ydbParameters[sqlParam.Name] = ydbValue;
+            ydbParameters[sqlParam.Name] = typedValue;
         }
 
         preparedSql.Append(sql);
@@ -217,11 +217,9 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
             throw new InvalidOperationException("Transaction mismatched! (Maybe using another connection)");
         }
 
-        var ydbDataReader = await YdbDataReader.CreateYdbDataReader(
-            await YdbConnection.Session
-                .ExecuteQuery(preparedSql.ToString(), ydbParameters, execSettings, transaction?.TransactionControl),
-            YdbConnection.OnNotSuccessStatusCode, transaction, cancellationToken
-        );
+        var ydbDataReader = await YdbDataReader.CreateYdbDataReader(await YdbConnection.Session.ExecuteQuery(
+            preparedSql.ToString(), ydbParameters, execSettings, transaction?.TransactionControl
+        ), YdbConnection.OnNotSuccessStatusCode, transaction, cancellationToken);
 
         YdbConnection.LastReader = ydbDataReader;
         YdbConnection.LastCommand = CommandText;