Merge pull request #412 from servicetitan/mergeUpstream

Merge upstream

Author: SergeiPavlov

.github/workflows/reusable-storage-dependant-tests.yml

@@ -16,7 +16,7 @@ on:
       target_framework:
         description: 'Target framework'
         required: true
-        default: 'net6.0'
+        default: 'net8.0'
         type: string
       specific_sha:
         description: 'Commit SHA to checkout'
@@ -158,14 +158,6 @@ jobs:
         run: |
           docker stop $(docker ps -a -q)
 
-      - name: Temp log output
-        if: |
-          !cancelled()
-        run: |
-          echo "github event name: ${{ github.event_name }}"
-          echo "reproc step outcome: ${{ steps.reprocessing.outcome }}"
-          echo "complex step outcome: ${{ steps.complex_tests.outcome }}"
-
       - name: Publish raw test results as files
         if: |
           (!cancelled() && inputs.publish_raw_results) || failure()

.github/workflows/reusable-storage-independant-tests.yml

@@ -11,7 +11,7 @@ on:
       target_framework:
         description: 'Target framework'
         required: true
-        default: 'net6.0'
+        default: 'net8.0'
         type: string
       test_output_verbosity:
         description: 'Verbosity for dotnet test command'
@@ -123,10 +123,9 @@ jobs:
 
       - name: Make Final Test report
         if: |
