NpgsqlBox: If the corners are confused, swap them. (#5161)

SoftStoneDevelop · web-flow · commit 10a6678173ab · 2023-10-17T12:42:06.000+02:00
Closes #5113
diff --git a/src/Npgsql/NpgsqlTypes/NpgsqlTypes.cs b/src/Npgsql/NpgsqlTypes/NpgsqlTypes.cs
@@ -128,8 +128,62 @@ public override bool Equals(object? obj)
 /// </remarks>
 public struct NpgsqlBox : IEquatable<NpgsqlBox>
 {
-    public NpgsqlPoint UpperRight { get; set; }
-    public NpgsqlPoint LowerLeft { get; set; }
+    public NpgsqlPoint UpperRight
+    {
+        get => _upperRight;
+        set
+        {
+            if (value.X < _lowerLeft.X)
+            {
+                _upperRight.X = _lowerLeft.X;
+                _lowerLeft.X = value.X;
+            }
+            else
+            {
+                _upperRight.X = value.X;
+            }
+
+            if (value.Y < _lowerLeft.Y)
+            {
+                _upperRight.Y = _lowerLeft.Y;
+                _lowerLeft.Y = value.Y;
+            }
+            else
+            {
+                _upperRight.Y = value.Y;
+            }
+        }
+    }
+    private NpgsqlPoint _upperRight;
+
+
+    public NpgsqlPoint LowerLeft
+    {
+        get => _lowerLeft;
+        set
+        {
+            if (value.X > _upperRight.X)
+            {
+                _lowerLeft.X = _upperRight.X;
+                _upperRight.X = value.X;
+            }
+            else
+            {
+                _lowerLeft.X = value.X;
+            }
+
+            if (value.Y > _upperRight.Y)
+            {
+                _lowerLeft.Y = _upperRight.Y;
+                _upperRight.Y = value.Y;
+            }
+            else
+            {
+                _lowerLeft.Y = value.Y;
+            }
+        }
+    }
+    private NpgsqlPoint _lowerLeft;
 
     public NpgsqlBox(NpgsqlPoint upperRight, NpgsqlPoint lowerLeft) : this()
     {
diff --git a/test/Npgsql.Tests/Types/GeometricTypeTests.cs b/test/Npgsql.Tests/Types/GeometricTypeTests.cs
@@ -25,21 +25,46 @@ public Task LineSegment()
         => AssertType(new NpgsqlLSeg(1, 2, 3, 4), "[(1,2),(3,4)]", "lseg", NpgsqlDbType.LSeg);
 
     [Test]
-    public Task Box()
-        => AssertType(new NpgsqlBox(3, 4, 1, 2), "(4,3),(2,1)", "box", NpgsqlDbType.Box,
+    public async Task Box()
+    {
+        await AssertType(
+            new NpgsqlBox(top: 3, right: 4, bottom: 1, left: 2),
+            "(4,3),(2,1)",
+            "box",
+            NpgsqlDbType.Box,
             skipArrayCheck: true); // Uses semicolon instead of comma as separator
 
+        await AssertType(
+            new NpgsqlBox(top: 1, right: 2, bottom: 3, left: 4),
+            "(4,3),(2,1)",
+            "box",
+            NpgsqlDbType.Box,
+            skipArrayCheck: true); // Uses semicolon instead of comma as separator
+    }
+
     [Test]
-    public Task Box_array()
-        => AssertType(
+    public async Task Box_array()
+    {
+        var boxarr = await AssertType(
+            new[]
+            {
+                new NpgsqlBox(top: 3, right: 4, bottom: 1, left: 2),
+                new NpgsqlBox(top: 5, right: 6, bottom: 3, left: 4),
+            },
+            "{(4,3),(2,1);(6,5),(4,3)}",
+            "box[]",
+            NpgsqlDbType.Box | NpgsqlDbType.Array);
+
+        await AssertType(
             new[]
             {
-                new NpgsqlBox(3, 4, 1, 2),
-                new NpgsqlBox(5, 6, 3, 4)
+                new NpgsqlBox(top: 1, right: 2, bottom: 3, left: 4),
+                new NpgsqlBox(top: 3, right: 4, bottom: 5, left: 6)
             },
             "{(4,3),(2,1);(6,5),(4,3)}",
             "box[]",
             NpgsqlDbType.Box | NpgsqlDbType.Array);
+    }
 
     [Test]
     public Task Path_closed()
