Skip to content

Commit

Permalink
V4.2.0 (#66)
Browse files Browse the repository at this point in the history 
Changes for linq2db v4.2.0
  • Loading branch information
@nsarris
nsarris authored Sep 22, 2022
1 parent 2bed897 commit 0df4313
Show file tree
Hide file tree
Showing 289 changed files with 8,308 additions and 4,227 deletions.
3 changes: 2 additions & 1 deletion Build/linq2db.Default.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>4.0.1.1</Version>
<Version>4.2.0</Version>

<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>
<Authors>Roy Chase, Nikos Sarris</Authors>
Expand Down Expand Up @@ -47,4 +47,5 @@
<IncludeAssets>build; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
13 changes: 8 additions & 5 deletions Build/linq2db.Providers.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
<Reference Include="IBM.Data.DB2.iSeries">
<HintPath>..\..\Redist\IBM.Data.DB2.iSeries.dll</HintPath>
</Reference>

<PackageReference Include="IBM.Data.DB.Provider" GeneratePathProperty="true" />
<Reference Include="IBM.Data.DB2">
<HintPath>$(PkgIBM_Data_DB_Provider)\build\net451\x64\IBM.Data.DB2.dll</HintPath>
</Reference>
</ItemGroup>

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

<!--<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
Expand Down
63 changes: 35 additions & 28 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
-->
<ItemGroup>
<!--as stated in issue 1 - packages in this item group shouldn't be duplicated in other groups-->
<PackageVersion Include="linq2db" Version="4.0.1" />
<PackageVersion Include="linq2db.Tools" Version="4.0.1" />
<PackageVersion Include="linq2db.AspNet" Version="4.0.1" />
<PackageVersion Include="linq2db.Remote.Grpc" Version="4.0.1" />
<PackageVersion Include="linq2db.Remote.Wcf" Version="4.0.1" />
<PackageVersion Include="linq2db" Version="4.2.0" />
<PackageVersion Include="linq2db.Tools" Version="4.2.0" />
<PackageVersion Include="linq2db.AspNet" Version="4.2.0" />
<PackageVersion Include="linq2db.Remote.Grpc" Version="4.2.0" />
<PackageVersion Include="linq2db.Remote.Wcf" Version="4.2.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
<!--generic packages for source projects-->
<!--generic packages for source projects-->
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
Expand All @@ -26,68 +27,74 @@
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<!--data providers-->
<PackageVersion Include="MySql.Data" Version="8.0.29" />
<PackageVersion Include="MySql.Data" Version="8.0.30" />
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.3" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.0" />
<PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
<PackageVersion Include="System.Data.Odbc" Version="6.0.0" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.6.1" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.7.0" />
<!--3.21 provider currently contains bug which leads to test failures with oracle 12-->
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.140" />
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.61" />-->
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.1" />
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.160" />
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.70" />-->
<PackageVersion Include="Devart.Data.Oracle" Version="10.0.0" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.2" />
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.116" />
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" />
<PackageVersion Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
<PackageVersion Include="IBM.Data.DB2.Core-lnx" Version="3.1.0.500" />
<PackageVersion Include="IBM.Data.DB2.Core-osx" Version="3.1.0.500" />
<PackageVersion Include="Net.IBM.Data.Db2" Version="6.0.0.200" />
<PackageVersion Include="Net.IBM.Data.Db2-lnx" Version="6.0.0.200" />
<PackageVersion Include="Net.IBM.Data.Db2-osx" Version="6.0.0.200" />
<PackageVersion Include="Npgsql" Version="6.0.4" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.5" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
<PackageVersion Include="Npgsql" Version="7.0.0-preview.7" />
<PackageVersion Include="ClickHouse.Client" Version="5.0.4" />
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.8" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.900.6-rc0" />
<!--tests support-->
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.1.8" />
<PackageVersion Include="FSharp.Core" Version="6.0.4" />
<PackageVersion Include="FSharp.Core" Version="6.0.5" />
<!--packages for test projects-->
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="6.0.4" />
<PackageVersion Include="System.Text.Json" Version="6.0.5" />
<PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
<!--don't update due to https://github.com/OData/WebApi/issues/2653-->
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.5.14" />
<!--don't update due to https://github.com/OData/AspNetCoreOData/issues/420#issuecomment-1219208060-->
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="8.0.4" />
<PackageVersion Include="NodaTime" Version="3.1.0" />
<PackageVersion Include="NodaTime" Version="3.1.2" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.2.18" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.2.19" />
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="1.5.0" />
<!--
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="2.5.0" />
-->
<!--remote targets + remote examples targets-->
<!--source-->
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.152" />
<PackageVersion Include="Grpc.Net.Client" Version="2.46.0" />
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.171" />
<PackageVersion Include="Grpc.Net.Client" Version="2.48.0" />
<!--examples-->
<PackageVersion Include="linq2db.t4models" Version="4.0.0-preview.10" />
<!--tests-->
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.0.152" />
</ItemGroup>

<!--linq2db source-->
<!--linq2db source--><!--
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<!--downgrade-->
--><!--downgrade--><!--
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
</ItemGroup>
</ItemGroup>-->

<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<!--<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">-->
<ItemGroup>
<!--main version-->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
Expand All @@ -105,7 +112,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net472' AND '$(TargetFramework)' != 'netcoreapp3.1' ">
<PackageVersion Include="MySqlConnector" Version="2.1.9" />
<PackageVersion Include="MySqlConnector" Version="2.1.13" />
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions Source/ISeriesProvider/DB2iSeriesDataProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,6 @@ public override void SetParameter(DataConnection dataConnection, DbParameter par
}
}

//var parameterName = name.StartsWith(DB2iSeriesSqlBuilder.NamedQueryParameterMarkerPrefix) ? name : DB2iSeriesSqlBuilder.NamedQueryParameterMarkerPrefix + name;

base.SetParameter(dataConnection, parameter, name, dataType, value);
}

Expand Down
2 changes: 1 addition & 1 deletion Source/ISeriesProvider/DB2iSeriesDbTypes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public static DbDataType GetDbDataType(Type systemType, DataType dataType, int?
DataType.UInt64 =>
GetDbDataType(dbTypeInfo, systemType, null, 29, 0, forceDefaultAttributes, supportsNCharTypes),

//When defaults request get a the default Decimal type,
//When defaults requested get the default Decimal type,
//else set defaults to Decimal(60,30) to fit any value
DataType.Decimal =>
forceDefaultAttributes ?
Expand Down
1 change: 1 addition & 0 deletions Source/ISeriesProvider/DB2iSeriesMappingSchema.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

namespace LinqToDB.DataProvider.DB2iSeries
{
using LinqToDB.Common;
using Mapping;
using SqlQuery;
using System.Data.Linq;
Expand Down
Loading

0 comments on commit 0df4313

Please sign in to comment.