Skip to content

Upgrade to SqlClient 5.1.0 with DateOnly/TimeOnly support #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-kulakov merged 4 commits into from
Mar 7, 2023
Merged

Upgrade to SqlClient 5.1.0 with DateOnly/TimeOnly support #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a6ff05
Upgrade to SqlClient 5.1.0 with DateOnly/TimeOnly support
SergeiPavlov Feb 27, 2023
272c622
Merge branch 'master-date-and-time-support' into upstream/UpgradeSqlC…
SergeiPavlov Mar 7, 2023
921490a
Override Bind/Read in SqlServer's TypeMapper only
SergeiPavlov Mar 7, 2023
0c90eed
Fix formatting
SergeiPavlov Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Extensions/TestCommon/TestCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<None Include="Readme.txt" />
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
Expand Down
20 changes: 20 additions & 0 deletions Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/TypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,26 @@ public override void BindString(DbParameter parameter, object value)
: NVarCharMaxLength;
}

#if NET6_0_OR_GREATER
public override void BindDateOnly(DbParameter parameter, object value)
{
parameter.DbType = DbType.Date;
parameter.Value = value != null ? (DateOnly) value : DBNull.Value;
}

public override void BindTimeOnly(DbParameter parameter, object value)
{
parameter.DbType = DbType.Time;
parameter.Value = value != null ? (TimeOnly) value : DBNull.Value;
}

public override object ReadDateOnly(DbDataReader reader, int index) =>
reader.GetFieldValue<DateOnly>(index);

public override object ReadTimeOnly(DbDataReader reader, int index) =>
reader.GetFieldValue<TimeOnly>(index);
#endif

public override SqlValueType MapSByte(int? length, int? precision, int? scale)
{
return new SqlValueType(SqlType.Int16);
Expand Down
2 changes: 1 addition & 1 deletion Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<WarningLevel>2</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->
Expand Down
22 changes: 11 additions & 11 deletions Orm/Xtensive.Orm/Sql/ValueTypeMapping/TypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public virtual void BindBoolean(DbParameter parameter, object value)
public virtual void BindChar(DbParameter parameter, object value)
{
parameter.DbType = DbType.String;
if (value==null) {
if (value == null) {
parameter.Value = DBNull.Value;
return;
}
var _char = (char) value;
parameter.Value = _char==default(char) ? string.Empty : _char.ToString();
parameter.Value = _char == default(char) ? string.Empty : _char.ToString();
}

public virtual void BindString(DbParameter parameter, object value)
Expand Down Expand Up @@ -155,7 +155,7 @@ public virtual void BindDateTimeOffset(DbParameter parameter, object value)
public virtual void BindTimeSpan(DbParameter parameter, object value)
{
parameter.DbType = DbType.Int64;
if (value!=null) {
if (value != null) {
var timeSpan = ValueRangeValidator.Correct((TimeSpan) value, Int64TimeSpanRange);
parameter.Value = timeSpan.Ticks * 100;
}
Expand Down Expand Up @@ -226,7 +226,7 @@ public virtual object ReadDateTime(DbDataReader reader, int index) =>
#if NET6_0_OR_GREATER

public virtual object ReadDateOnly(DbDataReader reader, int index) =>
DateOnly.FromDateTime(reader.GetFieldValue<DateTime>(index));
DateOnly.FromDateTime(reader.GetFieldValue<DateTime>(index));

public virtual object ReadTimeOnly(DbDataReader reader, int index) =>
TimeOnly.FromTimeSpan(reader.GetFieldValue<TimeSpan>(index));
Expand Down Expand Up @@ -311,9 +311,9 @@ public virtual SqlValueType MapDouble(int? length, int? precision, int? scale) =

public virtual SqlValueType MapDecimal(int? length, int? precision, int? scale)
{
if (MaxDecimalPrecision==null)
if (MaxDecimalPrecision == null)
return new SqlValueType(SqlType.Decimal);
if (precision==null) {
if (precision == null) {
var resultPrecision = Math.Min(DecimalPrecisionLimit, MaxDecimalPrecision.Value);
var resultScale = resultPrecision / 2;
return new SqlValueType(SqlType.Decimal, resultPrecision, resultScale);
Expand Down Expand Up @@ -352,9 +352,9 @@ public virtual SqlValueType MapByteArray(int? length, int? precision, int? scale

protected static SqlValueType ChooseStreamType(SqlType varType, SqlType varMaxType, int? length, int? varTypeMaxLength)
{
if (varTypeMaxLength==null)
if (varTypeMaxLength == null)
return new SqlValueType(varMaxType);
if (length==null)
if (length == null)
return new SqlValueType(varType, varTypeMaxLength.Value);
if (length.Value > varTypeMaxLength.Value)
return new SqlValueType(varMaxType);
Expand All @@ -367,13 +367,13 @@ protected static SqlValueType ChooseStreamType(SqlType varType, SqlType varMaxTy
public virtual void Initialize()
{
var varchar = Driver.ServerInfo.DataTypes.VarChar;
if (varchar!=null)
if (varchar != null)
VarCharMaxLength = varchar.MaxLength;
var varbinary = Driver.ServerInfo.DataTypes.VarBinary;
if (varbinary!=null)
if (varbinary != null)
VarBinaryMaxLength = varbinary.MaxLength;
var _decimal = Driver.ServerInfo.DataTypes.Decimal;
if (_decimal!=null)
if (_decimal != null)
MaxDecimalPrecision = _decimal.MaxPrecision;
}

Expand Down
2 changes: 1 addition & 1 deletion Orm/Xtensive.Orm/Xtensive.Orm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Label="Packages">
<PackageReference Include="BitFaster.Caching" Version="2.0.0" />
Expand Down