Merge branch 'ydb-platform:main' into main

Author: KirillKurdyukov

.github/workflows/tests.yml

@@ -30,9 +30,7 @@ jobs:
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Test
-        run: |
-          cd src
-          dotnet test --filter "Category=Unit" -f ${{ matrix.dotnet-target-framework }}
+        run: dotnet test src/Ydb.Sdk/tests/Tests.csproj --filter "Category=Unit" -f ${{ matrix.dotnet-target-framework }}
   ado-net-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -55,11 +53,6 @@ jobs:
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
         options: '--name ydb-local -h localhost'
-    env:
-      OS: ubuntu-22.04
-      YDB_VERSION: ${{ matrix.ydb-version }}
-      YDB_CONNECTION_STRING: grpc://localhost:2136/local
-      YDB_CONNECTION_STRING_SECURE: grpcs://localhost:2135/local
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -70,8 +63,7 @@ jobs:
       - name: Run ADO.NET tests
         run: |
           docker cp ydb-local:/ydb_certs/ca.pem ~/
-          cd src
-          dotnet test --filter "(FullyQualifiedName~Ado) | (FullyQualifiedName~Dapper)" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"
+          dotnet test src/Ydb.Sdk/tests/Tests.csproj --filter "(FullyQualifiedName~Ado) | (FullyQualifiedName~Dapper)" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"
   topic-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -94,11 +86,6 @@ jobs:
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
         options: '--name ydb-local -h localhost'
-    env:
-      OS: ubuntu-22.04
-      YDB_VERSION: ${{ matrix.ydb-version }}
-      YDB_CONNECTION_STRING: grpc://localhost:2136/local
-      YDB_CONNECTION_STRING_SECURE: grpcs://localhost:2135/local
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -107,10 +94,7 @@ jobs:
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Run Topic tests
-        run: |
-          docker cp ydb-local:/ydb_certs/ca.pem ~/
-          cd src
-          dotnet test --filter "FullyQualifiedName~Topic" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=detailed"  
+        run: dotnet test src/Ydb.Sdk/tests/Tests.csproj --filter "FullyQualifiedName~Topic" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=detailed"  
   integration-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -133,11 +117,6 @@ jobs:
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
         options: '--name ydb-local -h localhost'
-    env:
-      OS: ubuntu-22.04
-      YDB_VERSION: ${{ matrix.ydb-version }}
-      YDB_CONNECTION_STRING: grpc://localhost:2136/local
-      YDB_CONNECTION_STRING_SECURE: grpcs://localhost:2135/local
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -146,10 +125,7 @@ jobs:
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Integration test
-        run: |
-          docker cp ydb-local:/ydb_certs/ca.pem ~/
-          cd src
-          dotnet test --filter "Category=Integration" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"
+        run: dotnet test src/Ydb.Sdk/tests/Tests.csproj --filter "Category=Integration" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"
 
   run-examples:
     runs-on: ubuntu-22.04

src/Ydb.Sdk/tests/Query/QueryIntegrationTests.cs

@@ -64,6 +64,12 @@ INNER JOIN {Tables.Series} AS sr
     public async Task ReadRows_UpsertDeleteSelectSingleRow_ReturnNewRow()
     {
         await _queryClient.Exec($@"
+            DECLARE $series_id AS Uint64;
+            DECLARE $season_id AS Uint64;
+            DECLARE $episode_id AS Uint64;
+            DECLARE $title AS Text;
+            DECLARE $air_date AS Date;
+
             UPSERT INTO {Tables.Episodes} (series_id, season_id, episode_id, title, air_date) 
             VALUES ($series_id, $season_id, $episode_id, $title, $air_date)", new Dictionary<string, YdbValue>
         {
@@ -75,6 +81,10 @@ await _queryClient.Exec($@"
         });
 
         var row = await _queryClient.ReadRow($@"
+            DECLARE $series_id AS Uint64;
+            DECLARE $season_id AS Uint64;
+            DECLARE $episode_id AS Uint64;
+
             SELECT title FROM {Tables.Episodes} 
             WHERE series_id = $series_id AND season_id = $season_id AND episode_id = $episode_id;",
             new Dictionary<string, YdbValue>
@@ -101,6 +111,10 @@ public async Task DoTx_UpsertThenRollbackTransaction_ReturnOldRow()
         await _queryClient.DoTx(async queryTx =>
         {
             await queryTx.Exec($@"
+                    DECLARE $series_id AS Uint64;
+                    DECLARE $season_id AS Uint64;
+                    DECLARE $air_date AS Date;
+
                     UPSERT INTO {Tables.Seasons} (series_id, season_id, first_aired) VALUES
                     ($series_id, $season_id, $air_date);
                 ", new Dictionary<string, YdbValue>
@@ -127,6 +141,10 @@ public async Task DoTx_UpsertThenExceptionInTransaction_ReturnOldRow()
             await _queryClient.DoTx(async queryTx =>
             {
                 await queryTx.Exec($@"
+                    DECLARE $series_id AS Uint64;
+                    DECLARE $season_id AS Uint64;
+                    DECLARE $air_date AS Date;
+
                     UPSERT INTO {Tables.Seasons} (series_id, season_id, first_aired) VALUES
                     ($series_id, $season_id, $air_date);
                 ", new Dictionary<string, YdbValue>
@@ -204,6 +222,7 @@ public async Task Stream_ReadingMore1000RowsFromChannel_ReturnChannelExecutePart
         for (uint i = 0; i < sizeSeasons; i++)
         {
             tasks[i] = _queryClient.Exec(
+                $"DECLARE $season_id AS Uint64; DECLARE $title AS Text;" +
                 $"INSERT INTO {Tables.Seasons} (series_id, season_id, title) VALUES (3, $season_id, $title)",
                 new Dictionary<string, YdbValue>
                 {