Skip to content

Commit 0df4313

Browse files
nsarrisnsarris
authored
V4.2.0 (#66)
Changes for linq2db v4.2.0
1 parent 2bed897 commit 0df4313

File tree

289 files changed

+8308
-4227
lines changed

Some content is hidden

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

289 files changed

+8308
-4227
lines changed

‎Build/linq2db.Default.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<Version>4.0.1.1</Version>
3+
<Version>4.2.0</Version>
44

55
<Description>LINQ to DB is a data access technology that provides a run-time infrastructure for managing relational data as objects. This package is a provider for DB2 on the IBM iSeries.</Description>
66
<Authors>Roy Chase, Nikos Sarris</Authors>
@@ -47,4 +47,5 @@
4747
<IncludeAssets>build; analyzers</IncludeAssets>
4848
</PackageReference>
4949
</ItemGroup>
50+
5051
</Project>

‎Build/linq2db.Providers.props‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
<Reference Include="IBM.Data.DB2.iSeries">
4747
<HintPath>..\..\Redist\IBM.Data.DB2.iSeries.dll</HintPath>
4848
</Reference>
49-
50-
<PackageReference Include="IBM.Data.DB.Provider" GeneratePathProperty="true" />
51-
<Reference Include="IBM.Data.DB2">
52-
<HintPath>$(PkgIBM_Data_DB_Provider)\build\net451\x64\IBM.Data.DB2.dll</HintPath>
53-
</Reference>
5449
</ItemGroup>
5550

5651
<!--some magic to not include x64 reference to IBM.Data.DB2.Core in x86 builds, as it fails x86 tests-->
@@ -74,6 +69,14 @@
7469
<PackageReference Include="Net.IBM.Data.Db2-osx" Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' "/>
7570
</ItemGroup>
7671
</When>
72+
<When Condition="$(X86) != ''">
73+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
74+
<PackageReference Include="IBM.Data.DB.Provider" GeneratePathProperty="true" />
75+
<Reference Include="IBM.Data.DB2">
76+
<HintPath>$(PkgIBM_Data_DB_Provider)\build\net451\x64\IBM.Data.DB2.dll</HintPath>
77+
</Reference>
78+
</ItemGroup>
79+
</When>
7780
</Choose>
7881

7982
<!--<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">

‎Directory.Packages.props‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
-->
88
<ItemGroup>
99
<!--as stated in issue 1 - packages in this item group shouldn't be duplicated in other groups-->
10-
<PackageVersion Include="linq2db" Version="4.0.1" />
11-
<PackageVersion Include="linq2db.Tools" Version="4.0.1" />
12-
<PackageVersion Include="linq2db.AspNet" Version="4.0.1" />
13-
<PackageVersion Include="linq2db.Remote.Grpc" Version="4.0.1" />
14-
<PackageVersion Include="linq2db.Remote.Wcf" Version="4.0.1" />
10+
<PackageVersion Include="linq2db" Version="4.2.0" />
11+
<PackageVersion Include="linq2db.Tools" Version="4.2.0" />
12+
<PackageVersion Include="linq2db.AspNet" Version="4.2.0" />
13+
<PackageVersion Include="linq2db.Remote.Grpc" Version="4.2.0" />
14+
<PackageVersion Include="linq2db.Remote.Wcf" Version="4.2.0" />
1515
<PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
1616
<!--generic packages for source projects-->
17+
<!--generic packages for source projects-->
1718
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
1819
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1920
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
@@ -26,68 +27,74 @@
2627
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
2728
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
2829
<!--data providers-->
29-
<PackageVersion Include="MySql.Data" Version="8.0.29" />
30+
<PackageVersion Include="MySql.Data" Version="8.0.30" />
3031
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
3132
<PackageVersion Include="System.Data.SqlClient" Version="4.8.3" />
32-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="4.1.0" />
33+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.0" />
3334
<PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
3435
<PackageVersion Include="System.Data.Odbc" Version="6.0.0" />
35-
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.6.1" />
36+
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.7.0" />
3637
<!--3.21 provider currently contains bug which leads to test failures with oracle 12-->
37-
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.140" />
38-
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.61" />-->
39-
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.1" />
40-
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.115.5" />
38+
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.160" />
39+
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.70" />-->
40+
<PackageVersion Include="Devart.Data.Oracle" Version="10.0.0" />
41+
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.2" />
42+
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.116" />
4143
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" />
4244
<PackageVersion Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
4345
<PackageVersion Include="IBM.Data.DB2.Core-lnx" Version="3.1.0.500" />
4446
<PackageVersion Include="IBM.Data.DB2.Core-osx" Version="3.1.0.500" />
4547
<PackageVersion Include="Net.IBM.Data.Db2" Version="6.0.0.200" />
4648
<PackageVersion Include="Net.IBM.Data.Db2-lnx" Version="6.0.0.200" />
4749
<PackageVersion Include="Net.IBM.Data.Db2-osx" Version="6.0.0.200" />
48-
<PackageVersion Include="Npgsql" Version="6.0.4" />
49-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.5" />
50-
<PackageVersion Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
50+
<PackageVersion Include="Npgsql" Version="7.0.0-preview.7" />
51+
<PackageVersion Include="ClickHouse.Client" Version="5.0.4" />
52+
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
53+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.8" />
54+
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.900.6-rc0" />
5155
<!--tests support-->
5256
<PackageVersion Include="NUnit" Version="3.13.3" />
5357
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
54-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
58+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
5559
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
56-
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
60+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
5761
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.1.8" />
58-
<PackageVersion Include="FSharp.Core" Version="6.0.4" />
62+
<PackageVersion Include="FSharp.Core" Version="6.0.5" />
5963
<!--packages for test projects-->
6064
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
61-
<PackageVersion Include="System.Text.Json" Version="6.0.4" />
65+
<PackageVersion Include="System.Text.Json" Version="6.0.5" />
6266
<PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
67+
<!--don't update due to https://github.com/OData/WebApi/issues/2653-->
6368
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.5.14" />
69+
<!--don't update due to https://github.com/OData/AspNetCoreOData/issues/420#issuecomment-1219208060-->
6470
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="8.0.4" />
65-
<PackageVersion Include="NodaTime" Version="3.1.0" />
71+
<PackageVersion Include="NodaTime" Version="3.1.2" />
6672
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
67-
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.2.18" />
73+
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.2.19" />
6874
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="1.5.0" />
6975
<!--
7076
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="2.5.0" />
7177
-->
7278
<!--remote targets + remote examples targets-->
7379
<!--source-->
74-
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.152" />
75-
<PackageVersion Include="Grpc.Net.Client" Version="2.46.0" />
80+
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.171" />
81+
<PackageVersion Include="Grpc.Net.Client" Version="2.48.0" />
7682
<!--examples-->
7783
<PackageVersion Include="linq2db.t4models" Version="4.0.0-preview.10" />
7884
<!--tests-->
7985
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
8086
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.0.152" />
8187
</ItemGroup>
8288

83-
<!--linq2db source-->
89+
<!--linq2db source--><!--
8490
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
85-
<!--downgrade-->
91+
--><!--downgrade--><!--
8692
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
8793
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
88-
</ItemGroup>
94+
</ItemGroup>-->
8995

90-
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
96+
<!--<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">-->
97+
<ItemGroup>
9198
<!--main version-->
9299
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
93100
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
@@ -105,7 +112,7 @@
105112
</ItemGroup>
106113

107114
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' AND '$(TargetFramework)' != 'netcoreapp3.1' ">
108-
<PackageVersion Include="MySqlConnector" Version="2.1.9" />
115+
<PackageVersion Include="MySqlConnector" Version="2.1.13" />
109116
</ItemGroup>
110117

111118
</Project>

‎Source/ISeriesProvider/DB2iSeriesDataProvider.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,6 @@ public override void SetParameter(DataConnection dataConnection, DbParameter par
472472
}
473473
}
474474

475-
//var parameterName = name.StartsWith(DB2iSeriesSqlBuilder.NamedQueryParameterMarkerPrefix) ? name : DB2iSeriesSqlBuilder.NamedQueryParameterMarkerPrefix + name;
476-
477475
base.SetParameter(dataConnection, parameter, name, dataType, value);
478476
}
479477

‎Source/ISeriesProvider/DB2iSeriesDbTypes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public static DbDataType GetDbDataType(Type systemType, DataType dataType, int?
225225
DataType.UInt64 =>
226226
GetDbDataType(dbTypeInfo, systemType, null, 29, 0, forceDefaultAttributes, supportsNCharTypes),
227227

228-
//When defaults request get a the default Decimal type,
228+
//When defaults requested get the default Decimal type,
229229
//else set defaults to Decimal(60,30) to fit any value
230230
DataType.Decimal =>
231231
forceDefaultAttributes ?

‎Source/ISeriesProvider/DB2iSeriesMappingSchema.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace LinqToDB.DataProvider.DB2iSeries
55
{
6+
using LinqToDB.Common;
67
using Mapping;
78
using SqlQuery;
89
using System.Data.Linq;

0 commit comments

Comments
 (0)