Skip to content

Commit 99e7484

Browse files
alex-kulakovalex-kulakov
committed
No usage of NET6_0_OR_GREATER compilation variable
1 parent bae1898 commit 99e7484

109 files changed

Lines changed: 22 additions & 586 deletions

File tree

Some content is hidden

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

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/Constants.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ internal static class Constants
1414

1515
// cannot use "FFF" cause it may lead to empty string for fractions part.
1616
public const string DateTimeFormatString = @"''\'yyyy\.MM\.dd HH\:mm\:ss\.fff\'''";
17-
#if NET6_0_OR_GREATER
1817
public const string DateFormatString = @"''\'yyyy\.MM\.dd\'''";
1918
public const string TimeFormatString = @"''\'HH\:mm\:ss\.ffff\'''";
20-
#endif
2119
}
2220
}

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Compiler.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public override void Visit(SqlExtract node)
105105
Visit(CastToLong(node.Operand));
106106
return;
107107
}
108-
#if NET6_0_OR_GREATER
109108
if (((node.IsDatePart && node.DatePart == SqlDatePart.DayOfYear)
110109
|| (node.IsDateTimePart && node.DateTimePart == SqlDateTimePart.DayOfYear))) {
111110
if (!case_SqlDateTimePart_DayOfYear) {
@@ -129,7 +128,6 @@ public override void Visit(SqlExtract node)
129128
}
130129
return;
131130
}
132-
#else
133131
switch (node.DateTimePart) {
134132
case SqlDateTimePart.DayOfYear:
135133
if (!case_SqlDateTimePart_DayOfYear) {
@@ -152,7 +150,6 @@ public override void Visit(SqlExtract node)
152150
}
153151
return;
154152
}
155-
#endif
156153

157154
base.Visit(node);
158155
}
@@ -180,14 +177,12 @@ public override void Visit(SqlBinary node)
180177
case SqlNodeType.DateTimeMinusDateTime:
181178
DateTimeSubtractDateTime(node.Left, node.Right).AcceptVisitor(this);
182179
return;
183-
#if NET6_0_OR_GREATER
184180
case SqlNodeType.TimePlusInterval:
185181
TimeAddInterval(node.Left, node.Right).AcceptVisitor(this);
186182
return;
187183
case SqlNodeType.TimeMinusTime:
188184
TimeSubtractTime(node.Left, node.Right).AcceptVisitor(this);
189185
return;
190-
#endif
191186
case SqlNodeType.Modulo:
192187
Visit(SqlDml.FunctionCall(translator.TranslateToString(SqlNodeType.Modulo), node.Left, node.Right));
193188
return;
@@ -234,7 +229,6 @@ public override void Visit(SqlFunctionCall node)
234229
case SqlFunctionType.DateTimeConstruct:
235230
ConstructDateTime(arguments).AcceptVisitor(this);
236231
return;
237-
#if NET6_0_OR_GREATER
238232
case SqlFunctionType.DateAddYears:
239233
Visit(DateAddYear(arguments[0], arguments[1]));
240234
return;
@@ -277,7 +271,6 @@ public override void Visit(SqlFunctionCall node)
277271
case SqlFunctionType.TimeToDateTime:
278272
TimeToDateTime(arguments[0]).AcceptVisitor(this);
279273
return;
280-
#endif
281274
case SqlFunctionType.DateTimeToStringIso:
282275
Visit(DateTimeToStringIso(arguments[0]));
283276
return;
@@ -306,7 +299,6 @@ protected virtual SqlExpression ConstructDateTime(IReadOnlyList<SqlExpression> a
306299
arguments[1] - 1),
307300
arguments[2] - 1);
308301
}
309-
#if NET6_0_OR_GREATER
310302

311303
protected virtual SqlExpression ConstructDate(IReadOnlyList<SqlExpression> arguments)
312304
{
@@ -361,7 +353,6 @@ protected virtual SqlExpression TimeToNanoseconds(SqlExpression time)
361353

362354
return nPerHour + nPerMinute + nPerSecond + nPerMillisecond;
363355
}
364-
#endif
365356

366357
#region Static helpers
367358

