-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from I-RzR-I/fix/Fix-CVE-2024-32655
Upgrade libs version (cve fix)
- Loading branch information
Showing
11 changed files
with
226 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| ### **1.0.1.8361** | ||
| ### **v1.0.2.6703** | ||
| -> Update lib version for 'Npgsql', with `CVE-2024-32655` fix;<br /> | ||
| -> Update some libs version related to previous update;<br /> | ||
|
|
||
| ### **v1.0.1.8361** | ||
| -> Change property mapper (map by property/column name);<br /> | ||
| -> Add EF DbContextExtension (that load neccessary information);<br /> | ||
| -> Add tests for simple select query and adjust mapper.<br /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/tests/DbObjectExecutorWithDINet6Test/DbObjectExecutorWithDINet6Test.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" /> | ||
| <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" /> | ||
| <PackageReference Include="MSTest.TestFramework" Version="2.2.10" /> | ||
| <PackageReference Include="coverlet.collector" Version="3.2.0" /> | ||
| <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.23.0" /> | ||
| <PackageReference Include="System.Data.SqlClient" Version="4.8.6" /> | ||
| <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\DbObjectExecutor.Imp.EntityFramework\DbObjectExecutor.Imp.EntityFramework.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="..\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems" Label="Shared" /> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // *********************************************************************** | ||
| // Assembly : RzR.Shared.Entity.DbObjectExecutorWithDITest | ||
| // Author : RzR | ||
| // Created On : 2024-04-01 22:08 | ||
| // | ||
| // Last Modified By : RzR | ||
| // Last Modified On : 2024-04-01 22:08 | ||
| // *********************************************************************** | ||
| // <copyright file="InitInfo.cs" company=""> | ||
| // Copyright (c) RzR. All rights reserved. | ||
| // </copyright> | ||
| // | ||
| // <summary> | ||
| // </summary> | ||
| // *********************************************************************** | ||
|
|
||
| using DbObjectExecutor; | ||
| using DbObjectExecutor.Abstractions; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
|
|
||
| namespace DbObjectExecutorWithDINet6Test | ||
| { | ||
| [TestClass] | ||
| public class InitInfo | ||
| { | ||
| protected IDbObjectBuilder _dbObjectBuilder; | ||
|
|
||
| [TestInitialize] | ||
| public void Init() | ||
| { | ||
| var sp = new ServiceCollection(); | ||
| sp.RegisterDbObjectBuilder(); | ||
|
|
||
| var serviceProvider = sp.BuildServiceProvider(); | ||
| _dbObjectBuilder = serviceProvider.GetRequiredService<IDbObjectBuilder>(); | ||
| } | ||
| } | ||
| } |
73 changes: 73 additions & 0 deletions
73
src/tests/DbObjectExecutorWithDINet6Test/Tests/SpGetRecordPagedTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| #region U S A G E S | ||
|
|
||
| using DbObjectExecutor.Enums; | ||
| using DbObjectExecutor.Mapper.Extensions.DbDataReader; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using SharedDbObjectExecutorInitInfo.DataBaseTool; | ||
| using SharedDbObjectExecutorInitInfo.Models; | ||
| using System.Collections.Generic; | ||
| using System.Data.SqlClient; | ||
|
|
||
| #endregion | ||
|
|
||
| namespace DbObjectExecutorWithDINet6Test.Tests | ||
| { | ||
| [TestClass] | ||
| public class SpGetRecordPagedTests : InitInfo | ||
| { | ||
| [TestMethod] | ||
| public void SpGetRecordPaged_ManuallyReader_Success_Test() | ||
| { | ||
| var result = new List<SpGetRecordPagedDto>(); | ||
| var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql); | ||
|
|
||
| _dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spGetRecordPaged, objConn, DbExecutorType.Procedure); | ||
| _dbObjectBuilder.SetIn("Skip", "0"); | ||
| _dbObjectBuilder.SetIn("Take", "5"); | ||
| _dbObjectBuilder.SetIn("OrderBy", "Name"); | ||
| _dbObjectBuilder.SetIn("Where", ""); | ||
| _dbObjectBuilder.SetOut("RowsCount", out var outNextId, 0); | ||
|
|
||
| _dbObjectBuilder.Execute(reader => | ||
| { | ||
| if (reader.HasRows) | ||
| while (reader.Read()) | ||
| result.Add(new SpGetRecordPagedDto | ||
| { | ||
| Id = int.Parse(reader["Id"].ToString() ?? "-1"), | ||
| Code = reader["Code"].ToString(), | ||
| Name = reader["Name"].ToString(), | ||
| IsActive = reader["IsActive"].ToString() == "1" | ||
| }); | ||
| }); | ||
|
|
||
| _dbObjectBuilder.Dispose(); | ||
|
|
||
| Assert.IsNotNull(outNextId.Value); | ||
| Assert.IsTrue(outNextId.Value > 0); | ||
| Assert.IsTrue(result.Count == 5); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void SpGetRecordPaged_ManuallyReader_Success_Test_1() | ||
| { | ||
| var result = new List<SpGetRecordPagedDto>(); | ||
| var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql); | ||
|
|
||
| _dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spGetRecordPaged, objConn, DbExecutorType.Procedure); | ||
| _dbObjectBuilder.SetIn("Skip", "0"); | ||
| _dbObjectBuilder.SetIn("Take", "5"); | ||
| _dbObjectBuilder.SetIn("OrderBy", "Name"); | ||
| _dbObjectBuilder.SetIn("Where", ""); | ||
| _dbObjectBuilder.SetOut("RowsCount", out var outNextId, 0); | ||
|
|
||
| _dbObjectBuilder.Execute(reader => result = reader.ToList<SpGetRecordPagedDto>()); | ||
|
|
||
| _dbObjectBuilder.Dispose(); | ||
|
|
||
| Assert.IsNotNull(outNextId.Value); | ||
| Assert.IsTrue(outNextId.Value > 0); | ||
| Assert.IsTrue(result.Count == 5); | ||
| } | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
src/tests/DbObjectExecutorWithDINet6Test/Tests/SpNewTableIdTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using DbObjectExecutor.Enums; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using SharedDbObjectExecutorInitInfo.DataBaseTool; | ||
| using System.Data.SqlClient; | ||
|
|
||
| namespace DbObjectExecutorWithDINet6Test.Tests | ||
| { | ||
| [TestClass] | ||
| public class SpNewTableIdTests : InitInfo | ||
| { | ||
| [TestMethod] | ||
| public void SpNewTableId_Own_Transaction_Success_Test() | ||
| { | ||
| var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql); | ||
|
|
||
| _dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spNewTableId, objConn, DbExecutorType.Procedure).UseTransaction(); | ||
| _dbObjectBuilder.SetIn("TableName", "TblX"); | ||
| _dbObjectBuilder.SetOut("NextId", out var outNextId, -1); | ||
|
|
||
| _dbObjectBuilder.ExecuteNonQuery(); | ||
|
|
||
| _dbObjectBuilder.CommitTransaction() | ||
| .Dispose(); | ||
|
|
||
| Assert.IsNotNull(outNextId.Value); | ||
| Assert.IsTrue(outNextId.Value > -1); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void SpNewTableId_Separate_Transaction_Success_Test() | ||
| { | ||
| var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql); | ||
| objConn.Open(); | ||
| var trans = objConn.BeginTransaction(); | ||
|
|
||
| _dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spNewTableId, objConn, DbExecutorType.Procedure).UseTransaction(trans); | ||
| _dbObjectBuilder.SetIn("TableName", "TblX"); | ||
| _dbObjectBuilder.SetOut("NextId", out var outNextId, 0); | ||
|
|
||
| _dbObjectBuilder.ExecuteNonQuery(); | ||
|
|
||
| _dbObjectBuilder.CommitTransaction() | ||
| .Dispose(); | ||
|
|
||
| Assert.IsNotNull(outNextId.Value); | ||
| Assert.IsTrue(outNextId.Value > -1); | ||
| } | ||
| } | ||
| } |