Merge pull request #379 from servicetitan/mergeUpstream

Merge upstream

Author: SergeiPavlov

ChangeLog/7.2.0-Beta-2-dev.txt

@@ -0,0 +1,28 @@
+[main] Upgrade hints change names of constructors' string parameters for better understanding of what suppose to be in them.
+[main] Improved string operations Trim/TrimStart/TrimEnd support
+[main] Obsolete DomainConfiguration.DefauktForeignKeyMode const removed, the correctly named constant still exists
+[main] Obsolete SqlPersistTask constructors removed
+[main] Obsolete AggregateProvider constructor removed
+[main] Obsolete CalculateProvider constructor removed
+[main] Updated BitFaster.Caching to version 2.5.3
+[firebird] Updated client library to version 10.3.2
+[mysql] SqlDml.NullIf function now correctly translated
+[mysql] Improved support for string.PadLeft/PadRight opertaions
+[mysql] Updated client library to version 8.4.0
+[postgresql] Updated client library to version 9.0.3
+[postgresql] Improved .Milliseconds part translation for types that have the part
+[postgresql] Improved TimeSpan.TotalMilliseconds translation
+[postgresql] AppContext switch "Npgsql.EnableLegacyTimestampBehavior" is turned off if user hasn't set it before Domain build
+[postgresql] Both states of "Npgsql.EnableLegacyTimestampBehavior" AppContext switch are supported
+[postgresql] AppContext switch "Npgsql.DisableDateTimeInfinityConversions" is turned on if user hasn't set it before Domain build
+[postgresql] Supported both states of "Npgsql.DisableDateTimeInfinityConversions" AppContext switch, though "true" is recommended
+[postgresql] When infinity conversions are enabled, extra statements will be applied to certain operations to return expected results
+[postgresql] DateTime values '0001.01.01 00:00:00.00000' and '9999.12.31 23:59:59.99999' will be read as MinValue and MaxValue accordingly
+[postgresql] DateTimeOffset values '0001.01.01 00:00:00.00000+00:00' and '9999.12.31 23:59:59.99999+00:00' will be read as MinValue and MaxValue accordingly
+[postgresql] When legacy timestamp behavior is disabled, connection time zone is applied to DateTimeOffset values if possible, otherwise, to local one
+[postgresql] TimeSpans based on values lower than -9223372036854775800L and higher 92233720368547758xxL will be read as MinValue and MaxValue accordingly
+[postgresql] For PostgreSQL 13+ apply 'trim_scale' function to results of aggregation to improve compatibility with .NET decimal
+[oracle] Updated client library to version 23.7.0
+[sqlite] Fixed string.Lenght translation
+[sqlite] Added support for string.PadLeft/PadRight operations
+[sqlserver] Updated client library to version 5.2.2

ChangeLog/7.2.0-Beta-2.txt

@@ -25,16 +25,16 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk"                    Version="17.11.1"      />
     <PackageVersion Include="Microsoft.SourceLink.GitHub"               Version="1.0.0"       />
     <PackageVersion Include="BitFaster.Caching"                         Version="2.5.3"       />
-    <PackageVersion Include="FirebirdSql.Data.FirebirdClient"           Version="8.5.3"       />
+    <PackageVersion Include="FirebirdSql.Data.FirebirdClient"           Version="10.3.2"       />
     <PackageVersion Include="FSharp.Core"                               Version="4.7.0"       />
     <PackageVersion Include="Google.Protobuf"                           Version="3.29.3"      />
-    <PackageVersion Include="log4net"                                   Version="2.0.10"      />
+    <PackageVersion Include="log4net"                                   Version="3.0.3"      />
     <PackageVersion Include="Mono.Cecil"                                Version="0.11.6"      />
-    <PackageVersion Include="MySql.Data"                                Version="8.0.31"      />
-    <PackageVersion Include="NLog"                                      Version="4.5.0"       />
-    <PackageVersion Include="Npgsql"                                    Version="8.0.3"       />
+    <PackageVersion Include="MySql.Data"                                Version="8.4.0"      />
+    <PackageVersion Include="NLog"                                      Version="5.3.4"       />
+    <PackageVersion Include="Npgsql"                                    Version="9.0.3"       />
     <PackageVersion Include="NUnit"                                     Version="3.14.0"      />
     <PackageVersion Include="NUnit3TestAdapter"                         Version="4.5.0"       />