-          (github.event_name == 'push' && steps.complex_tests.outcome != 'cancelled')
-            || (github.event_name == 'pull_request' &&  steps.complex_tests.outcome != 'cancelled')
-            || (github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
-            || steps.complex_tests.outcome == 'failure'
+          !cancelled() 
+            && ((github.event_name == 'push') || (github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch')
+              || (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure'))
         timeout-minutes: 1
         uses: dorny/[email protected]
         with:

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs

@@ -23,6 +23,8 @@ public class DriverFactory : SqlDriverFactory
   {
     private const string DatabaseAndSchemaQuery = "select current_database(), current_schema()";
 
+    private readonly static Guid InstanceIdentifier;
+
     private readonly static bool InfinityAliasForDatesEnabled;
     private readonly static bool LegacyTimestamptBehaviorEnabled;
 
@@ -225,8 +227,10 @@ private static bool GetSwitchValueOrSet(string switchName, bool valueToSet)
 
     static DriverFactory()
     {
-      // Starging from Npgsql 6.0 they broke compatibility by forcefully replacing
-      // DateTime.MinValue/MaxValue of parameters with -Infinity and Infinity values.
+      InstanceIdentifier = Guid.NewGuid();
+
+      // Starting from Npgsql 6.0 they broke compatibility by forcefully replacing
+      // DateTime.MinValue/MaxValue in parameters with -Infinity and Infinity values.
       // This new "feature", though doesn't affect reading/writing of values and equality/inequality
       // filters, breaks some of operations such as parts extraction, default values for columns
       // (which are constants and declared on high levels of abstraction) and some others.

Orm/Xtensive.Orm.Tests.Sql/PostgreSql/InfinityAliasTest.cs

@@ -29,6 +29,8 @@ public sealed class InfinityAliasTest : SqlTest
     private TypeMapping dateTimeTypeMapping;
     private TypeMapping dateTimeOffsetTypeMapping;
 
+    private TimeSpan localTimezone;
+
     protected override void CheckRequirements()
     {
       Require.ProviderIs(StorageProvider.PostgreSql);
@@ -39,6 +41,7 @@ protected override void TestFixtureSetUp()
       base.TestFixtureSetUp();
 
       var localZone = DateTimeOffset.Now.ToLocalTime().Offset;
+      localTimezone = localZone;
       var localZoneString = ((localZone < TimeSpan.Zero) ? "-" : "+") + localZone.ToString(@"hh\:mm");
       var initConnectionCommand = Connection.CreateCommand($"SET TIME ZONE INTERVAL '{localZoneString}' HOUR TO MINUTE");
       _ = initConnectionCommand.ExecuteNonQuery();
@@ -466,10 +469,14 @@ private void TestMinDateTimeOffsetSelectDatePart(bool isOn)
         DateTimeOffset.MinValue.Day,
         isOn);
 
-      // timezone for DateTimeOffset.MinValue value in postgre is set to 04:02:33, at least when instance is in UTC+5 timezone
+      var serverSideHours = (localTimezone > TimeSpan.Zero)
+        ? localTimezone.Hours  // positive zone
+        : (localTimezone < TimeSpan.Zero)
+          ? 23 + localTimezone.Hours // negative zone
+          : localTimezone.Hours; // UTC
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMinValueTable, SqlDateTimeOffsetPart.Hour,
-        5,
-        isOn ? DateTimeOffset.MinValue.Hour : 5,
+        serverSideHours,
+        serverSideHours,
         isOn);
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMinValueTable, SqlDateTimeOffsetPart.Minute,
         DateTimeOffset.MinValue.Minute,
@@ -546,27 +553,39 @@ public void DateTimeOffsetMaxSelectDatePartDateTest()
 
     private void TestMaxDateTimeOffsetSelectDatePart(bool isOn)
     {
+      var overflowHappens = localTimezone > TimeSpan.Zero;
+
       // There is overflow of year because of PostgreSQL time zone functionality
+      var overflowYearValue = overflowHappens ? 1 : 0;
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMaxValueTable, SqlDateTimeOffsetPart.Year,
-        DateTimeOffset.MaxValue.Year + 1,
-        (isOn) ? DateTimeOffset.MaxValue.Year : DateTimeOffset.MaxValue.Year + 1,
+        DateTimeOffset.MaxValue.Year + overflowYearValue,
+        DateTimeOffset.MaxValue.Year + overflowYearValue,
         isOn);
 
       // there is value overflow to 01 in case of no aliases
+      var serverSideMonths = (localTimezone > TimeSpan.Zero) ? 1 : 12;
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMaxValueTable, SqlDateTimeOffsetPart.Month,
-        1,
-        (isOn) ? DateTimeOffset.MaxValue.Month : 1,
+        serverSideMonths,
+        serverSideMonths,
         isOn);
+
       // there is value overflow to 01 in case of no aliases
+      var serverSideDays = (localTimezone > TimeSpan.Zero) ? 1 : 31;
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMaxValueTable, SqlDateTimeOffsetPart.Day,
-        1,
-        (isOn) ? DateTimeOffset.MaxValue.Day : 1,
+        serverSideDays,
+        serverSideDays,
         isOn);
 
       // timezone for DateTimeOffset.MaxValue value in postgre is set to 04:59:59.999999, at least when instance is in UTC+5 timezone
+      var serverSideHours = (localTimezone > TimeSpan.Zero)
+        ? localTimezone.Hours - 1  // positive zone
+        : (localTimezone < TimeSpan.Zero)
+          ? 23 + localTimezone.Hours // negative zone
+          : 23; // UTC
+
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMaxValueTable, SqlDateTimeOffsetPart.Hour,
-        4,
-        (isOn) ? DateTimeOffset.MaxValue.Hour : 4,
+        serverSideHours,
+        serverSideHours,
         isOn);
       TestDateTimeOffsetPartExtraction(DateTimeOffsetMaxValueTable, SqlDateTimeOffsetPart.Minute,
         DateTimeOffset.MaxValue.Minute,
@@ -587,22 +606,26 @@ private void TestDatePartExtraction(string table, SqlDatePart part, int expected
       using (var reader = command.ExecuteReader()) {
 
         while (reader.Read()) {
-          if (aliasesEnabled && part != SqlDatePart.Year) {
-            // year from +-infinity -> +-infinity
+          if (aliasesEnabled) {
+            // +-infinify
+            // year from +-infinity -> +-infinity (or 0 in case of versions older than 9.6)
             // month from +-infinity -> null (or 0 in case of versions older that 9.6)
             if (Driver.CoreServerInfo.ServerVersion >= StorageProviderVersion.PostgreSql96) {
-              Assert.That(reader.IsDBNull(0));
+              if (part != SqlDatePart.Year) {
+                Assert.That(reader.IsDBNull(0));
+              }
+              else {
+                var partValue = reader.GetDouble(0);
+                Assert.That(double.IsInfinity(partValue), Is.True);
+              }
             }
             else {
               var partValue = reader.GetDouble(0);
               Assert.That(partValue, Is.Zero);
             }
           }
-          if (Driver.CoreServerInfo.ServerVersion < StorageProviderVersion.PostgreSql96) {
-            var partValue = reader.GetDouble(0);
-            Assert.That(partValue, Is.Zero);
-          }
           else {
+            // pure dates
             var partValue = reader.GetDouble(0);
             CheckPartNative(partValue, expectedValueNative, aliasesEnabled);
           }
@@ -632,21 +655,26 @@ private void TestDateTimePartExtraction(string table, SqlDateTimePart part, int
       using (var reader = command.ExecuteReader()) {
 
         while (reader.Read()) {
-          if (aliasesEnabled && part != SqlDateTimePart.Year) {
-            // year from +-infinity -> +-infinity
+          if (aliasesEnabled) {
+            // +-infinify
+            // year from +-infinity -> +-infinity (or 0 in case of versions older than 9.6)
             // month from +-infinity -> null (or 0 in case of versions older that 9.6)
-            if (Driver.CoreServerInfo.ServerVersion >= StorageProviderVersion.PostgreSql96)
-              Assert.That(reader.IsDBNull(0));
+            if (Driver.CoreServerInfo.ServerVersion >= StorageProviderVersion.PostgreSql96) {
+              if (part != SqlDateTimePart.Year) {
+                Assert.That(reader.IsDBNull(0));
+              }
+              else {
+                var partValue = reader.GetDouble(0);
+                Assert.That(double.IsInfinity(partValue), Is.True);
+              }
+            }
             else {
               var partValue = reader.GetDouble(0);
               Assert.That(partValue, Is.Zero);
             }
           }
-          if (Driver.CoreServerInfo.ServerVersion < StorageProviderVersion.PostgreSql96) {
-            var partValue = reader.GetDouble(0);
-            Assert.That(partValue, Is.Zero);
-          }
           else {
+            // pure dates
             var partValue = reader.GetDouble(0);
             CheckPartNative(partValue, expectedValueNative, aliasesEnabled);
           }
@@ -676,21 +704,26 @@ private void TestDateTimeOffsetPartExtraction(string table, SqlDateTimeOffsetPar
       using (var reader = command.ExecuteReader()) {
 
         while (reader.Read()) {
-          if (aliasesEnabled && part != SqlDateTimeOffsetPart.Year) {
-            // year from +-infinity -> +-infinity
+          if (aliasesEnabled) {
+            // +-infinify
+            // year from +-infinity -> +-infinity (or 0 in case of versions older than 9.6)
             // month from +-infinity -> null (or 0 in case of versions older that 9.6)
-            if (Driver.CoreServerInfo.ServerVersion >= StorageProviderVersion.PostgreSql96 )
-              Assert.That(reader.IsDBNull(0));
+            if (Driver.CoreServerInfo.ServerVersion >= StorageProviderVersion.PostgreSql96) {
+              if (part != SqlDateTimeOffsetPart.Year) {
+                Assert.That(reader.IsDBNull(0));
+              }
+              else {
+                var partValue = reader.GetDouble(0);
+                Assert.That(double.IsInfinity(partValue), Is.True);
+              }
+            }
             else {
               var partValue = reader.GetDouble(0);
               Assert.That(partValue, Is.Zero);
             }
           }
-          if (Driver.CoreServerInfo.ServerVersion < StorageProviderVersion.PostgreSql96) {
-            var partValue = reader.GetDouble(0);
-            Assert.That(partValue, Is.Zero);
-          }
           else {
+            // pure dates
             var partValue = reader.GetDouble(0);
             CheckPartNative(partValue, expectedValueNative, aliasesEnabled);
           }