Skip to content

Commit 1a0b7f2

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #304 from servicetitan/upstream/UpgradeSqlClient
Upgrade to SqlClient 5.1.0 with DateOnly/TimeOnly support
2 parents 0732719 + 0c90eed commit 1a0b7f2

File tree

10 files changed

+39
-19
lines changed

10 files changed

+39
-19
lines changed

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
15-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
15+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

‎Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1717
</ItemGroup>
1818
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<None Include="Readme.txt" />

‎Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1818
</ItemGroup>
1919
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1717
</ItemGroup>
1818
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
2020
</ItemGroup>
2121
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
22-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
22+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/TypeMapper.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,26 @@ public override void BindString(DbParameter parameter, object value)
8080
: NVarCharMaxLength;
8181
}
8282

83+
#if NET6_0_OR_GREATER
84+
public override void BindDateOnly(DbParameter parameter, object value)
85+
{
86+
parameter.DbType = DbType.Date;
87+
parameter.Value = value != null ? (DateOnly) value : DBNull.Value;
88+
}
89+
90+
public override void BindTimeOnly(DbParameter parameter, object value)
91+
{
92+
parameter.DbType = DbType.Time;
93+
parameter.Value = value != null ? (TimeOnly) value : DBNull.Value;
94+
}
95+
96+
public override object ReadDateOnly(DbDataReader reader, int index) =>
97+
reader.GetFieldValue<DateOnly>(index);
98+
99+
public override object ReadTimeOnly(DbDataReader reader, int index) =>
100+
reader.GetFieldValue<TimeOnly>(index);
101+
#endif
102+
83103
public override SqlValueType MapSByte(int? length, int? precision, int? scale)
84104
{
85105
return new SqlValueType(SqlType.Int16);

‎Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<WarningLevel>2</WarningLevel>
1717
</PropertyGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0" />
19+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
1717
</ItemGroup>
1818
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->

‎Orm/Xtensive.Orm/Sql/ValueTypeMapping/TypeMapper.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public virtual void BindBoolean(DbParameter parameter, object value)
4646
public virtual void BindChar(DbParameter parameter, object value)
4747
{
4848
parameter.DbType = DbType.String;
49-
if (value==null) {
49+
if (value == null) {
5050
parameter.Value = DBNull.Value;
5151
return;
5252
}
5353
var _char = (char) value;
54-
parameter.Value = _char==default(char) ? string.Empty : _char.ToString();
54+
parameter.Value = _char == default(char) ? string.Empty : _char.ToString();
5555
}
5656

5757
public virtual void BindString(DbParameter parameter, object value)
@@ -155,7 +155,7 @@ public virtual void BindDateTimeOffset(DbParameter parameter, object value)
155155
public virtual void BindTimeSpan(DbParameter parameter, object value)
156156
{
157157
parameter.DbType = DbType.Int64;
158-
if (value!=null) {
158+
if (value != null) {
159159
var timeSpan = ValueRangeValidator.Correct((TimeSpan) value, Int64TimeSpanRange);
160160
parameter.Value = timeSpan.Ticks * 100;
161161
}
@@ -226,7 +226,7 @@ public virtual object ReadDateTime(DbDataReader reader, int index) =>
226226
#if NET6_0_OR_GREATER
227227

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

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

312312
public virtual SqlValueType MapDecimal(int? length, int? precision, int? scale)
313313
{
314-
if (MaxDecimalPrecision==null)
314+
if (MaxDecimalPrecision == null)
315315
return new SqlValueType(SqlType.Decimal);
316-
if (precision==null) {
316+
if (precision == null) {
317317
var resultPrecision = Math.Min(DecimalPrecisionLimit, MaxDecimalPrecision.Value);
318318
var resultScale = resultPrecision / 2;
319319
return new SqlValueType(SqlType.Decimal, resultPrecision, resultScale);
@@ -352,9 +352,9 @@ public virtual SqlValueType MapByteArray(int? length, int? precision, int? scale
352352

353353
protected static SqlValueType ChooseStreamType(SqlType varType, SqlType varMaxType, int? length, int? varTypeMaxLength)
354354
{
355-
if (varTypeMaxLength==null)
355+
if (varTypeMaxLength == null)
356356
return new SqlValueType(varMaxType);
357-
if (length==null)
357+
if (length == null)
358358
return new SqlValueType(varType, varTypeMaxLength.Value);
359359
if (length.Value > varTypeMaxLength.Value)
360360
return new SqlValueType(varMaxType);
@@ -367,13 +367,13 @@ protected static SqlValueType ChooseStreamType(SqlType varType, SqlType varMaxTy
367367
public virtual void Initialize()
368368
{
369369
var varchar = Driver.ServerInfo.DataTypes.VarChar;
370-
if (varchar!=null)
370+
if (varchar != null)
371371
VarCharMaxLength = varchar.MaxLength;
372372
var varbinary = Driver.ServerInfo.DataTypes.VarBinary;
373-
if (varbinary!=null)
373+
if (varbinary != null)
374374
VarBinaryMaxLength = varbinary.MaxLength;
375375
var _decimal = Driver.ServerInfo.DataTypes.Decimal;
376-
if (_decimal!=null)
376+
if (_decimal != null)
377377
MaxDecimalPrecision = _decimal.MaxPrecision;
378378
}
379379

‎Orm/Xtensive.Orm/Xtensive.Orm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
5151
</ItemGroup>
5252
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
53-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
53+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
5454
</ItemGroup>
5555
<ItemGroup Label="Packages">
5656
<PackageReference Include="BitFaster.Caching" Version="2.0.0" />

0 commit comments

Comments
 (0)