Merge pull request #24 from Byndyusoft/feature/refactor

Feature/refactor

.github/workflows/pull-request.yml

@@ -16,16 +16,10 @@ jobs:
       DOTNET_NOLOGO: true
     steps:
       - name: checkout
-        uses: actions/checkout@v2
-
-
-      - name: install dotnet 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.x
+        uses: actions/checkout@v3
 
       - name: install dotnet 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 

.github/workflows/push.yml

@@ -16,15 +16,10 @@ jobs:
       DOTNET_NOLOGO: true
     steps:
       - name: checkout
-        uses: actions/checkout@v2
-
-      - name: install dotnet 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.x
+        uses: actions/checkout@v3
 
       - name: install dotnet 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 

.github/workflows/release.yml

@@ -12,14 +12,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@master
-
-      - name: install dotnet 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.x
 
       - name: install dotnet 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>0.11.0</Version>
+		<Version>0.12.0-rc1</Version>
 		<Authors>Byndyusoft</Authors>
 		<PackageTags>Byndyusoft;Data;Relational</PackageTags>
 		<RepositoryUrl>https://github.com/Byndyusoft/Byndyusoft.Data.Relational</RepositoryUrl>

nuget.config

@@ -0,0 +1,12 @@
+<configuration>
+	<packageSources>
+	  <clear />
+	  <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+	</packageSources>
+
+	<packageSourceMapping>
+	  <packageSource key="nuget.org">
+		<package pattern="*" />
+	  </packageSource>
+	</packageSourceMapping>
+</configuration>

src/Byndyusoft.Data.Relational.Abstractions/DbSessionConsumer.cs

@@ -25,7 +25,7 @@ protected DbSessionConsumer(IDbSessionAccessor sessionAccessor)
         /// <summary>
         ///     Gets the current <see cref="IDbSession" />.
         /// </summary>
-        protected IDbSession DbSession => _sessionAccessor.DbSession ??
+        protected IDbSession DbSession =>  _sessionAccessor.DbSession ??
                                           throw new InvalidOperationException(
                                               $"There is no current {nameof(DbSession)}");
 

src/Byndyusoft.Data.Relational.Abstractions/IDbSession.cs

@@ -28,15 +28,5 @@ public interface IDbSession : IDisposable, IAsyncDisposable
         ///     Gets a collection of key/value pairs that provide additional information about the <see cref="IDbSession" />.
         /// </summary>
         IDictionary<string, object> Items { get; }
-
-        /// <summary>
-        ///     Gets a string that describes the state of the <see cref="IDbSession" />.
-        /// </summary>
-        DbSessionState State { get; }
-
-        /// <summary>
-        ///     Occurs when the session becomes finished.
-        /// </summary>
-        event DbSessionFinishedEventHandler Finished;
     }
 }

src/Byndyusoft.Data.Relational.Abstractions/IDbSessionStorage.cs

@@ -0,0 +1,20 @@
+namespace Byndyusoft.Data.Relational
+{
+    public interface IDbSessionStorage : IDbSessionsIndexer
+    {
+        /// <summary>
+        ///     Gets the current <see cref="IDbSession" /> with specified name.
+        ///     Returns null if there is no active <see cref="IDbSession" /> with specified name.
+        /// </summary>
+        /// <param name="name">The name of the <see cref="IDbSession" />.</param>
+        /// <returns>Instance of <see cref="IDbSession" />.</returns>
+        IDbSession? GetCurrent(string name);
+
+        /// <summary>
+        ///     Sets the current <see cref="IDbSession" /> with specified name.
+        /// </summary>
+        /// <param name="name">The name of the <see cref="IDbSession" />.</param>
+        /// <param name="session">Instance of <see cref="IDbSession" />.</param>
+        void SetCurrent(string name, IDbSession? session);
+    }
+}

src/Byndyusoft.Data.Relational.Abstractions/ITypeDeserializer.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Byndyusoft.Data.Relational
 {
@@ -13,6 +13,6 @@ public interface ITypeDeserializer<out T>
         /// </summary>
         /// <param name="row">The row represented as <see cref="IDictionary{K,V}">IDictionary{string,object}</see></param>
         /// <returns>The deserialized element.</returns>
-        T Deserialize(IDictionary<string, object>? row);
+        T? Deserialize(IDictionary<string, object>? row);
     }
 }