MAIN COMMIT

Author: KirillKurdyukov

.github/ydb.yaml

@@ -27,7 +27,7 @@ channel_profile_config:
       profile_id: 0
 domains_config:
   domain:
-    - name: local
+    - name: Root
       storage_pool_types:
         - kind: ssd
           pool_config:

src/Ydb.Sdk/src/Ado/YdbConnection.cs

@@ -1,23 +1,28 @@
 using System.Data;
 using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
 using Ydb.Sdk.Services.Query;
 using static System.Data.IsolationLevel;
 
 namespace Ydb.Sdk.Ado;
 
 public sealed class YdbConnection : DbConnection
 {
-    private static readonly YdbConnectionStringBuilder DefaultSettings = new();
-
     private static readonly StateChangeEventArgs ClosedToOpenEventArgs =
         new(ConnectionState.Closed, ConnectionState.Open);
 
     private static readonly StateChangeEventArgs OpenToClosedEventArgs =
         new(ConnectionState.Open, ConnectionState.Closed);
 
     private bool _disposed;
+    private YdbConnectionStringBuilder? _connectionStringBuilder;
 
-    private YdbConnectionStringBuilder ConnectionStringBuilder { get; set; }
+    private YdbConnectionStringBuilder ConnectionStringBuilder
+    {
+        get => _connectionStringBuilder ??
+               throw new InvalidOperationException("The ConnectionString property has not been initialized.");
+        [param: AllowNull] init => _connectionStringBuilder = value;
+    }
 
     internal Session Session
     {
@@ -34,7 +39,6 @@ internal Session Session
 
     public YdbConnection()
     {
-        ConnectionStringBuilder = DefaultSettings;
     }
 
     public YdbConnection(string connectionString)
@@ -147,15 +151,15 @@ public override async Task CloseAsync()
 
     public override string ConnectionString
     {
-        get => ConnectionStringBuilder.ConnectionString;
+        get => _connectionStringBuilder?.ConnectionString ?? "";
 #pragma warning disable CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
         set
 #pragma warning restore CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
         {
             EnsureConnectionClosed();
 
             // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-            ConnectionStringBuilder = value != null ? new YdbConnectionStringBuilder(value) : DefaultSettings;
+            _connectionStringBuilder = value != null ? new YdbConnectionStringBuilder(value) : null;
         }
     }
 

src/Ydb.Sdk/src/Ado/YdbDataReader.cs

@@ -434,17 +434,21 @@ public override IEnumerator<YdbDataRecord> GetEnumerator()
 
     public override async Task CloseAsync()
     {
+        if (ReaderState == State.Closed)
+        {
+            return;
+        }
+
         ReaderState = State.Closed;
+        _onNotSuccessStatus(new Status(StatusCode.SessionBusy));
 
         await _stream.DisposeAsync();
 
-        if (_ydbTransaction is { TxId: null })
+        if (_ydbTransaction != null)
         {
             _ydbTransaction.Failed = true;
 
-            throw new YdbException(
-                "YdbDataReader was closed before receiving the transaction id. Transaction is broken!"
-            );
+            throw new YdbException("YdbDataReader was closed during transaction execution. Transaction is broken!");
         }
     }
 

src/Ydb.Sdk/tests/Ado/Specification/YdbConnectionTests.cs

@@ -25,14 +25,6 @@ public override Task DisposeAsync_raises_Disposed()
         return base.DisposeAsync_raises_Disposed();
     }
 
-#pragma warning disable xUnit1004
-    [Fact(Skip = "Connect to default settings 'grpc://localhost:2136/local'.")]
-#pragma warning restore xUnit1004
-    public override void Open_throws_when_no_connection_string()
-    {
-        base.Open_throws_when_no_connection_string();
-    }
-
 #pragma warning disable xUnit1004
     [Fact(Skip = "TODO Supported this field.")]
 #pragma warning restore xUnit1004

src/Ydb.Sdk/tests/Ado/Specification/YdbFactoryFixture.cs

@@ -8,5 +8,5 @@ public class YdbFactoryFixture : IDbFactoryFixture
 {
     public DbProviderFactory Factory => YdbProviderFactory.Instance;
 
-    public string ConnectionString => "Host=localhost;Port=2136;Database=local";
+    public string ConnectionString => "Host=localhost;Port=2136;Database=/Root/testdb";
 }

src/Ydb.Sdk/tests/Ado/YdbAdoUserPasswordTests.cs

@@ -1,23 +1,28 @@
 using Xunit;
 using Ydb.Sdk.Ado;
+using Ydb.Sdk.Tests.Ado.Specification;
+using Ydb.Sdk.Tests.Fixture;
 
 namespace Ydb.Sdk.Tests.Ado;
 
-public class YdbAdoUserPasswordTests
+public class YdbAdoUserPasswordTests : YdbAdoNetFixture
 {
+    public YdbAdoUserPasswordTests(YdbFactoryFixture fixture) : base(fixture)
+    {
+    }
+
     [Fact]
     public async Task Authentication_WhenUserAndPassword_ReturnValidConnection()
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var ydbCommand = connection.CreateCommand();
         var kurdyukovkirya = "kurdyukovkirya" + Random.Shared.Next();
         ydbCommand.CommandText = $"CREATE USER {kurdyukovkirya} PASSWORD 'password'";
         await ydbCommand.ExecuteNonQueryAsync();
         await connection.CloseAsync();
 
-        await using var userPasswordConnection = new YdbConnection($"User={kurdyukovkirya};Password=password;");
+        await using var userPasswordConnection =
+            new YdbConnection($"{ConnectionString};User={kurdyukovkirya};Password=password;");
         await userPasswordConnection.OpenAsync();
         ydbCommand = userPasswordConnection.CreateCommand();
         ydbCommand.CommandText = "SELECT 1 + 2";

src/Ydb.Sdk/tests/Ado/YdbCommandTests.cs

@@ -2,26 +2,29 @@
 using System.Text;
 using Xunit;
 using Ydb.Sdk.Ado;
+using Ydb.Sdk.Tests.Ado.Specification;
+using Ydb.Sdk.Tests.Fixture;
 using Ydb.Sdk.Value;
 
 namespace Ydb.Sdk.Tests.Ado;
 
-public class YdbCommandTests
+public class YdbCommandTests : YdbAdoNetFixture
 {
+    public YdbCommandTests(YdbFactoryFixture fixture) : base(fixture)
+    {
+    }
+
     [Theory]
     [ClassData(typeof(YdbParameterTests.TestDataGenerator))]
     public async Task ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbParameterTests.Data<T> data)
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
-
-        dbCommand.CommandText = "SELECT $var as var;";
+        dbCommand.CommandText = "SELECT @var as var;";
 
         var dbParameter = new YdbParameter
         {
-            ParameterName = "$var",
+            ParameterName = "var",
             DbType = data.DbType,
             Value = data.Expected,
             IsNullable = data.IsNullable
@@ -48,11 +51,8 @@ public async Task ExecuteScalarAsync_WhenSetYdbParameter_ReturnThisValue<T>(YdbP
     public async Task ExecuteScalarAsync_WhenSetYdbParameterThenPrepare_ReturnThisValue<T>(
         YdbParameterTests.Data<T> data)
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
-
         dbCommand.CommandText = "SELECT @var;";
 
         var dbParameter = new YdbParameter
@@ -76,11 +76,8 @@ public async Task ExecuteScalarAsync_WhenDbTypeIsObject_ReturnThisValue<T>(YdbPa
             return;
         }
 
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
-
         dbCommand.CommandText = "SELECT @var;";
 
         var dbParameter = new YdbParameter
@@ -112,9 +109,7 @@ public async Task ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
                 Encoding.ASCII.GetBytes("{type=\"yson\"}"))
         };
 
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
         dbCommand.CommandText = "SELECT @var;";
 
@@ -133,24 +128,18 @@ public async Task ExecuteScalarAsync_WhenNoDbTypeParameter_ReturnThisValue()
     [Fact]
     public async Task ExecuteNonQueryAsync_WhenCreateUser_ReturnEmptyResultSet()
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
         dbCommand.CommandText = "CREATE USER user PASSWORD '123qweqwe'";
-
         await dbCommand.ExecuteNonQueryAsync();
-
         dbCommand.CommandText = "DROP USER user;";
         await dbCommand.ExecuteNonQueryAsync();
     }
 
     [Fact]
     public async Task CloseAsync_WhenDoubleInvoke_Idempotent()
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var ydbCommand = connection.CreateCommand();
         ydbCommand.CommandText = "SELECT 1;";
         var ydbDataReader = await ydbCommand.ExecuteReaderAsync();
@@ -165,19 +154,20 @@ public async Task CloseAsync_WhenDoubleInvoke_Idempotent()
     [Fact]
     public async Task ExecuteDbDataReader_WhenSelectManyResultSet_ReturnYdbDataReader()
     {
-        await using var connection = new YdbConnection();
-        await connection.OpenAsync();
-
+        await using var connection = await CreateOpenConnectionAsync();
         var dbCommand = connection.CreateCommand();
         dbCommand.CommandText = @"
+DECLARE $var1 AS Datetime;
+DECLARE $var2 AS Timestamp;  
+        
 SELECT 1 as a, CAST('text' AS Text) as b;
 
 $data = ListReplicate(AsStruct(true AS bool_field, 1.5 AS double_field, 23 AS int_field), 1500);
 
 SELECT bool_field, double_field, int_field  FROM AS_TABLE($data);
 
-SELECT CAST(NULL AS Int8) AS null_field;
-
+SELECT CAST(NULL AS Int8) AS null_field;      
+        
 $new_data = AsList(
     AsStruct($var1 AS Key, $var2 AS Value),
     AsStruct($var1 AS Key, $var2 AS Value)
@@ -258,25 +248,18 @@ public async Task ExecuteDbDataReader_WhenSelectManyResultSet_ReturnYdbDataReade
     [Fact]
     public void CommandTimeout_WhenCommandTimeoutLessZero_ThrowException()
     {
-        using var connection = new YdbConnection();
-        connection.Open();
-
+        using var connection = CreateOpenConnection();
         var dbCommand = connection.CreateCommand();
-
         Assert.Equal("CommandTimeout can't be less than zero. (Parameter 'value')\nActual value was -1.",
             Assert.Throws<ArgumentOutOfRangeException>(() => dbCommand.CommandTimeout = -1).Message);
     }
 
     [Fact]
     public void ExecuteDbDataReader_WhenPreviousIsNotClosed_ThrowException()
     {
-        using var connection = new YdbConnection();
-        connection.Open();
-
+        using var connection = CreateOpenConnection();
         var dbCommand = connection.CreateCommand();
-
         dbCommand.CommandText = "SELECT 1; SELECT 1;";
-
         var ydbDataReader = dbCommand.ExecuteReader();
 
         Assert.Equal("A command is already in progress: SELECT 1; SELECT 1;",
@@ -292,8 +275,7 @@ public void ExecuteDbDataReader_WhenPreviousIsNotClosed_ThrowException()
     [Fact]
     public void GetChars_WhenSelectText_MoveCharsToBuffer()
     {
-        using var connection = new YdbConnection();
-        connection.Open();
+        using var connection = (YdbConnection)CreateOpenConnection();
         var ydbDataReader =
             new YdbCommand(connection) { CommandText = "SELECT CAST('abacaba' AS Text)" }.ExecuteReader();
         Assert.True(ydbDataReader.Read());
@@ -342,8 +324,7 @@ public void GetChars_WhenSelectText_MoveCharsToBuffer()
     [Fact]
     public void GetBytes_WhenSelectBytes_MoveBytesToBuffer()
     {
-        using var connection = new YdbConnection();
-        connection.Open();
+        using var connection = (YdbConnection)CreateOpenConnection();
         var ydbDataReader = new YdbCommand(connection) { CommandText = "SELECT 'abacaba'" }.ExecuteReader();
         Assert.True(ydbDataReader.Read());
         var bufferChars = new byte[10];
@@ -389,8 +370,7 @@ public void GetBytes_WhenSelectBytes_MoveBytesToBuffer()
     [Fact]
     public async Task GetEnumerator_WhenReadMultiSelect_ReadFirstResultSet()
     {
-        await using var ydbConnection = new YdbConnection();
-        ydbConnection.Open();
+        await using var ydbConnection = await CreateOpenConnectionAsync();
         var ydbCommand = new YdbCommand(ydbConnection)
         {
             CommandText = @"
@@ -432,9 +412,7 @@ public async Task GetEnumerator_WhenReadMultiSelect_ReadFirstResultSet()
     [Fact]
     public async Task ExecuteScalar_WhenSelectNull_ReturnNull()
     {
-        await using var ydbConnection = new YdbConnection();
-        await ydbConnection.OpenAsync();
-
+        await using var ydbConnection = await CreateOpenConnectionAsync();
         Assert.Null(await new YdbCommand(ydbConnection) { CommandText = "SELECT NULL" }.ExecuteScalarAsync());
     }
 
@@ -444,9 +422,7 @@ public async Task ExecuteScalar_WhenSelectNull_ReturnNull()
     [InlineData("6E73B41C-4EDE-4D08-9CFB-B7462D9E498B")]
     public async Task Guid_WhenSelectUuid_ReturnThisUuid(string guid)
     {
-        await using var ydbConnection = new YdbConnection();
-        await ydbConnection.OpenAsync();
-
+        await using var ydbConnection = await CreateOpenConnectionAsync();
         var actualGuid = await new YdbCommand(ydbConnection)
                 { CommandText = $"SELECT CAST('{guid}' AS UUID);" }
             .ExecuteScalarAsync();
@@ -461,9 +437,7 @@ public async Task Guid_WhenSelectUuid_ReturnThisUuid(string guid)
     [InlineData("6E73B41C-4EDE-4D08-9CFB-B7462D9E498B")]
     public async Task Guid_WhenSetUuid_ReturnThisUtf8Uuid(string guid)
     {
-        await using var ydbConnection = new YdbConnection();
-        await ydbConnection.OpenAsync();
-
+        await using var ydbConnection = await CreateOpenConnectionAsync();
         var ydbCommand = new YdbCommand(ydbConnection)
         {
             CommandText = "SELECT CAST(@guid AS Text);"