@@ -372,15 +363,13 @@ protected static SqlExpression DateTimeSubtractDateTime(SqlExpression date1, Sql
372363
(CastToLong(DateDiffMillisecond(DateAddDay(date2, DateDiffDay(date2, date1)), date1)) *
373364
NanosecondsPerMillisecond);
374365
}
375-
#if NET6_0_OR_GREATER
376366

377367
protected static SqlExpression TimeSubtractTime(SqlExpression time1, SqlExpression time2)
378368
{
379369
return SqlDml.Modulo(
380370
NanosecondsPerDay + CastToLong(DateDiffMillisecond(time2, time1)) * NanosecondsPerMillisecond,
381371
NanosecondsPerDay);
382372
}
383-
#endif
384373

385374
protected static SqlExpression DateTimeAddInterval(SqlExpression date, SqlExpression interval)
386375
{
@@ -432,7 +421,6 @@ protected static SqlUserFunctionCall BitXor(SqlExpression left, SqlExpression ri
432421

433422
protected static SqlUserFunctionCall BitNot(SqlExpression operand) =>
434423
SqlDml.FunctionCall("BIN_NOT", operand);
435-
#if NET6_0_OR_GREATER
436424

437425
protected static SqlExpression TimeToDateTime(SqlExpression time) =>
438426
SqlDml.Cast(time, SqlType.DateTime);
@@ -451,7 +439,6 @@ protected static SqlFunctionCall DateToString(SqlExpression date) =>
451439

452440
protected static SqlConcat TimeToString(SqlExpression time) =>
453441
SqlDml.Concat(SqlDml.Substring(time, 0, 12), SqlDml.Literal("0000"));
454-
#endif
455442

456443
protected static SqlConcat DateTimeToStringIso(SqlExpression dateTime)
457444
{

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/ServerInfoProvider.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,9 @@ public override DataTypeCollection GetDataTypesInfo()
237237

238238
dtc.DateTime = DataTypeInfo.Range(SqlType.DateTime, commonFeatures,
239239
ValueRange.DateTime, "timestamp");
240-
#if NET6_0_OR_GREATER
241240

242241
dtc.DateOnly = DataTypeInfo.Range(SqlType.Date, commonFeatures, ValueRange.DateOnly, "date");
243242
dtc.TimeOnly = DataTypeInfo.Range(SqlType.Time, commonFeatures, ValueRange.TimeOnly, "time");
244-
#endif
245243

246244
dtc.Char = DataTypeInfo.Stream(SqlType.Char, commonFeatures, MaxCharLength, "char");
247245
dtc.VarChar = DataTypeInfo.Stream(SqlType.VarChar, commonFeatures, MaxCharLength, "varchar");

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Translator.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ internal class Translator : SqlTranslator
2121
{
2222
public override string DateTimeFormatString => Constants.DateTimeFormatString;
2323

24-
#if NET6_0_OR_GREATER
2524
public override string DateOnlyFormatString => Constants.DateFormatString;
2625

2726
public override string TimeOnlyFormatString => Constants.TimeFormatString;
28-
#endif
2927

3028
public override string TimeSpanFormatString => string.Empty;
3129

@@ -123,9 +121,7 @@ public override void Translate(IOutput output, SqlNodeType type)
123121
case SqlNodeType.Modulo:
124122
_ = output.Append("MOD"); break;
125123
case SqlNodeType.DateTimeMinusDateTime:
126-
#if NET6_0_OR_GREATER
127124
case SqlNodeType.TimeMinusTime:
128-
#endif
129125
_ = output.Append("-"); break;
130126
case SqlNodeType.Except:
131127
case SqlNodeType.Intersect:
@@ -224,7 +220,6 @@ public override void Translate(IOutput output, SqlDateTimePart dateTimePart)
224220
default: base.Translate(output, dateTimePart); break;
225221
}
226222
}
227-
#if NET6_0_OR_GREATER //DO_DATEONLY
228223

229224
/// <inheritdoc/>
230225
public override void Translate(IOutput output, SqlDatePart datePart)
@@ -235,7 +230,6 @@ public override void Translate(IOutput output, SqlDatePart datePart)
235230
default: base.Translate(output, datePart); break;
236231
}
237232
}
238-
#endif
239233

