Merge branch 'main' into work/somefix

Author: MIVerTFT

.github/scripts/publish-ef.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -euxo pipefail
+
+CHANGELOG=$(cat $CHANGELOG_FILE | sed -e '/^## v.*$/,$d')
+if [[ -z "$CHANGELOG" ]]
+then
+  echo "CHANGELOG empty"
+  exit 1;
+fi;
+
+LAST_EF_TAG=$(git tag --sort=-creatordate --list 'ef-*' | head -n 1 | cut -d '-' -f 2);
+LAST_EF_TAG=${LAST_EF_TAG:-v0.0.0}
+MAJOR=$(echo $LAST_EF_TAG | sed -E 's/v([0-9]+)\..*/\1/');
+MINOR=$(echo $LAST_EF_TAG | sed -E 's/v[0-9]+\.([0-9]+)\..*/\1/');
+PATCH=$(echo $LAST_EF_TAG | sed -E 's/v[0-9]+\.[0-9]+\.([0-9]+)($|-rc[0-9]+)/\1/');
+RC=0;
+
+if [ "$RELEASE_CANDIDATE" = true ]
+then
+  RC=$(git tag | grep "ef-v$MAJOR.$MINOR.$PATCH-rc" | wc -l | xargs || true); 
+fi
+if [ "$VERSION_CHANGE" = "MINOR" ] && [ $RC = 0 ]
+then
+  MINOR=$((MINOR+1));
+  PATCH=0;
+fi;
+if [ "$VERSION_CHANGE" = "PATCH" ] && [ $RC = 0 ]
+then
+  PATCH=$((PATCH+1));
+fi;
+if [ "$RELEASE_CANDIDATE" = true ]
+then
+  VERSION="$MAJOR.$MINOR.$PATCH-rc$RC";
+else
+  VERSION="$MAJOR.$MINOR.$PATCH";
+fi;
+
+TAG="v$VERSION"
+echo -e "## $TAG\n" >> $CHANGELOG_FILE.tmp
+cat $CHANGELOG_FILE >> $CHANGELOG_FILE.tmp
+mv $CHANGELOG_FILE.tmp $CHANGELOG_FILE;
+git add $CHANGELOG_FILE;
+git config --global user.email "robot@umbrella";
+git config --global user.name "robot";
+git commit -m "Release EF $TAG";
+git tag "ef-$TAG"
+git push --tags && git push
+CHANGELOG="$CHANGELOG
+
+Full Changelog: [$LAST_EF_TAG...$TAG](https://github.com/ydb-platform/ydb-dotnet-sdk/compare/$LAST_EF_TAG...$TAG)"
+
+cd src/EFCore.Ydb/src
+dotnet pack -c Release -o out /p:Version=$VERSION
+gh release create $TAG -t "ef-$TAG" --notes "$CHANGELOG"
+dotnet nuget push out/EntityFrameworkCore.Ydb.$VERSION.nupkg  --skip-duplicate --api-key $NUGET_TOKEN --source https://api.nuget.org/v3/index.json

.github/scripts/publish.sh

@@ -31,9 +31,6 @@ if [ "$RELEASE_CANDIDATE" = true ]
 then
   VERSION="$MAJOR.$MINOR.$PATCH-rc$RC";
 else
-  sed -e "s/Minor = [0-9]*/Minor = $MINOR/g" -i $VERSION_FILE
-  sed -e "s/Patch = [0-9]*/Patch = $PATCH/g" -i $VERSION_FILE
-  git add $VERSION_FILE;
   VERSION="$MAJOR.$MINOR.$PATCH";
 fi;
 TAG="v$VERSION"

.github/workflows/publish-ef.yml

@@ -0,0 +1,46 @@
+name: publish
+on:
+  workflow_dispatch:
+    inputs:
+      version-change:
+        description: Version part
+        required: true
+        type: choice
+        options:
+          - PATCH
+          - MINOR
+      release-candidate:
+        description: Release candidate
+        required: true
+        type: boolean
+        default: True
+
+permissions:
+  contents: write
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+      VERSION_CHANGE: ${{ github.event.inputs.version-change }}
+      RELEASE_CANDIDATE: ${{ github.event.inputs.release-candidate }}
+      CHANGELOG_FILE: ./src/EFCore.Ydb/CHANGELOG.md
+      GITHUB_TOKEN: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
+      NUGET_TOKEN: ${{ secrets.YDB_PLATFORM_NUGET_TOKEN }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
+          fetch-depth: 0
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Build
+        run: |
+          cd src/EFCore.Ydb/src
+          dotnet build --configuration Release 
+      - name: Publish
+        run: bash .github/scripts/publish-ef.sh
+        

.github/workflows/publish.yml

@@ -24,7 +24,6 @@ jobs:
     env:
       VERSION_CHANGE: ${{ github.event.inputs.version-change }}
       RELEASE_CANDIDATE: ${{ github.event.inputs.release-candidate }}
-      VERSION_FILE: src/Ydb.Sdk/src/Version.cs
       CHANGELOG_FILE: CHANGELOG.md
       GITHUB_TOKEN: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
       NUGET_TOKEN: ${{ secrets.YDB_PLATFORM_NUGET_TOKEN }}

.github/workflows/tests.yml

@@ -94,7 +94,7 @@ jobs:
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Run Topic tests
-        run: dotnet test src/Ydb.Sdk/tests/Tests.csproj --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"
   efcore-functional-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -118,8 +118,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.x
-      - name: Run EfCore tests
-        run: dotnet test src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed"
+      - name: Run EFCore tests
+        run: dotnet test src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed"
   integration-tests:
     runs-on: ubuntu-22.04
     strategy:

README.md

@@ -9,7 +9,6 @@ Provides an ADO.NET standard implementation for working with YDB, as well as nat
 ## Features
 
 - **ADO.NET**: Full support for standard ADO.NET interfaces including DbConnection, DbCommand, DbDataReader, and more. This allows you to use familiar methods and patterns for database operations while leveraging the power and flexibility of YDB.
-- **QueryClient**: A lightweight, high-performance native client for direct interaction with YDB tables.
 
 ## Versioning
 
@@ -64,64 +63,6 @@ while (await ydbDataReader.ReadAsync())
 }
 ```
 
-## Usage Native clients
-
-To begin your work with YDB, create an instance of `Ydb.Sdk.Driver` class:
-```c#
-var config = new DriverConfig(
-    endpoint: endpoint, // Database endpoint, "grpcs://host:port"
-    database: database, // Full database path
-    credentials: credentialsProvider // Credentials provider, see "Credentials" section
-);
-
-using var driver = new Driver(
-    config: config,
-    loggerFactory: loggerFactory
-);
-
-await driver.Initialize(); // Make sure to await driver initialization
-```
-
-After you have driver instance, you can use it to create clients for different YDB services.
-
-### Credentials
-YDB SDK provides several standard ways for authentication:
-1) `Ydb.Sdk.Auth.AnonymousProvider`. Anonymous YDB access, mainly for tests purposes.
-2) `Ydb.Sdk.Auth.TokenProvider`. Token authentication for OAuth-like tokens.
-3) `Ydb.Sdk.Auth.StaticCredentialsProvider`. Username and password based authentication.
-
-For Yandex.Cloud specific authentication methods, consider using **[ydb-dotnet-yc](https://github.com/ydb-platform/ydb-dotnet-yc)**.
-
-### QueryClient
-
-Example of using a query client to execute a simple query:
-
-```c#
-// Create QueryClient using Driver instance.
-using var queryClient = new QueryClient(driver);
-
-var row = await queryClient.ReadRow(@"
-        DECLARE $id AS Uint64;
-
-        SELECT
-            series_id,
-            title,
-            release_date
-        FROM series
-        WHERE series_id = $id;
-    ",
-    new Dictionary<string, YdbValue>
-    {
-        { "$id", YdbValue.MakeUint64(id) }
-    }
-);
-
-Console.WriteLine($"> Series, " +
-    $"series_id: {(ulong?)row["series_id"]}, " +
-    $"title: {(string?)row["title"]}, " +
-    $"release_date: {(DateTime?)row["release_date"]}");
-```
-
 ## Examples
 
 See **[examples folder](https://github.com/ydb-platform/ydb-dotnet-sdk/tree/main/examples)**

examples/src/EF/EF.csproj

@@ -5,10 +5,10 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>EfCore</RootNamespace>
+        <RootNamespace>EF</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\EfCore.Ydb\src\EfCore.Ydb.csproj"/>
+        <ProjectReference Include="..\..\..\src\EFCore.Ydb\src\EntityFrameworkCore.Ydb.csproj"/>
     </ItemGroup>
 </Project>

examples/src/EF/Program.cs

@@ -1,4 +1,4 @@
-using EfCore.Ydb.Extensions;
+using EntityFrameworkCore.Ydb.Extensions;
 using Microsoft.EntityFrameworkCore;
 
 await using var db = new BloggingContext();
@@ -8,6 +8,7 @@
 
 Console.WriteLine("Inserting a new blog");
 db.Add(new Blog { Url = "http://blogs.msdn.com/adonet" });
+
 await db.SaveChangesAsync();
 
 Console.WriteLine("Querying for a blog");
@@ -30,7 +31,8 @@ internal class BloggingContext : DbContext
     public DbSet<Post> Posts { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder options)
-        => options.UseYdb("Host=localhost;Port=2136;Database=/local");
+        => options.UseYdb("Host=localhost;Port=2136;Database=/local")
+            .LogTo(Console.WriteLine);
 }
 
 internal class Blog

examples/src/EF_YC/EF_YC.csproj

@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\EfCore.Ydb\src\EfCore.Ydb.csproj"/>
+        <ProjectReference Include="..\..\..\src\EFCore.Ydb\src\EntityFrameworkCore.Ydb.csproj"/>
         <ProjectReference Include="..\..\..\src\Ydb.Sdk\src\Ydb.Sdk.csproj"/>
     </ItemGroup>
 </Project>

examples/src/EF_YC/Program.cs

@@ -1,6 +1,6 @@
 using CommandLine;
 using EF_YC;
-using EfCore.Ydb.Extensions;
+using EntityFrameworkCore.Ydb.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Ydb.Sdk.Yc;