Improved PostrgeSqlPartialTest

Due to 8.x versions do not support Gist indexes on columns of NpgsqlPoint type
test entity was separated into two - general, which is supported accross all versions,
and additional, specific for 9.0+ versions

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Storage/PostgreSqlSpatialTest.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2021 Xtensive LLC.
+// Copyright (C) 2014-2024 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
@@ -19,7 +19,7 @@ public class Container : Entity
     [Field, Key]
     public int Id { get; private set; }
 
-    [Field(Indexed = true)]
+    [Field]
     public NpgsqlPoint Point { get; set; }
 
     [Field]
@@ -36,59 +36,84 @@ public class Container : Entity
 
     [Field(Indexed = true)]
     public NpgsqlCircle Circle { get; set; }
+
+    public Container(Session session) : base(session)
+    {
+    }
+  }
+
+  [HierarchyRoot]
+  public class IndexedPointContainer : Entity
+  {
+    [Field, Key]
+    public int Id { get; private set; }
+
+    [Field(Indexed = true)]
+    public NpgsqlPoint Point { get; set; }
+
+
+    public IndexedPointContainer(Session session)
+      : base(session)
+    {
+    }
   }
 }
 
 namespace Xtensive.Orm.Tests.Storage
 {
   public class PostgreSqlSpatialTest : AutoBuildTest
   {
+    private readonly NpgsqlPoint point = new NpgsqlPoint(1, 2);
+    private readonly NpgsqlLSeg lSeg = new NpgsqlLSeg(new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4));
+    private readonly NpgsqlBox box = new NpgsqlBox(new NpgsqlPoint(1, 1), new NpgsqlPoint(-1, -1));
+    private readonly NpgsqlPath path = new NpgsqlPath(new[] { new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4) }) { Open = true };
+    private readonly NpgsqlPolygon polygon = new NpgsqlPolygon(new[] { new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4), new NpgsqlPoint(5, 6) });
+    private readonly NpgsqlCircle circle = new NpgsqlCircle(new NpgsqlPoint(1, 2), 3);
+
+
     protected override DomainConfiguration BuildConfiguration()
     {
       var config = base.BuildConfiguration();
-      config.Types.Register(typeof (Container).Assembly, typeof (Container).Namespace);
+      config.Types.Register(typeof (Container));
+      if (StorageProviderInfo.Instance.CheckProviderVersionIsAtLeast(StorageProviderVersion.PostgreSql90)) {
+        config.Types.Register(typeof(IndexedPointContainer));
+      }
       return config;
     }
 
-    protected override void CheckRequirements()
-    {
-      Require.ProviderIs(StorageProvider.PostgreSql);
-    }
+    protected override void CheckRequirements() => Require.ProviderIs(StorageProvider.PostgreSql);
 
     [Test]
     public void MainTest()
     {
-      NpgsqlPoint point = new NpgsqlPoint(1, 2);
-      NpgsqlLSeg lSeg = new NpgsqlLSeg(new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4));
-      NpgsqlBox box = new NpgsqlBox(new NpgsqlPoint(1, 1), new NpgsqlPoint(-1, -1));
-      NpgsqlPath path = new NpgsqlPath(new[] {new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4)}) {Open = true};
-      NpgsqlPolygon polygon = new NpgsqlPolygon(new[] {new NpgsqlPoint(1, 2), new NpgsqlPoint(3, 4), new NpgsqlPoint(5, 6)});
-      NpgsqlCircle circle = new NpgsqlCircle(new NpgsqlPoint(1, 2), 3);
-
-      using (Domain.OpenSession()) {
-        using (var t = Session.Current.OpenTransaction()) {
-          _ = new Container {
+      using (var session = Domain.OpenSession()) {
+
+        var defaultValueContainerId = 0;
+        var customValueContainerId = 0;
+        using (var tx = session.OpenTransaction()) {
+          defaultValueContainerId = new Container(session) {
             Point = new NpgsqlPoint(),
             LSeg = new NpgsqlLSeg(),
             Box = new NpgsqlBox(),
             Path = new NpgsqlPath(),
             Polygon = new NpgsqlPolygon(),
             Circle = new NpgsqlCircle()
-          };
+          }.Id;
 
-          _ = new Container {
+          customValueContainerId = new Container(session) {
             Point = point,
             LSeg = lSeg,
             Box = box,
             Path = path,
             Polygon = polygon,
             Circle = circle
-          };
-          t.Complete();
+          }.Id;
+
+          tx.Complete();
         }
 
-        using (var t = Session.Current.OpenTransaction()) {
-          var record = Query.All<Container>().First(c => c.Id==1);
+        using (var tx = session.OpenTransaction()) {
+          var record = session.Query.All<Container>().First(c => c.Id == defaultValueContainerId);
 
           Console.WriteLine("The record without the initial parameters:");
           OutputRecord(record);
@@ -100,7 +125,7 @@ public void MainTest()
           Assert.IsTrue(record.Polygon.Equals(new NpgsqlPolygon(new[] {new NpgsqlPoint()})));
           Assert.IsTrue(record.Circle.Equals(new NpgsqlCircle()));
 
-          record = Query.All<Container>().First(c => c.Id==2);
+          record = session.Query.All<Container>().First(c => c.Id == customValueContainerId);
 
           Console.WriteLine("The record with the initial parameters:");
           OutputRecord(record);
@@ -111,7 +136,41 @@ record = Query.All<Container>().First(c => c.Id==2);
           Assert.IsTrue(record.Polygon.Equals(polygon));
           Assert.IsTrue(record.Circle.Equals(circle));
 
-          t.Complete();
+          tx.Complete();
+        }
+      }
+    }
+
+    [Test]
+    public void AddtionalTest()
+    {
+      Require.ProviderVersionAtLeast(StorageProviderVersion.PostgreSql90);
+
+      using (var session = Domain.OpenSession()) {
+
+        var defaultValueContainerId = 0;
+        var customValueContainerId = 0;
+        using (var tx = session.OpenTransaction()) {
+          defaultValueContainerId = new IndexedPointContainer(session) { Point = new NpgsqlPoint() }.Id;
+          customValueContainerId = new IndexedPointContainer(session) { Point = point }.Id;
+          tx.Complete();
+        }
+
+        using (var tx = session.OpenTransaction()) {
+          var record = session.Query.All<IndexedPointContainer>().First(c => c.Id == defaultValueContainerId);
+
+          Console.WriteLine("The record without the initial parameters:");
+          OutputRecord(record);
+
+          Assert.IsTrue(record.Point.Equals(new NpgsqlPoint()));
+
+          record = session.Query.All<IndexedPointContainer>().First(c => c.Id == customValueContainerId);
+
+          Console.WriteLine("The record with the initial parameters:");
+          OutputRecord(record);
+          Assert.IsTrue(record.Point.Equals(point));
+          
+          tx.Complete();
         }
       }
     }
@@ -134,5 +193,10 @@ public void OutputRecord(Container record)
 
       Console.WriteLine("Circle  - <({0},{1}),{2}>", record.Circle.Center.X, record.Circle.Center.Y, record.Circle.Radius);
     }
+
+    public void OutputRecord(IndexedPointContainer record)
+    {
+      Console.WriteLine("Point   - ({0},{1})", record.Point.X, record.Point.Y);
+    }
   }
 }