240234
/// <inheritdoc/>
241235
public override void Translate(SqlCompilerContext context, SqlSelect node, SelectSection section)

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Compiler.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,12 @@ public override void Visit(SqlBinary node)
9696
case SqlNodeType.DateTimeMinusInterval:
9797
DateTimeAddInterval(node.Left, -node.Right).AcceptVisitor(this);
9898
return;
99-
#if NET6_0_OR_GREATER
10099
case SqlNodeType.TimePlusInterval:
101100
TimeAddInterval(node.Left, node.Right).AcceptVisitor(this);
102101
return;
103102
case SqlNodeType.TimeMinusTime:
104103
TimeSubtractTime(node.Left, node.Right).AcceptVisitor(this);
105104
return;
106-
#endif
107105
default:
108106
base.Visit(node);
109107
return;
@@ -186,7 +184,6 @@ public override void Visit(SqlFunctionCall node)
186184
case SqlFunctionType.DateTimeConstruct:
187185
ConstructDateTime(arguments).AcceptVisitor(this);
188186
return;
189-
#if NET6_0_OR_GREATER
190187
case SqlFunctionType.DateAddYears:
191188
Visit(DateAddYear(arguments[0], arguments[1]));
192189
return;
@@ -236,15 +233,13 @@ public override void Visit(SqlFunctionCall node)
236233
case SqlFunctionType.TimeToDateTime:
237234
TimeToDateTime(node.Arguments[0]).AcceptVisitor(this);
238235
return;
239-
#endif
240236
case SqlFunctionType.DateTimeToStringIso:
241237
Visit(DateTimeToStringIso(arguments[0]));
242238
return;
243239
}
244240

245241
base.Visit(node);
246242
}
247-
#if NET6_0_OR_GREATER
248243

249244
public override void Visit(SqlPlaceholder node)
250245
{
@@ -258,7 +253,6 @@ public override void Visit(SqlPlaceholder node)
258253
base.Visit(node);
259254
}
260255
}
261-
#endif
262256

263257
/// <inheritdoc/>
264258
protected override void VisitSelectLimitOffset(SqlSelect node)
@@ -284,12 +278,10 @@ public override void Visit(SqlExtract node)
284278
Visit(SqlDml.FunctionCall(node.DateTimePart.ToString(), node.Operand));
285279
return;
286280
}
287-
#if NET6_0_OR_GREATER
288281
if (node.DatePart == SqlDatePart.DayOfWeek || node.DatePart == SqlDatePart.DayOfYear) {
289282
Visit(SqlDml.FunctionCall(node.DatePart.ToString(), node.Operand));
290283
return;
291284
}
292-
#endif
293285

294286
base.Visit(node);
295287
}
@@ -318,7 +310,6 @@ protected virtual SqlExpression DateTimeAddInterval(SqlExpression date, SqlExpre
318310
DateTimeAddDay(date, ((interval - (interval % NanosecondsPerDay)) + ((interval % NanosecondsPerDay) > (NanosecondsPerDay / 2) ? 0 : 1)) / NanosecondsPerDay),
319311
(interval / NanosecondsPerMillisecond * NanosecondsPerMicrosecond) % (MillisecondsPerDay * NanosecondsPerMicrosecond));
320312
}
321-
#if NET6_0_OR_GREATER
322313

323314
protected virtual SqlExpression ConstructDate(IReadOnlyList<SqlExpression> arguments)
324315
{
@@ -355,7 +346,6 @@ protected virtual SqlExpression TimeAddInterval(SqlExpression time, SqlExpressio
355346
SqlDml.RawConcat(SqlDml.Native("INTERVAL "),
356347
SqlDml.FunctionCall("TIME_TO_SEC", time) + interval / NanosecondsPerSecond),
357348
SqlDml.Native("SECOND"))));
358-
#endif
359349

360350
#region Static helpers
361351

