Fixed bug in method GetSchema(): collection columns return Unspecified when column type is decimal

KirillKurdyukov · KirillKurdyukov · commit e64f6f1c7ee9 · 2025-05-14T15:49:00.000+04:00
diff --git a/src/Ydb.Sdk/CHANGELOG.md b/src/Ydb.Sdk/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Fixed bug in method GetSchema(): collection columns return Unspecified when decimal type about column.
+
 ## v0.16.1
 
 - Added `x-ydb-sdk-build-info` header to any RPC call.
diff --git a/src/Ydb.Sdk/src/Ado/Schema/SchemaUtils.cs b/src/Ydb.Sdk/src/Ado/Schema/SchemaUtils.cs
@@ -2,19 +2,19 @@ namespace Ydb.Sdk.Ado.Schema;
 
 internal static class SchemaUtils
 {
-    internal static string YqlTableType(this Type type)
+    internal static string YqlTableType(this Type type) => type.TypeCase switch
     {
-        var typeId = type.TypeCase == Type.TypeOneofCase.OptionalType
-            ? type.OptionalType.Item.TypeId
-            : type.TypeId;
-
-        return typeId switch
-        {
-            Type.Types.PrimitiveTypeId.Utf8 => "Text",
-            Type.Types.PrimitiveTypeId.String => "Bytes",
-            _ => typeId.ToString()
-        };
-    }
+        Type.TypeOneofCase.OptionalType => type.OptionalType.Item.YqlTableType(),
+        Type.TypeOneofCase.TypeId =>
+            type.TypeId switch
+            {
+                Type.Types.PrimitiveTypeId.Utf8 => "Text",
+                Type.Types.PrimitiveTypeId.String => "Bytes",
+                _ => type.TypeId.ToString()
+            },
+        Type.TypeOneofCase.DecimalType => "Decimal(22, 9)",
+        _ => "Unknown"
+    };
 
     internal static bool IsSystem(this string path) => path.StartsWith(".sys/")
                                                        || path.StartsWith(".sys_health/")
