Skip to content

Commit ef53315

Browse files
alex-kulakovalex-kulakov
committed
Remove DO_DATEONLY mark
and other minor changes
1 parent c70c497 commit ef53315

96 files changed

Lines changed: 206 additions & 272 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +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 //DO_DATEONLY
17+
#if NET6_0_OR_GREATER
1818
public const string DateFormatString = @"''\'yyyy\.MM\.dd\'''";
1919
public const string TimeFormatString = @"''\'HH\:mm\:ss\.ffff\'''";
2020
#endif

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public override void Visit(SqlBinary node)
176176
case SqlNodeType.DateTimeMinusDateTime:
177177
DateTimeSubtractDateTime(node.Left, node.Right).AcceptVisitor(this);
178178
return;
179-
#if NET6_0_OR_GREATER //DO_DATEONLY
179+
#if NET6_0_OR_GREATER
180180
case SqlNodeType.TimePlusInterval:
181181
TimeAddInterval(node.Left, node.Right).AcceptVisitor(this);
182182
return;
@@ -233,7 +233,7 @@ public override void Visit(SqlFunctionCall node)
233233
arguments[1] - 1),
234234
arguments[2] - 1));
235235
return;
236-
#if NET6_0_OR_GREATER //DO_DATEONLY
236+
#if NET6_0_OR_GREATER
237237
case SqlFunctionType.DateAddYears:
238238
Visit(DateAddYear(arguments[0], arguments[1]));
239239
return;
@@ -308,8 +308,8 @@ protected static SqlExpression DateTimeSubtractDateTime(SqlExpression date1, Sql
308308
(CastToLong(DateDiffMillisecond(DateAddDay(date2, DateDiffDay(date2, date1)), date1)) *
309309
NanosecondsPerMillisecond);
310310
}
311+
#if NET6_0_OR_GREATER
311312

312-
#if NET6_0_OR_GREATER //DO_DATEONLY
313313
protected static SqlExpression TimeSubtractTime(SqlExpression time1, SqlExpression time2)
314314
{
315315
return SqlDml.Modulo(
@@ -368,8 +368,8 @@ protected static SqlUserFunctionCall BitXor(SqlExpression left, SqlExpression ri
368368

369369
protected static SqlUserFunctionCall BitNot(SqlExpression operand) =>
370370
SqlDml.FunctionCall("BIN_NOT", operand);
371+
#if NET6_0_OR_GREATER
371372

372-
#if NET6_0_OR_GREATER //DO_DATEONLY
373373
protected static SqlExpression TimeToDateTime(SqlExpression time) =>
374374
SqlDml.Cast(time, SqlType.DateTime);
375375

@@ -382,15 +382,11 @@ protected static SqlExpression DateToDateTime(SqlExpression date) =>
382382
protected static SqlExpression DateTimeToDate(SqlExpression dateTime) =>
383383
SqlDml.Cast(dateTime, SqlType.Date);
384384

385-
protected static SqlFunctionCall DateToString(SqlExpression date)
386-
{
387-
return SqlDml.Substring(date, 0, 10);;
388-
}
385+
protected static SqlFunctionCall DateToString(SqlExpression date) =>
386+
SqlDml.Substring(date, 0, 10);
389387

390-
protected static SqlConcat TimeToString(SqlExpression time)
391-
{
392-
return SqlDml.Concat(SqlDml.Substring(time, 0, 12), SqlDml.Literal("0000"));
393-
}
388+
protected static SqlConcat TimeToString(SqlExpression time) =>
389+
SqlDml.Concat(SqlDml.Substring(time, 0, 12), SqlDml.Literal("0000"));
394390
#endif
395391

396392
protected static SqlConcat DateTimeToStringIso(SqlExpression dateTime)
@@ -400,7 +396,7 @@ protected static SqlConcat DateTimeToStringIso(SqlExpression dateTime)
400396

401397
return SqlDml.Concat(date, SqlDml.Literal("T"), time);
402398
}
403-
399+
404400
#endregion
405401

406402
protected internal Compiler(SqlDriver driver)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ public override DataTypeCollection GetDataTypesInfo()
237237

238238
dtc.DateTime = DataTypeInfo.Range(SqlType.DateTime, commonFeatures,
239239
ValueRange.DateTime, "timestamp");
240-
241240
#if NET6_0_OR_GREATER
241+
242242
dtc.DateOnly = DataTypeInfo.Range(SqlType.Date, commonFeatures, ValueRange.DateOnly, "date");
243243
dtc.TimeOnly = DataTypeInfo.Range(SqlType.Time, commonFeatures, ValueRange.TimeOnly, "time");
244244
#endif

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

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

24-
#if NET6_0_OR_GREATER //DO_DATEONLY
24+
#if NET6_0_OR_GREATER
2525
public override string DateOnlyFormatString => Constants.DateFormatString;
26+
2627
public override string TimeOnlyFormatString => Constants.TimeFormatString;
2728
#endif
2829

@@ -122,7 +123,7 @@ public override void Translate(IOutput output, SqlNodeType type)
122123
case SqlNodeType.Modulo:
123124
_ = output.Append("MOD"); break;
124125
case SqlNodeType.DateTimeMinusDateTime:
125-
#if NET6_0_OR_GREATER //DO_DATEONLY
126+
#if NET6_0_OR_GREATER
126127
case SqlNodeType.TimeMinusTime:
127128
#endif
128129
_ = output.Append("-"); break;
@@ -223,8 +224,8 @@ public override void Translate(IOutput output, SqlDateTimePart dateTimePart)
223224
default: base.Translate(output, dateTimePart); break;
224225
}
225226
}
226-
227227
#if NET6_0_OR_GREATER //DO_DATEONLY
228+
228229
/// <inheritdoc/>
229230
public override void Translate(IOutput output, SqlDatePart datePart)
230231
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public override void Visit(SqlBinary node)
9494
case SqlNodeType.DateTimeMinusInterval:
9595
DateTimeAddInterval(node.Left, -node.Right).AcceptVisitor(this);
9696
return;
97-
#if NET6_0_OR_GREATER //DO_DATEONLY
97+
#if NET6_0_OR_GREATER
9898
case SqlNodeType.TimePlusInterval:
9999
TimeAddInterval(node.Left, node.Right).AcceptVisitor(this);
100100
return;
@@ -187,7 +187,7 @@ public override void Visit(SqlFunctionCall node)
187187
arguments[1] - 1),
188188
arguments[2] - 1));
189189
return;
190-
#if NET6_0_OR_GREATER //DO_DATEONLY
190+
#if NET6_0_OR_GREATER
191191
case SqlFunctionType.DateAddYears:
192192
Visit(DateAddYear(arguments[0], arguments[1]));
193193
return;
@@ -252,8 +252,8 @@ public override void Visit(SqlFunctionCall node)
252252