@@ -387,7 +377,6 @@ protected static SqlUserFunctionCall DateTimeAddHour(SqlExpression datetime, Sql
387377

388378
protected static SqlUserFunctionCall DateTimeAddMicrosecond(SqlExpression datetime, SqlExpression microseconds) =>
389379
SqlDml.FunctionCall("TIMESTAMPADD", SqlDml.Native("MICROSECOND"), microseconds, datetime);
390-
#if NET6_0_OR_GREATER
391380

392381
protected static SqlUserFunctionCall DateAddYear(SqlExpression date, SqlExpression years) =>
393382
SqlDml.FunctionCall("DATE_ADD", date, SqlDml.RawConcat(SqlDml.Native("INTERVAL "), SqlDml.RawConcat(years, SqlDml.Native("YEAR"))));
@@ -436,7 +425,6 @@ private static SqlExpression TimeToDateTime(SqlExpression time) =>
436425
SqlDml.RawConcat(SqlDml.Native("INTERVAL "),
437426
SqlDml.FunctionCall("TIME_TO_SEC", time)),
438427
SqlDml.Native("SECOND")));
439-
#endif
440428

441429
protected static SqlUserFunctionCall DateTimeToStringIso(SqlExpression dateTime) =>
442430
SqlDml.FunctionCall("DATE_FORMAT", dateTime, "%Y-%m-%dT%T");

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Extractor.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,20 +652,17 @@ private SqlValueType CreateValueType(IDataRecord row,
652652
// although they can be read as "scale" and "precision"
653653
return new SqlValueType(SqlType.Int64);
654654
}
655-
#if NET6_0_OR_GREATER
656655
if (typeName.Equals("TIME", StringComparison.Ordinal) || typeName.StartsWith("TIME(")) {
657656
return new SqlValueType(SqlType.Time);
658657
}
659658
else if (typeName.StartsWith("TIME", StringComparison.Ordinal)) {
660659
// "timestamp precision" is saved as "scale", ignoring too
661660
return new SqlValueType(SqlType.DateTime);
662661
}
663-
#else
664662
if (typeName.StartsWith("TIME", StringComparison.Ordinal)) {
665663
// "timestamp precision" is saved as "scale", ignoring too
666664
return new SqlValueType(SqlType.DateTime);
667665
}
668-
#endif
669666
if (typeName.StartsWith("YEAR", StringComparison.Ordinal)) {
670667
// "timestamp precision" is saved as "scale", ignoring too
671668
return new SqlValueType(SqlType.Decimal, 4, 0);

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/ServiceInfoProvider.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,19 +261,13 @@ public override DataTypeCollection GetDataTypesInfo()
261261
types.Double = DataTypeInfo.Range(SqlType.Double, common | index,
262262
ValueRange.Double, "double precision");
263263

264-
#if NET6_0_OR_GREATER
265264
types.DateTime = DataTypeInfo.Range(SqlType.DateTime, common | index,
266265
new ValueRange<DateTime>(new DateTime(1000, 1, 1), new DateTime(9999, 12, 31)),
267266
"datetime");
268267
types.DateOnly = DataTypeInfo.Range(SqlType.Date, common | index,
269268
new ValueRange<DateOnly>(new DateOnly(1000, 1, 1), new DateOnly(9999, 12, 31)),
270269
"date");
271270
types.TimeOnly = DataTypeInfo.Range(SqlType.Time, common | index, ValueRange.TimeOnly, "time");
272-
#else
273-
types.DateTime = DataTypeInfo.Range(SqlType.DateTime, common | index,
274-
new ValueRange<DateTime>(new DateTime(1000, 1, 1), new DateTime(9999, 12, 31)),
275-
"datetime", "time");
276-
#endif
277271

278272
types.Char = DataTypeInfo.Stream(SqlType.Char, common | index, 255, "char");
279273
types.VarChar = DataTypeInfo.Stream(SqlType.VarChar, common | index, 4000, "varchar");

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Translator.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ namespace Xtensive.Sql.Drivers.MySql.v5_0
2222
internal class Translator : SqlTranslator
2323
{
2424
public override string DateTimeFormatString => @"\'yyyy\-MM\-dd HH\:mm\:ss\.ffffff\'";
25-
#if NET6_0_OR_GREATER
2625

2726
public override string DateOnlyFormatString => @"\'yyyy\-MM\-dd\'";
2827

2928
public override string TimeOnlyFormatString => @"\'HH\:mm\:ss\.ffffff\'";
30-
#endif
3129

3230
public override string TimeSpanFormatString => string.Empty;
3331

@@ -112,13 +110,11 @@ public override void Translate(IOutput output, SqlFunctionType type)
112110
case SqlFunctionType.DateTimeAddYears:
113111
case SqlFunctionType.DateTimeAddMonths:
114112
case SqlFunctionType.DateTimeConstruct:
115-
#if NET6_0_OR_GREATER
116113
case SqlFunctionType.DateAddYears:
117114
case SqlFunctionType.DateAddMonths:
118115
case SqlFunctionType.DateAddDays:
119116
case SqlFunctionType.DateConstruct:
120117
case SqlFunctionType.TimeConstruct:
121-
#endif
122118
case SqlFunctionType.IntervalToMilliseconds:
123119
return;
124120
//string
@@ -172,16 +168,12 @@ public override void Translate(IOutput output, SqlNodeType type)
172168
switch (type) {
173169
case SqlNodeType.Concat: _ = output.Append(","); break;
174170
case SqlNodeType.DateTimePlusInterval:
175-
#if NET6_0_OR_GREATER
176171
case SqlNodeType.TimePlusInterval:
177-
#endif
178172
_ = output.Append("+");
179173
break;
180174
case SqlNodeType.DateTimeMinusInterval:
181175
case SqlNodeType.DateTimeMinusDateTime:
182-
#if NET6_0_OR_GREATER
183176
case SqlNodeType.TimeMinusTime:
184-
#endif
185177
_ = output.Append("-"); break;
186178
case SqlNodeType.Equals: _ = output.Append("="); break;
187179
case SqlNodeType.NotEquals: _ = output.Append("<>"); break;
@@ -529,7 +521,6 @@ public override void Translate(IOutput output, SqlDateTimePart dateTimePart)
529521
default: base.Translate(output, dateTimePart); break;
530522
}
531523
}
532-
#if NET6_0_OR_GREATER
533524

534525
/// <inheritdoc/>
535526
public override void Translate(IOutput output, SqlDatePart datePart)
@@ -552,7 +543,6 @@ public override void Translate(IOutput output, SqlTimePart dateTimePart)
552543
default: base.Translate(output, dateTimePart); break;
553544
}
554545
}
555-
#endif
556546

