Skip to content

Commit d35c60c

Browse files
pmoskpmosk
authored
Merge pull request #48 from GarageGroup/feature/use-sql-dialects
Feature/use sql dialects
2 parents 7bd47d0 + 2455a1f commit d35c60c

48 files changed

Lines changed: 214 additions & 135 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dotnet.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ jobs:
3232
-p ${{ secrets.GG_NUGET_SOURCE_USER_PASSWORD }}
3333
--store-password-in-clear-text
3434
35+
# Api.Core.SqlDialect
36+
37+
- name: Restore Api.Core.SqlDialect
38+
run: dotnet restore ./src/*/*/SqlDialect.csproj
39+
40+
- name: Build Api.Core.SqlDialect
41+
run: dotnet build ./src/*/*/SqlDialect.csproj --no-restore -c Release
42+
43+
- name: Pack Api.Core.SqlDialect
44+
run: dotnet pack ./src/*/*/SqlDialect.csproj --no-restore -o ~/nuget -c Release
45+
3546
# Api.Core.DbEntity
3647

3748
- name: Restore Api.Core.DbEntity

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Nullable>enable</Nullable>
77
<InvariantGlobalization>true</InvariantGlobalization>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9-
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
9+
<NoWarn>$(NoWarn);IDE0130;CA1859;xUnit1044</NoWarn>
1010
</PropertyGroup>
1111

1212
</Project>

‎src/Infra.SqlApi.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "api\Api\Api.csproj",
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.Abstractions", "api-abstractions\Provider.Abstractions\Provider.Abstractions.csproj", "{BA79F60A-3473-40A1-846D-707CB5AF96DA}"
3535
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlDialect", "api-core\SqlDialect\SqlDialect.csproj", "{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6}"
37+
EndProject
3638
Global
3739
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3840
Debug|Any CPU = Debug|Any CPU
@@ -87,6 +89,10 @@ Global
8789
{BA79F60A-3473-40A1-846D-707CB5AF96DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
8890
{BA79F60A-3473-40A1-846D-707CB5AF96DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
8991
{BA79F60A-3473-40A1-846D-707CB5AF96DA}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
95+
{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6}.Release|Any CPU.Build.0 = Release|Any CPU
9096
EndGlobalSection
9197
GlobalSection(SolutionProperties) = preSolution
9298
HideSolutionNode = FALSE
@@ -104,6 +110,7 @@ Global
104110
{A41B8ECF-8AE0-4C25-BF3A-30A63453C6F5} = {5E4F5B1C-D629-4D34-B81A-65F7951AE426}
105111
{B0B8E4C3-C17A-4D6A-90D0-52657FDF0115} = {5E4F5B1C-D629-4D34-B81A-65F7951AE426}
106112
{BA79F60A-3473-40A1-846D-707CB5AF96DA} = {6106F9AD-BAA7-4F24-AD96-17D27BFC486D}
113+
{50AA8E70-0E6F-484D-A09A-BF4AE280CEC6} = {53EEC557-BEA5-4E2C-8F1A-F96404E2FDA1}
107114
EndGlobalSection
108115
GlobalSection(ExtensibilityGlobals) = postSolution
109116
SolutionGuid = {EBFE5C85-563F-4917-95A1-4501407AD8D8}

‎src/api-abstractions/Abstractions.ExecuteNonQuery/Abstractions.ExecuteNonQuery.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>GarageGroup.Infra</RootNamespace>
66
<AssemblyName>GarageGroup.Infra.Sql.Api.Abstractions.ExecuteNonQuery</AssemblyName>
7-
<Version>2.3.0</Version>
7+
<Version>3.0.0</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="2.2.0" />
11+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="3.0.0" />
1212
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
1313
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
1414
</ItemGroup>

‎src/api-abstractions/Abstractions.QueryEntity/Abstractions.QueryEntity.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>GarageGroup.Infra</RootNamespace>
66
<AssemblyName>GarageGroup.Infra.Sql.Api.Abstractions.QueryEntity</AssemblyName>
7-
<Version>2.3.0</Version>
7+
<Version>3.0.0</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbEntity" Version="2.0.1" />
12-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="2.2.0" />
11+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbEntity" Version="3.0.0" />
12+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="3.0.0" />
1313
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
1414
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
1515
</ItemGroup>

‎src/api-abstractions/Abstractions.QueryEntitySet/Abstractions.QueryEntitySet.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>GarageGroup.Infra</RootNamespace>
66
<AssemblyName>GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet</AssemblyName>
7-
<Version>2.3.0</Version>
7+
<Version>3.0.0</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbEntity" Version="2.0.1" />
12-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="2.2.0" />
11+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbEntity" Version="3.0.0" />
12+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbQuery" Version="3.0.0" />
1313
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
1414
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
1515
</ItemGroup>

‎src/api-abstractions/Abstractions/Abstractions.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>GarageGroup.Infra</RootNamespace>
66
<AssemblyName>GarageGroup.Infra.Sql.Api.Abstractions</AssemblyName>
7-
<Version>2.4.0</Version>
7+
<Version>3.0.0</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="GarageGroup.Infra.HealthCheck.Api.Contract.Ping" Version="0.0.1" />
12-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.ExecuteNonQuery" Version="2.3.0" />
13-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntity" Version="2.3.0" />
14-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.3.0" />
12+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.ExecuteNonQuery" Version="3.0.0" />
13+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntity" Version="3.0.0" />
14+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="3.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/api-abstractions/Provider.Abstractions/IDbProvider.T.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace GarageGroup.Infra;
66

7-
public interface IDbProvider<TDbConnection>
7+
public interface IDbProvider<TDbConnection> : ISqlDialectProvider
88
where TDbConnection : DbConnection
99
{
1010
TDbConnection GetDbConnection();

‎src/api-abstractions/Provider.Abstractions/ISqlDialectProvider.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace GarageGroup.Infra;
2+
3+
public interface ISqlDialectProvider
4+
{
5+
SqlDialect Dialect { get; }
6+
}

‎src/api-abstractions/Provider.Abstractions/Provider.Abstractions.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>GarageGroup.Infra</RootNamespace>
66
<AssemblyName>GarageGroup.Infra.Sql.Api.Provider.Abstractions</AssemblyName>
7-
<Version>2.2.0</Version>
7+
<Version>3.0.0</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbParameter" Version="2.0.1" />
11+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbParameter" Version="3.0.0" />
12+
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.SqlDialect" Version="1.0.0" />
1213
</ItemGroup>
1314

1415
</Project>

0 commit comments

Comments
 (0)