Fix merge problems

Author: alex-kulakov

Extensions/Xtensive.Orm.BulkOperations/Internals/SetOperation.cs

@@ -134,9 +134,9 @@ private void AddComputedStaticExpression(AddValueContext addContext)
 
       var request = parent.GetRequest(parent.QueryProvider.CreateQuery<T>(selectExpression));
       var sqlSelect = request.Query;
-      SqlExpression ex = sqlSelect.OrderBy[0].Expression;
-      if (ex is SqlCast sqlCast) {
-        ex = sqlCast.Operand;
+      SqlExpression exp = sqlSelect.OrderBy[0].Expression;
+      if (exp is SqlCast sqlCast) {
+        exp = sqlCast.Operand;
       }
       if (exp is not SqlPlaceholder placeholder) {
         parent.Bindings.AddRange(request.ParameterBindings);

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_6/ServerInfoProvider.cs

@@ -20,8 +20,6 @@ public override DataTypeCollection GetDataTypesInfo()
         DataTypeFeatures.Grouping | DataTypeFeatures.Ordering | DataTypeFeatures.Multiple;
 
       var index = DataTypeFeatures.Indexing | DataTypeFeatures.KeyConstraint;
-
-#if NET6_0_OR_GREATER
       types.DateTime = DataTypeInfo.Range(SqlType.DateTime, common | index,
         new ValueRange<DateTime>(new DateTime(1000, 1, 1), new DateTime(9999, 12, 31)),
         "datetime(6)");
@@ -31,11 +29,7 @@ public override DataTypeCollection GetDataTypesInfo()
         "date");
 
       types.TimeOnly = DataTypeInfo.Range(SqlType.Time, common | index, ValueRange.TimeOnly, "time(6)");
-#else
-      types.DateTime = DataTypeInfo.Range(SqlType.DateTime, common | index,
-         new ValueRange<DateTime>(new DateTime(1000, 1, 1), new DateTime(9999, 12, 31)),
-         "datetime(6)", "time(6)");
-#endif
+
       return types;
     }
 

Orm/Xtensive.Orm.Tests.Sql/DateTimeIntervalTest.cs

@@ -21,7 +21,6 @@ public abstract class DateTimeIntervalTest : SqlTest
       StorageProviderInfo.Instance.CheckProviderIs(StorageProvider.Firebird)
         ? new DateTime(2000, 12, 11, 10, 9, 8)
         : new DateTime(2000, 12, 11, 10, 9, 8, 765);
-#if NET6_0_OR_GREATER
 
     protected static readonly DateOnly DefaultDateOnly = new DateOnly(2001, 2, 3);
     protected static readonly DateOnly SecondDateOnly = new DateOnly(2000, 12, 11);
@@ -378,7 +377,6 @@ private SqlExpression PrepareDateTimeLiteral(DateTime value)
       }
       return SqlDml.Literal(value);
     }
-#if NET6_0_OR_GREATER
 
     private SqlExpression PrepareDateLiteral(DateOnly value)
     {
@@ -395,6 +393,5 @@ private SqlExpression PrepareTimeLiteral(TimeOnly value)
       }
       return SqlDml.Literal(value);
     }
-#endif
   }
 }

Orm/Xtensive.Orm.Tests/Linq/DateTimeAndDateTimeOffset/DateTime/OperationsTest.cs

@@ -80,6 +80,8 @@ public void AddMonthsTest()
         RunWrongTest<SingleDateTimeEntity>(s, c => c.DateTime.AddMonths(1) == FirstDateTime.AddMonths(2));
         RunWrongTest<SingleDateTimeEntity>(s, c => c.MillisecondDateTime.AddMonths(-1) == FirstMillisecondDateTime.AddMonths(-2));
         RunWrongTest<SingleDateTimeEntity>(s, c => c.NullableDateTime.Value.AddMonths(33) == NullableDateTime.AddMonths(44));
+      });
+    }
 
     [Test]
     public void MinMaxValueAddMonthsTest()

Orm/Xtensive.Orm.Tests/Model/HierarchyRootValidationTest.cs

@@ -264,7 +264,6 @@ public void InvalidNonPersistentKeyTypesForDefaultGeneratorTest()
         Assert.That(ex.Message.Contains(UnableToCreateKeyForMsg));
       }
 
-#if NET6_0_OR_GREATER
       configuration = CreateDomainConfiguration(new[] { typeof(Models.NonPersistentStorageSupporedTypesAsKeys.TimeOnlyKeyEntity) });
       Assert.DoesNotThrow(() => domain = Domain.Build(configuration));
       Assert.That(domain, Is.Not.Null);
@@ -300,7 +299,6 @@ public void InvalidNonPersistentKeyTypesForDefaultGeneratorTest()
         });
         Assert.That(ex.Message.Contains(UnableToCreateKeyForMsg));
       }
-#endif
 
       configuration = CreateDomainConfiguration(new[] { typeof(Models.NonPersistentStorageSupporedTypesAsKeys.DateTimeKeyEntity) });
       Assert.DoesNotThrow(() => domain = Domain.Build(configuration));
@@ -1627,8 +1625,6 @@ public TimeSpanKeyEntity(Session session)
       }
     }
 
-#if NET6_0_OR_GREATER
-
     [HierarchyRoot]
     public class TimeOnlyKeyEntity : Entity
     {
@@ -1661,8 +1657,6 @@ public DateOnlyKeyEntity(Session session)
       }
     }
 
-#endif
-
     [HierarchyRoot]
     public class DateTimeKeyEntity : Entity
     {

Orm/Xtensive.Orm/Core/Internals/ValueStringBuilder.cs

@@ -149,12 +149,7 @@ public void Append(string? s)
         if (origPos > chars.Length - s.Length) {
           Grow(s.Length);
         }
-
-#if NET6_0_OR_GREATER
         s.CopyTo(chars.Slice(origPos));
-#else
-      s.AsSpan().CopyTo(chars.Slice(origPos));
-#endif
         position += s.Length;
       }
     }