last changes

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,3 +1,9 @@
+- **Breaking Change**: Renamed `YdbDbType` enum members to match the [ydb.tech](https://ydb.tech/docs/en/yql/reference/types/primitive) naming:
+    - `UInt8` -> `Uint8`.
+    - `UInt16` -> `Uint16`.
+    - `UInt32` -> `Uint32`.
+    - `Uint64` -> `Uint64`.
+    - `DateTime` -> `Datetime`.
 - **Breaking Change**: Removed unused methods `GetJson`, `GetJsonDocument`, and `GetYson` from YdbDataReader.
 - Feat ADO.NET: Add support for reading `Yson` from `YdbDataReader.GetBytes`.
 - Feat ADO.NET: Add support for reading `Json` and `JsonDocument` from `YdbDataReader.GetString`.

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

@@ -45,28 +45,28 @@ private YdbPrimitiveTypeInfo(Type.Types.PrimitiveTypeId primitiveTypeId, Func<ob
 
     internal static YdbPrimitiveTypeInfo? TryResolve(System.Type type)
     {
-        if (type.IsAssignableFrom(typeof(bool))) return Bool;
+        if (type == typeof(bool)) return Bool;
 
-        if (type.IsAssignableFrom(typeof(sbyte))) return Int8;
-        if (type.IsAssignableFrom(typeof(short))) return Int16;
-        if (type.IsAssignableFrom(typeof(int))) return Int32;
-        if (type.IsAssignableFrom(typeof(long))) return Int64;
+        if (type == typeof(sbyte)) return Int8;
+        if (type == typeof(short)) return Int16;
+        if (type == typeof(int)) return Int32;
+        if (type == typeof(long)) return Int64;
 
-        if (type.IsAssignableFrom(typeof(byte))) return Uint8;
-        if (type.IsAssignableFrom(typeof(ushort))) return Uint16;
-        if (type.IsAssignableFrom(typeof(uint))) return Uint32;
-        if (type.IsAssignableFrom(typeof(ulong))) return Uint64;
+        if (type == typeof(byte)) return Uint8;
+        if (type == typeof(ushort)) return Uint16;
+        if (type == typeof(uint)) return Uint32;
+        if (type == typeof(ulong)) return Uint64;
 
-        if (type.IsAssignableFrom(typeof(float))) return Float;
-        if (type.IsAssignableFrom(typeof(double))) return Double;
+        if (type == typeof(float)) return Float;
+        if (type == typeof(double)) return Double;
 
-        if (type.IsAssignableFrom(typeof(byte[])) || type.IsAssignableFrom(typeof(MemoryStream))) return Bytes;
-        if (type.IsAssignableFrom(typeof(string))) return Text;
-        if (type.IsAssignableFrom(typeof(Guid))) return Uuid;
+        if (type == typeof(byte[]) || type == typeof(MemoryStream)) return Bytes;
+        if (type == typeof(string)) return Text;
+        if (type == typeof(Guid)) return Uuid;
 
-        if (type.IsAssignableFrom(typeof(DateOnly))) return Date;
-        if (type.IsAssignableFrom(typeof(DateTime))) return Timestamp;
-        if (type.IsAssignableFrom(typeof(TimeSpan))) return Interval;
+        if (type == typeof(DateOnly)) return Date;
+        if (type == typeof(DateTime)) return Timestamp;
+        if (type == typeof(TimeSpan)) return Interval;
 
         return null;
     }

src/Ydb.Sdk/src/Ado/YdbParameter.cs

@@ -285,6 +285,7 @@ _ when YdbDbType.HasFlag(YdbDbType.List) && value is IList itemsValue =>
     private TypedValue PackList(IList items, YdbDbType ydbDbType = YdbDbType.Unspecified)
     {
         var elementType = GetElementType(items) ?? throw ValueTypeNotSupportedException;
+        elementType = Nullable.GetUnderlyingType(elementType) ?? elementType;
         var primitiveTypeInfo = ydbDbType.PrimitiveTypeInfo() ?? YdbPrimitiveTypeInfo.TryResolve(elementType);
 
         if (primitiveTypeInfo != null)
@@ -314,7 +315,7 @@ private TypedValue PackList(IList items, YdbDbType ydbDbType = YdbDbType.Unspeci
             return new TypedValue { Type = type.ListType(), Value = value };
         }
 
-        if (ydbDbType == YdbDbType.Decimal || elementType.IsAssignableFrom(typeof(decimal)))
+        if (ydbDbType == YdbDbType.Decimal || elementType == typeof(decimal))
         {
             var value = new Ydb.Value();
             var isOptional = false;
@@ -343,8 +344,11 @@ private TypedValue PackList(IList items, YdbDbType ydbDbType = YdbDbType.Unspeci
             return new TypedValue { Type = type.ListType(), Value = value };
         }
 
-        return (from object? item in items select PackObject(item ?? throw ValueTypeNotSupportedException)).ToArray()
-            .List();
+        return (from object? item in items
+                select PackObject(item ?? throw new ArgumentException(
+                    $"Collection of type '{items.GetType()}' contains null. " +
+                    $"Specify YdbDbType (e.g. YdbDbType.List | YdbDbType.<T>) or use a strongly-typed collection (e.g., List<T?>)."))
+            ).ToArray().List();
     }
 
     private InvalidOperationException ValueTypeNotSupportedException =>

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbParameterTests.cs

@@ -554,7 +554,9 @@ PRIMARY KEY (Int32Column)
             YdbDbType.Interval,
             new List<TimeSpan?> { TimeSpan.FromDays(1), TimeSpan.FromDays(2), TimeSpan.FromDays(3), null }
         },
-        { YdbDbType.Interval, (TimeSpan?[])[TimeSpan.FromDays(1), TimeSpan.FromDays(2), TimeSpan.FromDays(3), null] }
+        { YdbDbType.Interval, (TimeSpan?[])[TimeSpan.FromDays(1), TimeSpan.FromDays(2), TimeSpan.FromDays(3), null] },
+        { YdbDbType.Int64, new List<object> { 1, 2u, (byte)3 } },
+        { YdbDbType.Int64, new object[] { 1, 2u, (byte)3 } } // only not null objects
     };
 
     public static TheoryData<YdbDbType, IList> ExtraParams = new()
@@ -740,13 +742,37 @@ public async Task YdbParameter_Value_WithYdbDbTypeList_ProducesListOfSpecifiedTy
     public void YdbParameter_SetValue_ListOrArray_InvalidInputs_Throws()
     {
         Assert.Equal("Writing value of 'System.Object[]' is not supported for parameters having YdbDbType 'List<Bool>'",
-            Assert.Throws<InvalidOperationException>(() =>
-                new YdbParameter("list", YdbDbType.List | YdbDbType.Bool, new object[] { true, false, "string" })
-                    .TypedValue).Message);
+            Assert.Throws<InvalidOperationException>(() => new YdbParameter("list",
+                YdbDbType.List | YdbDbType.Bool, new object[] { true, false, "string" }).TypedValue).Message);
 
         Assert.Equal(
             "Writing value of 'System.Object[]' is not supported for parameters having YdbDbType 'List<Decimal>'",
             Assert.Throws<InvalidOperationException>(() => new YdbParameter("list",
                 YdbDbType.List | YdbDbType.Decimal, new object[] { 1.0m, false, 2.0m }).TypedValue).Message);
+
+        Assert.Equal("All elements in the list must have the same type. Expected: { \"typeId\": \"INT32\" }, " +
+                     "actual: { \"typeId\": \"UINT32\" }", Assert.Throws<ArgumentException>(() =>
+            new YdbParameter("list", new List<object> { 1, 2u, (byte)3 }).TypedValue).Message);
+
+        Assert.Equal("All elements in the list must have the same type. Expected: { \"typeId\": \"INT32\" }, " +
+                     "actual: { \"typeId\": \"UINT32\" }", Assert.Throws<ArgumentException>(() =>
+            new YdbParameter("list", new object[] { 1, 2u, (byte)3 }).TypedValue).Message);
+
+        Assert.Equal("Collection of type 'System.Collections.Generic.List`1[System.Object]' contains null. " +
+                     "Specify YdbDbType (e.g. YdbDbType.List | YdbDbType.<T>) " +
+                     "or use a strongly-typed collection (e.g., List<T?>).", Assert.Throws<ArgumentException>(() =>
+            new YdbParameter("list", new List<object?> { 1, null }).TypedValue).Message);
+
+        Assert.Equal("Collection of type 'System.Object[]' contains null. " +
+                     "Specify YdbDbType (e.g. YdbDbType.List | YdbDbType.<T>) " +
+                     "or use a strongly-typed collection (e.g., List<T?>).", Assert.Throws<ArgumentException>(() =>
+            new YdbParameter("list", new object?[] { 1, null }).TypedValue).Message);
     }
+
+    [Fact]
+    public void YdbParameter_SetYdbDbTypeList_Throws() =>
+        Assert.Equal("Cannot set YdbDbType to just List. " +
+                     "Use Binary-Or with the element type (e.g. Array of dates is YdbDbType.List | YdbDbType.Date). " +
+                     "(Parameter 'value')",
+            Assert.Throws<ArgumentOutOfRangeException>(() => new YdbParameter("list", YdbDbType.List)).Message);
 }