Add empty constructors to Npgsql{Path,Polygon} (#5114)

roji · roji · commit 9241e1484ae8 · 2023-06-19T13:53:04.000+02:00
(cherry picked from commit 1b8bb7e)
diff --git a/src/Npgsql/NpgsqlTypes/NpgsqlTypes.cs b/src/Npgsql/NpgsqlTypes/NpgsqlTypes.cs
@@ -233,7 +233,10 @@ public struct NpgsqlPath : IList<NpgsqlPoint>, IEquatable<NpgsqlPath>
     readonly List<NpgsqlPoint> _points;
     public bool Open { get; set; }
 
-    public NpgsqlPath(IEnumerable<NpgsqlPoint> points, bool open) : this()
+    public NpgsqlPath()
+        => _points = new();
+
+    public NpgsqlPath(IEnumerable<NpgsqlPoint> points, bool open)
     {
         _points = new List<NpgsqlPoint>(points);
         Open = open;
@@ -354,12 +357,15 @@ public struct NpgsqlPolygon : IList<NpgsqlPoint>, IEquatable<NpgsqlPolygon>
 {
     readonly List<NpgsqlPoint> _points;
 
+    public NpgsqlPolygon()
+        => _points = new();
+
     public NpgsqlPolygon(IEnumerable<NpgsqlPoint> points)
     {
         _points = new List<NpgsqlPoint>(points);
     }
 
-    public NpgsqlPolygon(params NpgsqlPoint[] points) : this ((IEnumerable<NpgsqlPoint>) points) {}
+    public NpgsqlPolygon(params NpgsqlPoint[] points) : this((IEnumerable<NpgsqlPoint>) points) {}
 
     public NpgsqlPolygon(int capacity)
     {
diff --git a/test/Npgsql.Tests/Types/GeometricTypeTests.cs b/test/Npgsql.Tests/Types/GeometricTypeTests.cs
@@ -163,4 +163,4 @@ void AssertPointsEqual(NpgsqlPoint actual, NpgsqlPoint expected)
     }
 
     public GeometricTypeTests(MultiplexingMode multiplexingMode) : base(multiplexingMode) {}
-}
+}
diff --git a/test/Npgsql.Tests/TypesTests.cs b/test/Npgsql.Tests/TypesTests.cs
@@ -581,6 +581,14 @@ public void TsQueryOperatorPrecedence()
         Assert.AreEqual(expectedGrouping.ToString(), query.ToString());
     }
 
+    [Test]
+    public void NpgsqlPath_empty()
+        => Assert.That(new NpgsqlPath { new(1, 2) }, Is.EqualTo(new NpgsqlPath(new NpgsqlPoint(1, 2))));
+
+    [Test]
+    public void NpgsqlPolygon_empty()
+        => Assert.That(new NpgsqlPolygon { new(1, 2) }, Is.EqualTo(new NpgsqlPolygon(new NpgsqlPoint(1, 2))));
+
     [Test]
     public void Bug1011018()
     {

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,10 @@ public struct NpgsqlPath : IList<NpgsqlPoint>, IEquatable<NpgsqlPath>`
`233`	`233`	`readonly List<NpgsqlPoint> _points;`
`234`	`234`	`public bool Open { get; set; }`
`235`	`235`
`236`		`- public NpgsqlPath(IEnumerable<NpgsqlPoint> points, bool open) : this()`
	`236`	`+ public NpgsqlPath()`
	`237`	`+ => _points = new();`
	`238`	`+`
	`239`	`+ public NpgsqlPath(IEnumerable<NpgsqlPoint> points, bool open)`
`237`	`240`	`{`
`238`	`241`	`_points = new List<NpgsqlPoint>(points);`
`239`	`242`	`Open = open;`
`@@ -354,12 +357,15 @@ public struct NpgsqlPolygon : IList<NpgsqlPoint>, IEquatable<NpgsqlPolygon>`
`354`	`357`	`{`
`355`	`358`	`readonly List<NpgsqlPoint> _points;`
`356`	`359`
	`360`	`+ public NpgsqlPolygon()`
	`361`	`+ => _points = new();`
	`362`	`+`
`357`	`363`	`public NpgsqlPolygon(IEnumerable<NpgsqlPoint> points)`
`358`	`364`	`{`
`359`	`365`	`_points = new List<NpgsqlPoint>(points);`
`360`	`366`	`}`
`361`	`367`
`362`		`- public NpgsqlPolygon(params NpgsqlPoint[] points) : this ((IEnumerable<NpgsqlPoint>) points) {}`
	`368`	`+ public NpgsqlPolygon(params NpgsqlPoint[] points) : this((IEnumerable<NpgsqlPoint>) points) {}`
`363`	`369`
`364`	`370`	`public NpgsqlPolygon(int capacity)`
`365`	`371`	`{`
Original file line number	Diff line number	Diff line change
`@@ -163,4 +163,4 @@ void AssertPointsEqual(NpgsqlPoint actual, NpgsqlPoint expected)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`public GeometricTypeTests(MultiplexingMode multiplexingMode) : base(multiplexingMode) {}`
`166`		`-}`
	`166`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,14 @@ public void TsQueryOperatorPrecedence()`
`581`	`581`	`Assert.AreEqual(expectedGrouping.ToString(), query.ToString());`
`582`	`582`	`}`
`583`	`583`
	`584`	`+ [Test]`
	`585`	`+ public void NpgsqlPath_empty()`
	`586`	`+ => Assert.That(new NpgsqlPath { new(1, 2) }, Is.EqualTo(new NpgsqlPath(new NpgsqlPoint(1, 2))));`
	`587`	`+`
	`588`	`+ [Test]`
	`589`	`+ public void NpgsqlPolygon_empty()`
	`590`	`+ => Assert.That(new NpgsqlPolygon { new(1, 2) }, Is.EqualTo(new NpgsqlPolygon(new NpgsqlPoint(1, 2))));`
	`591`	`+`
`584`	`592`	`[Test]`
`585`	`593`	`public void Bug1011018()`
`586`	`594`	`{`