diff --git a/src/Ydb.Sdk/src/Ado/YdbCommand.cs b/src/Ydb.Sdk/src/Ado/YdbCommand.cs
@@ -188,7 +188,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
         {
             if (ydbParameters.TryGetValue(paramName, out var ydbValue))
             {
-                preparedSql.Append($"DECLARE {paramName} AS {ydbValue.ToYql()};\n");
+                preparedSql.Append($"DECLARE {paramName} AS {ydbValue.ToYql};\n");
             }
             else
             {
diff --git a/src/Ydb.Sdk/tests/Ado/YdbSchemaTests.cs b/src/Ydb.Sdk/tests/Ado/YdbSchemaTests.cs
@@ -13,14 +13,20 @@ public class YdbSchemaTests : YdbAdoNetFixture
     private readonly string _table1;
     private readonly string _table2;
     private readonly string _table3;
-    private readonly HashSet<string> _tableNames;
+    private readonly string _allTypesTable;
+    private readonly string _allTypesTableNullable;
+    private readonly HashSet<string> _allTableNames;
+    private readonly HashSet<string> _simpleTableNames;
 
     public YdbSchemaTests(YdbFactoryFixture fixture) : base(fixture)
     {
         _table1 = $"a/b/{Utils.Net}_{Random.Shared.Next()}";
         _table2 = $"a/{Utils.Net}_{Random.Shared.Next()}";
         _table3 = $"{Utils.Net}_{Random.Shared.Next()}";
-        _tableNames = new HashSet<string> { _table1, _table2, _table3 };
+        _allTypesTable = $"allTypesTable_{Utils.Net}_{Random.Shared.Next()}";
+        _allTypesTableNullable = $"allTypesTableNullable_{Utils.Net}_{Random.Shared.Next()}";
+        _allTableNames = new HashSet<string> { _table1, _table2, _table3, _allTypesTable, _allTypesTableNullable };
+        _simpleTableNames = new HashSet<string> { _table1, _table2, _table3 };
     }
 
     [Fact]
@@ -32,10 +38,10 @@ public async Task GetSchema_WhenTablesCollection_ReturnAllTables()
 
         foreach (DataRow row in table.Rows)
         {
-            _tableNames.Remove(row["table_name"].ToString()!);
+            _allTableNames.Remove(row["table_name"].ToString()!);
         }
 
-        Assert.Empty(_tableNames);
+        Assert.Empty(_allTableNames);
 
         var singleTable1 = await ydbConnection.GetSchemaAsync("Tables", new[] { _table1, "TABLE" });
         Assert.Equal(1, singleTable1.Rows.Count);
@@ -61,14 +67,14 @@ public async Task GetSchema_WhenTablesWithStatsCollection_ReturnAllTables()
 
         foreach (DataRow row in table.Rows)
         {
-            _tableNames.Remove(row["table_name"].ToString()!);
+            _allTableNames.Remove(row["table_name"].ToString()!);
 
             Assert.NotNull(row["rows_estimate"]);
             Assert.NotNull(row["creation_time"]);
             Assert.NotNull(row["modification_time"]);
         }
 
-        Assert.Empty(_tableNames);
+        Assert.Empty(_allTableNames);
 
         var singleTable1 = await ydbConnection.GetSchemaAsync("TablesWithStats", new[] { _table1, "TABLE" });
         Assert.Equal(1, singleTable1.Rows.Count);
@@ -97,7 +103,7 @@ public async Task GetSchema_WhenColumnsCollection_ReturnAllColumns()
     {
         await using var ydbConnection = await CreateOpenConnectionAsync();
 
-        foreach (var tableName in _tableNames)
+        foreach (var tableName in new[] { _table1, _table2, _table3 })
         {
             var dataTable = await ydbConnection.GetSchemaAsync("Columns", new[] { tableName, null });
 
@@ -128,7 +134,7 @@ public async Task GetSchema_WhenColumnsCollection_ReturnAllColumns()
             CheckColumnB(rowsB[i]);
         }
 
-        foreach (var tableName in _tableNames)
+        foreach (var tableName in _simpleTableNames)
         {
             var dataTable = await ydbConnection.GetSchemaAsync("Columns", new[] { tableName, "a" });
             Assert.Equal(1, dataTable.Rows.Count);
@@ -137,7 +143,7 @@ public async Task GetSchema_WhenColumnsCollection_ReturnAllColumns()
             CheckColumnA(columnA);
         }
 
-        foreach (var tableName in _tableNames)
+        foreach (var tableName in _simpleTableNames)
         {
             var dataTable = await ydbConnection.GetSchemaAsync("Columns", new[] { tableName, "b" });
             Assert.Equal(1, dataTable.Rows.Count);
@@ -167,6 +173,51 @@ void CheckColumnB(DataRow columnB)
         }
     }
 
+    [Fact]
+    public async Task GetSchema_WhenAllTypesTable_ReturnAllTypes()
+    {
+        await using var ydbConnection = await CreateOpenConnectionAsync();
+        var dataTable = await ydbConnection.GetSchemaAsync("Columns", new[] { _allTypesTable, null });
+        var dataTableNullable = await ydbConnection.GetSchemaAsync("Columns", new[] { _allTypesTableNullable, null });
+
+        Assert.Equal(17, dataTable.Rows.Count);
+        Assert.Equal(17, dataTableNullable.Rows.Count);
+
+        CheckAllColumns(dataTable, false);
+        CheckAllColumns(dataTableNullable, true);
+        return;
+
+        void CheckAllColumns(DataTable pDataTable, bool isNullableTable)
+        {
+            CheckColumn(pDataTable.Rows[0], "TimestampColumn", 0, isNullableTable);
+            CheckColumn(pDataTable.Rows[1], "Int32Column", 1, isNullableTable);
+            CheckColumn(pDataTable.Rows[2], "BoolColumn", 2, isNullableTable);
+            CheckColumn(pDataTable.Rows[3], "Int64Column", 3, isNullableTable);
+            CheckColumn(pDataTable.Rows[4], "Int16Column", 4, isNullableTable);
+            CheckColumn(pDataTable.Rows[5], "Int8Column", 5, isNullableTable);
+            CheckColumn(pDataTable.Rows[6], "FloatColumn", 6, isNullableTable);
+            CheckColumn(pDataTable.Rows[7], "DoubleColumn", 7, isNullableTable);
+            CheckColumn(pDataTable.Rows[8], "DefaultDecimalColumn", 8, isNullableTable, "Decimal(22, 9)");
+            CheckColumn(pDataTable.Rows[9], "Uint8Column", 9, isNullableTable);
+            CheckColumn(pDataTable.Rows[10], "Uint16Column", 10, isNullableTable);
+            CheckColumn(pDataTable.Rows[11], "Uint32Column", 11, isNullableTable);
+            CheckColumn(pDataTable.Rows[12], "Uint64Column", 12, isNullableTable);
+            CheckColumn(pDataTable.Rows[13], "TextColumn", 13, isNullableTable);
+            CheckColumn(pDataTable.Rows[14], "BytesColumn", 14, isNullableTable);
+            CheckColumn(pDataTable.Rows[15], "DateColumn", 15, isNullableTable);
+            CheckColumn(pDataTable.Rows[16], "DatetimeColumn", 16, isNullableTable);
+        }
+
+        void CheckColumn(DataRow column, string columnName, int ordinal, bool isNullable, string? dataType = null)
+        {
+            Assert.Equal(columnName, column["column_name"]);
+            Assert.Equal(ordinal, column["ordinal_position"]);
+            Assert.Equal(isNullable ? "YES" : "NO", column["is_nullable"]);
+            Assert.Equal(dataType ?? columnName[..^"Column".Length], column["data_type"]);
+            Assert.Empty((string)column["family_name"]);
+        }
+    }
+
     protected override async Task OnInitializeAsync()
     {
         await using var ydbConnection = await CreateOpenConnectionAsync();
@@ -177,6 +228,48 @@ protected override async Task OnInitializeAsync()
             CREATE TABLE `{_table1}` (a Int32 NOT NULL, b Int32, PRIMARY KEY(a));
             CREATE TABLE `{_table2}` (a Int32 NOT NULL, b Int32, PRIMARY KEY(a));
             CREATE TABLE `{_table3}` (a Int32 NOT NULL, b Int32, PRIMARY KEY(a));
+
+            CREATE TABLE {_allTypesTable} (
+                Int32Column Int32 NOT NULL,
+                BoolColumn Bool NOT NULL,
+                Int64Column Int64 NOT NULL,
+                Int16Column Int16 NOT NULL,
+                Int8Column Int8 NOT NULL,
+                FloatColumn Float NOT NULL,
+                DoubleColumn Double NOT NULL,
+                DefaultDecimalColumn Decimal(22,9) NOT NULL,
+                Uint8Column Uint8 NOT NULL,
+                Uint16Column Uint16 NOT NULL,
+                Uint32Column Uint32 NOT NULL,
+                Uint64Column Uint64 NOT NULL,
+                TextColumn Text NOT NULL,
+                BytesColumn Bytes NOT NULL,
+                DateColumn Date NOT NULL,
+                DatetimeColumn Datetime NOT NULL,
+                TimestampColumn Timestamp NOT NULL,
+                PRIMARY KEY (Int32Column)
+            );
+
+            CREATE TABLE {_allTypesTableNullable} (
+                Int32Column Int32,
+                BoolColumn Bool,
+                Int64Column Int64,
+                Int16Column Int16,
+                Int8Column Int8,
+                FloatColumn Float,
+                DoubleColumn Double,
+                DefaultDecimalColumn Decimal(22,9),
+                Uint8Column Uint8,
+                Uint16Column Uint16,
+                Uint32Column Uint32,
+                Uint64Column Uint64,
+                TextColumn Text,
+                BytesColumn Bytes,
+                DateColumn Date,
+                DatetimeColumn Datetime,
+                TimestampColumn Timestamp,
+                PRIMARY KEY (Int32Column)
+            );
             "
         }.ExecuteNonQueryAsync();
     }
@@ -191,6 +284,8 @@ protected override async Task OnDisposeAsync()
             DROP TABLE `{_table1}`; 
             DROP TABLE `{_table2}`; 
             DROP TABLE `{_table3}`;
+            DROP TABLE `{_allTypesTable}`;
+            DROP TABLE `{_allTypesTableNullable}`;
             "
         }.ExecuteNonQueryAsync();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+- Fixed bug in method GetSchema(): collection columns return Unspecified when decimal type about column.`
	`2`	`+`
`1`	`3`	`## v0.16.1`
`2`	`4`
`3`	`5`	- Added `x-ydb-sdk-build-info` header to any RPC call.
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha`
`188`	`188`	`{`
`189`	`189`	`if (ydbParameters.TryGetValue(paramName, out var ydbValue))`
`190`	`190`	`{`
`191`		`- preparedSql.Append($"DECLARE {paramName} AS {ydbValue.ToYql()};\n");`
	`191`	`+ preparedSql.Append($"DECLARE {paramName} AS {ydbValue.ToYql};\n");`
`192`	`192`	`}`
`193`	`193`	`else`
`194`	`194`	`{`