-    <PackageVersion Include="Oracle.ManagedDataAccess.Core"             Version="2.18.151"      />
+    <PackageVersion Include="Oracle.ManagedDataAccess.Core"             Version="23.7.0"      />
   </ItemGroup>
 </Project>

ChangeLog/7.2.0-RC-dev.txt

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2020 Xtensive LLC.
+// Copyright (C) 2008-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Gamzov
@@ -18,15 +18,24 @@ namespace Xtensive.Orm.Providers.PostgreSql
   /// </summary>
   public class DomainHandler : Providers.DomainHandler
   {
+    /// <summary>
+    /// <see langword="true"/> if storage can trim insignificant zeros in numeric values
+    /// </summary>
+    protected bool HasNativeTrimOfInsignificantZerosInDecimals =>
+      Handlers.ProviderInfo.StorageVersion.Major >= 13;
+
     /// <inheritdoc/>
     protected override ICompiler CreateCompiler(CompilerConfiguration configuration) =>
       new SqlCompiler(Handlers, configuration);
 
     /// <inheritdoc/>
     protected override IPreCompiler CreatePreCompiler(CompilerConfiguration configuration)
     {
-      var decimalAggregateCorrector = new AggregateOverDecimalColumnCorrector(Handlers.Domain.Model);
-      return new CompositePreCompiler(decimalAggregateCorrector, base.CreatePreCompiler(configuration));
+      if (!HasNativeTrimOfInsignificantZerosInDecimals) {
+        var decimalAggregateCorrector = new AggregateOverDecimalColumnCorrector(Handlers.Domain.Model);
+        return new CompositePreCompiler(decimalAggregateCorrector, base.CreatePreCompiler(configuration));
+      }
+      return base.CreatePreCompiler(configuration);
     }
 
     /// <inheritdoc/>

Directory.Packages.props

@@ -1,11 +1,12 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
 // Created:    2014.05.06;
 
 using System;
 using Xtensive.Core;
+using Xtensive.Sql;
 using Xtensive.Sql.Dml;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -17,6 +18,15 @@ namespace Xtensive.Orm.Providers.PostgreSql
   /// </summary>
   public class PostgresqlSqlDml
   {
+    /// <summary>
+    /// Creates an expression for native "trim_scale" function call. The function is supported starting from PostgreSQL 13
+    /// </summary>
+    public static SqlExpression DecimalTrimScale(SqlExpression operand)
+    {
+      ArgumentNullException.ThrowIfNull(operand);
+      return SqlDml.FunctionCall("TRIM_SCALE", operand);
+    }
+
     #region Spatial types
 
     /// <summary>

Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/DomainHandler.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021 Xtensive LLC.
+// Copyright (C) 2009-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -21,6 +21,8 @@ internal class SqlCompiler : Providers.SqlCompiler
   {
     private const int MaxDotnetDecimalPrecision = 28;
 
+    private readonly bool canRemoveInsignificantZerosInDecimals;
+
     protected override SqlProvider VisitFreeText(FreeTextProvider provider)
     {
       var rankColumnName = provider.Header.Columns[provider.Header.Columns.Count - 1].Name;
@@ -61,6 +63,11 @@ protected override SqlExpression ProcessAggregate(SqlProvider source, IReadOnlyL
       var aggregateType = aggregateColumn.AggregateType;
       var originCalculateColumn = source.Origin.Header.Columns[aggregateColumn.SourceIndex];
       if (AggregateRequiresDecimalAdjustments(aggregateColumn)) {
+        if (canRemoveInsignificantZerosInDecimals) {
+          return (IsCalculatedColumn(originCalculateColumn))
+            ? PostgresqlSqlDml.DecimalTrimScale(SqlDml.Cast(result, Driver.MapValueType(aggregateColumn.Type)))
+            : PostgresqlSqlDml.DecimalTrimScale(result);
+        }
         if (!IsCalculatedColumn(originCalculateColumn)) {
           // this is aggregate by one column, result will be defined by the precision and scale of the column
           return result;
@@ -138,6 +145,7 @@ AggregateType.Min or
     public SqlCompiler(HandlerAccessor handlers, in CompilerConfiguration configuration)
       : base(handlers, configuration)
     {
+      canRemoveInsignificantZerosInDecimals = handlers.ProviderInfo.StorageVersion.Major >= 13;
     }
   }
 }

Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021 Xtensive LLC.
+// Copyright (C) 2009-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -8,6 +8,7 @@
 using Npgsql;
 using System.Data;
 using System.Data.Common;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Xtensive.Core;
@@ -54,10 +55,9 @@ public override void Commit(bool rollbackOnFail = false)
     {
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
-
       try {
-        if (!IsTransactionCompleted()) {
-          ActiveTransaction.Commit();
+        if(!IsTransactionCompleted()) {
+          activeTransaction.Commit();
         }
         activeTransactionIsCompleted = true;
       }
@@ -66,7 +66,7 @@ public override void Commit(bool rollbackOnFail = false)
         throw;
       }
       finally {
-        ActiveTransaction.Dispose();
+        activeTransaction.Dispose();
         ClearActiveTransaction();
       }
     }
@@ -77,7 +77,7 @@ public override async Task CommitAsync(bool rollbackOnFail = false, Cancellation
       EnsureTransactionIsActive();
       try {
         if (!IsTransactionCompleted()) {
-          await ActiveTransaction.CommitAsync(token).ConfigureAwait(false);
+          await activeTransaction.CommitAsync(token).ConfigureAwait(false);
         }
         activeTransactionIsCompleted = true;
       }
@@ -86,7 +86,7 @@ public override async Task CommitAsync(bool rollbackOnFail = false, Cancellation
         throw;
       }
       finally {
-        await ActiveTransaction.DisposeAsync().ConfigureAwait(false);
+        await activeTransaction.DisposeAsync().ConfigureAwait(false);
         ClearActiveTransaction();
       }
     }
@@ -95,14 +95,13 @@ public override void Rollback()
     {
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
-
       try {
         if (!IsTransactionCompleted()) {
-          ActiveTransaction.Rollback();
+          activeTransaction.Rollback();
         }
       }
       finally {
-        ActiveTransaction.Dispose();
+        activeTransaction.Dispose();
         ClearActiveTransaction();
       }
     }
@@ -113,11 +112,11 @@ public override async Task RollbackAsync(CancellationToken token = default)
       EnsureTransactionIsActive();
       try {
         if (!IsTransactionCompleted()) {
-          await ActiveTransaction.RollbackAsync(token).ConfigureAwait(false);
+          await activeTransaction.RollbackAsync(token).ConfigureAwait(false);
         }
       }
       finally {
-        await ActiveTransaction.DisposeAsync().ConfigureAwait(false);
+        await activeTransaction.DisposeAsync().ConfigureAwait(false);
         ClearActiveTransaction();
       }
     }
@@ -183,7 +182,7 @@ private void ExecuteNonQuery(string commandText)
       EnsureTransactionIsActive();
 
       using var command = CreateCommand(commandText);
-      command.ExecuteNonQuery();
+      _ = command.ExecuteNonQuery();
     }
 
     private async Task ExecuteNonQueryAsync(string commandText, CancellationToken token)
@@ -193,14 +192,11 @@ private async Task ExecuteNonQueryAsync(string commandText, CancellationToken to
 
       var command = CreateCommand(commandText);
       await using (command.ConfigureAwait(false)) {
-        await command.ExecuteNonQueryAsync(token).ConfigureAwait(false);
+        _ = await command.ExecuteNonQueryAsync(token).ConfigureAwait(false);
       }
     }
 
-    private bool IsTransactionCompleted()
-    {
-      return activeTransaction != null && activeTransactionIsCompleted;
-    }
+    private bool IsTransactionCompleted() => activeTransaction.Connection == null;
 
     // Constructors
 

Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs

@@ -13,6 +13,11 @@ namespace Xtensive.Sql.Drivers.PostgreSql
 {
   internal abstract class Driver : SqlDriver
   {
+    /// <summary>
+    /// PosgreSQL-specific information about server.
+    /// </summary>
+    internal PostgreServerInfo PostgreServerInfo { get; }
+
     [SecuritySafeCritical]
     protected override SqlConnection DoCreateConnection()
     {
@@ -95,14 +100,18 @@ private SqlExceptionType ProcessClientSideException(NpgsqlException clientSideEx
           }
         }
       }
+      if (innerException is TimeoutException timeoutException) {
+        return SqlExceptionType.OperationTimeout;
+      }
       return SqlExceptionType.Unknown;
     }
 
     // Constructors
 
-    protected Driver(CoreServerInfo coreServerInfo)
+    protected Driver(CoreServerInfo coreServerInfo, PostgreServerInfo pgServerInfo)
       : base(coreServerInfo)
     {
+      PostgreServerInfo = pgServerInfo;
     }
   }
 }