253253
base.Visit(node);
254254
}
255+
#if NET6_0_OR_GREATER
255256

256-
#if NET6_0_OR_GREATER //DO_DATEONLY
257257
public override void Visit(SqlPlaceholder node)
258258
{
259259
if (node.Id is Orm.Providers.ParameterBinding qpb
@@ -292,7 +292,7 @@ public override void Visit(SqlExtract node)
292292
Visit(SqlDml.FunctionCall(node.DateTimePart.ToString(), node.Operand));
293293
return;
294294
}
295-
#if NET6_0_OR_GREATER //DO_DATEONLY
295+
#if NET6_0_OR_GREATER
296296
if (node.DatePart == SqlDatePart.DayOfWeek || node.DatePart == SqlDatePart.DayOfYear) {
297297
Visit(SqlDml.FunctionCall(node.DatePart.ToString(), node.Operand));
298298
return;
@@ -315,8 +315,8 @@ protected virtual SqlExpression DateTimeAddInterval(SqlExpression date, SqlExpre
315315
DateTimeAddDay(date, ((interval - (interval % NanosecondsPerDay)) + ((interval % NanosecondsPerDay) > (NanosecondsPerDay / 2) ? 0 : 1)) / NanosecondsPerDay),
316316
(interval / NanosecondsPerMillisecond * NanosecondsPerMicrosecond) % (MillisecondsPerDay * NanosecondsPerMicrosecond));
317317
}
318+
#if NET6_0_OR_GREATER
318319

319-
#if NET6_0_OR_GREATER //DO_DATEONLY
320320
protected virtual SqlExpression TimeSubtractTime(SqlExpression time1, SqlExpression time2) =>
321321
SqlDml.Modulo(
322322
NanosecondsPerDay + CastToDecimal(SqlDml.FunctionCall("TIME_TO_SEC", time1) - SqlDml.FunctionCall("TIME_TO_SEC", time2), 18, 0) * NanosecondsPerSecond,
@@ -363,8 +363,8 @@ protected static SqlUserFunctionCall DateTimeAddHour(SqlExpression datetime, Sql
363363

364364
protected static SqlUserFunctionCall DateTimeAddMicrosecond(SqlExpression datetime, SqlExpression microseconds) =>
365365
SqlDml.FunctionCall("TIMESTAMPADD", SqlDml.Native("MICROSECOND"), microseconds, datetime);
366+
#if NET6_0_OR_GREATER
366367

367-
#if NET6_0_OR_GREATER //DO_DATEONLY
368368
protected static SqlUserFunctionCall DateAddYear(SqlExpression date, SqlExpression years) =>
369369
SqlDml.FunctionCall("DATE_ADD", date, SqlDml.RawConcat(SqlDml.Native("INTERVAL "), SqlDml.RawConcat(years, SqlDml.Native("YEAR"))));
370370

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ 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 //DO_DATEONLY
655+
#if NET6_0_OR_GREATER
656656
if (typeName.Equals("TIME", StringComparison.Ordinal) || typeName.StartsWith("TIME(")) {
657657
return new SqlValueType(SqlType.Time);
658658
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,6 @@ public override DataTypeCollection GetDataTypesInfo()
275275
"datetime", "time");
276276
#endif
277277

278-
279-
280278
types.Char = DataTypeInfo.Stream(SqlType.Char, common | index, 255, "char");
281279
types.VarChar = DataTypeInfo.Stream(SqlType.VarChar, common | index, 4000, "varchar");
282280

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +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 //DO_DATEONLY
25+
#if NET6_0_OR_GREATER
26+
2627
public override string DateOnlyFormatString => @"\'yyyy\-MM\-dd\'";
28+
2729
public override string TimeOnlyFormatString => @"\'HH\:mm\:ss\.ffffff\'";
2830
#endif
2931

@@ -110,7 +112,7 @@ public override void Translate(IOutput output, SqlFunctionType type)
110112
case SqlFunctionType.DateTimeAddYears:
111113
case SqlFunctionType.DateTimeAddMonths:
112114
case SqlFunctionType.DateTimeConstruct:
113-
#if NET6_0_OR_GREATER //DO_DATEONLY
115+
#if NET6_0_OR_GREATER
114116
case SqlFunctionType.DateAddYears:
115117
case SqlFunctionType.DateAddMonths:
116118
case SqlFunctionType.DateAddDays:
@@ -170,14 +172,14 @@ public override void Translate(IOutput output, SqlNodeType type)
170172
switch (type) {
171173
case SqlNodeType.Concat: _ = output.Append(","); break;
172174
case SqlNodeType.DateTimePlusInterval:
173-
#if NET6_0_OR_GREATER //DO_DATEONLY
175+
#if NET6_0_OR_GREATER
174176
case SqlNodeType.TimePlusInterval:
175177
#endif
176178
_ = output.Append("+");
177179
break;
178180
case SqlNodeType.DateTimeMinusInterval:
179181
case SqlNodeType.DateTimeMinusDateTime:
180-
#if NET6_0_OR_GREATER //DO_DATEONLY
182+
#if NET6_0_OR_GREATER
181183
case SqlNodeType.TimeMinusTime:
182184
#endif
183185
_ = output.Append("-"); break;
@@ -527,8 +529,8 @@ public override void Translate(IOutput output, SqlDateTimePart dateTimePart)
527529
default: base.Translate(output, dateTimePart); break;
528530
}
529531
}
532+
#if NET6_0_OR_GREATER
530533

531-
#if NET6_0_OR_GREATER //DO_DATEONLY
532534
/// <inheritdoc/>
533535
public override void Translate(IOutput output, SqlDatePart datePart)
534536
{
@@ -552,7 +554,6 @@ public override void Translate(IOutput output, SqlTimePart dateTimePart)
552554
}
553555
#endif
554556

555-
556557
/// <inheritdoc/>
557558
public override void Translate(IOutput output, SqlLockType lockType)
558559
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Xtensive.Sql.Drivers.MySql.v5_0
1414
{
1515
internal class TypeMapper : Sql.TypeMapper
1616
{
17-
#if NET6_0_OR_GREATER //DO_DATEONLY
17+
#if NET6_0_OR_GREATER
1818
private static readonly Type[] CastRequiredTypes = new[] { typeof(Guid), typeof(TimeSpan), typeof(byte[]), typeof (DateOnly), typeof(TimeOnly) };
1919
#else
2020
private static readonly Type[] CastRequiredTypes = new[] { typeof(Guid), typeof(TimeSpan), typeof(byte[]) };
@@ -66,8 +66,8 @@ public override void BindGuid(DbParameter parameter, object value)
6666
parameter.DbType = DbType.String;
6767
parameter.Value = value==null ? (object) DBNull.Value : SqlHelper.GuidToString((Guid) value);
6868
}
69+
#if NET6_0_OR_GREATER
6970

70-
#if NET6_0_OR_GREATER //DO_DATEONLY
7171
public override void BindDateOnly(DbParameter parameter, object value)
7272
{
7373
parameter.DbType = DbType.Date;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Xtensive.Sql.Drivers.MySql.v5_6
1111
{
1212
internal class Compiler : v5_5.Compiler
1313
{
14-
#if NET6_0_OR_GREATER //DO_DATEONLY
14+
#if NET6_0_OR_GREATER
1515
public override void Visit(SqlBinary node)
1616
{
1717
if (node.NodeType == SqlNodeType.TimePlusInterval) {
@@ -31,14 +31,14 @@ public override void Visit(SqlFunctionCall node)
3131
SqlDml.FunctionCall("TIME",
3232
SqlDml.FunctionCall("ADDTIME",
3333
SqlDml.Cast(arguments[0], SqlType.DateTime),
34-
arguments[1] * 10000))); // 10000 = 1:00:00 :)
34+
arguments[1] * 10000))); // 10000 = 1:00:00
3535
return;
3636
case SqlFunctionType.TimeAddMinutes:
3737
Visit(
3838
SqlDml.FunctionCall("TIME",
3939
SqlDml.FunctionCall("ADDTIME",
4040
SqlDml.Cast(arguments[0], SqlType.DateTime),
41-
arguments[1] * 100))); // 100 = 0:01:00 :)
41+
arguments[1] * 100))); // 100 = 0:01:00
4242
return;
4343
case SqlFunctionType.TimeConstruct: {
4444
Visit(MakeTime(arguments[0], arguments[1], arguments[2], arguments[3]));

0 commit comments

Comments
 (0)