557547
/// <inheritdoc/>
558548
public override void Translate(IOutput output, SqlLockType lockType)

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/TypeMapper.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ namespace Xtensive.Sql.Drivers.MySql.v5_0
1414
{
1515
internal class TypeMapper : Sql.TypeMapper
1616
{
17-
#if NET6_0_OR_GREATER
1817
private static readonly Type[] CastRequiredTypes = new[] { typeof(Guid), typeof(TimeSpan), typeof(byte[]), typeof (DateOnly), typeof(TimeOnly) };
19-
#else
20-
private static readonly Type[] CastRequiredTypes = new[] { typeof(Guid), typeof(TimeSpan), typeof(byte[]) };
21-
#endif
2218

2319
/// <inheritdoc/>
2420
public override bool IsParameterCastRequired(Type type)
@@ -66,7 +62,6 @@ public override void BindGuid(DbParameter parameter, object value)
6662
parameter.DbType = DbType.String;
6763
parameter.Value = value==null ? (object) DBNull.Value : SqlHelper.GuidToString((Guid) value);
6864
}
69-
#if NET6_0_OR_GREATER
7065

7166
public override void BindDateOnly(DbParameter parameter, object value)
7267
{
@@ -79,7 +74,6 @@ public override void BindTimeOnly(DbParameter parameter, object value)
7974
parameter.DbType = DbType.Time;
8075
parameter.Value = value ?? DBNull.Value;
8176
}
82-
#endif
8377

8478
/// <inheritdoc/>
8579
public override SqlValueType MapByte(int? length, int? precision, int? scale)

0 commit comments

Comments
 (0)