Added github workflow for tests on PostGIS 3.2 (#24)

Author: sharkAndshark

.github/workflows/test_on_postgis-3.2.yml

@@ -0,0 +1,58 @@
+name: PostGIS_3.2
+
+on: [ push, pull_request ]
+
+jobs:
+  test_on_postgis_32:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dotnet-version: [ '2.1.x' ]
+        postgis-version: [ 'postgis/postgis:14-3.2-alpine', 'postgis/postgis:13-3.2-alpine', 'postgis/postgis:12-3.2-alpine','postgis/postgis:11-3.2-alpine','postgis/postgis:10-3.2-alpine',  'postgis/postgis:9.6-3.2-alpine' ]
+    services:
+      postgis:
+        image: ${{ matrix.postgis-version }}
+        env:
+          POSTGRES_USER: reader
+          POSTGRES_PASSWORD: reader
+          POSTGRES_DB: postgistest
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    
+    steps:
+      - name: init database table owm_cities
+        run: psql -h localhost -p 5432 -d postgistest -U reader -c "CREATE TABLE IF NOT EXISTS owm_cities(id integer primary key, city_name varchar not null, geom geometry not null);"
+        env:
+          PGPASSWORD: reader
+
+      - name: init database table test_geometry
+        run: psql -h localhost -p 5432 -d postgistest -U reader -c "CREATE TABLE test_geometry(id integer primary key, geom geometry);"
+        env:
+          PGPASSWORD: reader
+
+      - name: init database table test_geography
+        run: psql -h localhost -p 5432 -d postgistest -U reader -c "CREATE TABLE test_geography(id integer primary key, geog geography);"
+        env:
+          PGPASSWORD: reader
+
+      - name: get source
+        uses: actions/checkout@v2
+
+      - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: ${{ matrix.dotnet-version }}
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+      - name: Test
+        run: dotnet test --no-restore --verbosity normal

LinqToDBPostGisNetTopologySuite.Tests/GeometryAccessorsTests.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 
 using LinqToDB;
+using LinqToDB.Data;
 using NUnit.Framework;
 
 using NTSGS = NetTopologySuite.Geometries;
@@ -72,47 +73,35 @@ public void TestSTBoundary()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string wkt1 = "LINESTRING(100 150,50 60, 70 80, 160 170)";
-                db.TestGeometries
-                    .Value(g => g.Id, 1)
-                    .Value(g => g.Geometry, () => GeometryInput.STGeomFromText(wkt1))
-                    .Insert();
-
-                const string wkt2 = "POLYGON ((10 130, 50 190, 110 190, 140 150, 150 80, 100 10, 20 40, 10 130), (70 40, 100 50, 120 80, 80 110, 50 90, 70 40))";
-                db.TestGeometries
-                    .Value(g => g.Id, 2)
-                    .Value(g => g.Geometry, () => GeometryInput.STGeomFromText(wkt2))
-                    .Insert();
-
-                const string wkt3 = "MULTILINESTRING((1 1 1,0 0 0.5, -1 1 1),(1 1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )";
-                db.TestGeometries
-                    .Value(g => g.Id, 3)
-                    .Value(g => g.Geometry, () => GeometryInput.STGeomFromText(wkt3))
-                    .Insert();
-
-                Assert.AreEqual(
-                    "MULTIPOINT(100 150,160 170)",
-                    db.TestGeometries
-                        .Where(g => g.Id == 1)
-                        .Select(g => g.Geometry.STBoundary().STAsText())
-                        .Single());
-
-                Assert.AreEqual(
-                    "MULTILINESTRING((10 130,50 190,110 190,140 150,150 80,100 10,20 40,10 130),(70 40,100 50,120 80,80 110,50 90,70 40))",
-                    db.TestGeometries
-                        .Where(g => g.Id == 2)
-                        .Select(g => g.Geometry.STBoundary().STAsText())
-                        .Single());
-
-                Assert.AreEqual(
-                    "MULTIPOINT Z (-1 1 1,1 1 0.75)",
-                    db.TestGeometries
-                        .Where(g => g.Id == 3)
-                        .Select(g => g.Geometry.STBoundary().STAsText())
-                        .Single());
+                const string Wkt1 = "LINESTRING(100 150,50 60, 70 80, 160 170)";
+                const string Wkt2 =
+                    "POLYGON ((10 130, 50 190, 110 190, 140 150, 150 80, 100 10, 20 40, 10 130), (70 40, 100 50, 120 80, 80 110, 50 90, 70 40))";
+                const string Wkt3 = "MULTILINESTRING((1 1 1,0 0 0.5, -1 1 1),(1 1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )";
+
+                const string Expected1 = "MULTIPOINT(100 150,160 170)";
+                const string Expected2 =
+                    "MULTILINESTRING((10 130,50 190,110 190,140 150,150 80,100 10,20 40,10 130),(70 40,100 50,120 80,80 110,50 90,70 40))";
+                const string Expected3V1 = "MULTIPOINT Z (-1 1 1,1 1 0.75)";
+                const string Expected3V2 = "MULTIPOINT Z (1 1 1,-1 1 1)";
+
+                var result1 = db.Select(() => GeometryInput.STGeomFromEWKT(Wkt1).STBoundary().STAsText());
+                var result2 = db.Select(() => GeometryInput.STGeomFromEWKT(Wkt2).STBoundary().STAsText());
+                var result3 = db.Select(() => GeometryInput.STGeomFromEWKT(Wkt3).STBoundary().STAsText());
+
+                Assert.AreEqual(Expected1, result1);
+                Assert.AreEqual(Expected2, result2);
+                if (CurrentVersion <
+                    new Version(
+                        "3.2.0")) //See https://postgis.net/docs/ST_Boundary.html. Result is different based on postgis version
+                {
+                    Assert.AreEqual(Expected3V1, result3);
+                }
+                else
+                {
+                    Assert.AreEqual(Expected3V2, result3);
+                }
 
                 Assert.IsNull(db.Select(() => GeometryAccessors.STBoundary((NTSG)null)));
-                Assert.AreEqual("MULTIPOINT(100 150,160 170)", db.Select(() => GeometryAccessors.STBoundary(wkt1).STAsText()));
             }
         }
 
@@ -355,16 +344,9 @@ public void TestSTGeometryType()
                     db.Select(() => GeometryInput.STGeomFromText(Wkt)
                         .STGeometryType()));
 
-                // TODO: Need some research for reason of error: 
-                // function st_geometrytype(unknown) is not unique. Could not choose a best candidate function. You might need to add explicit type casts.
-                if (this.CurrentVersion >= new Version("3.0.0"))
-                {
-                    Assert.AreEqual(
-                        "ST_LineString",
-                        db.Select(() => GeometryAccessors.STGeometryType(Wkt)));
-
-                    Assert.IsNull(db.Select(() => GeometryAccessors.STGeometryType((NTSG)null)));
-                }
+                Assert.AreEqual(
+                    "ST_LineString",
+                    db.Select(() => GeometryAccessors.STGeometryType(Wkt)));
             }
         }
 
@@ -923,26 +905,40 @@ public void TestSTStartPoint()
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
                 const string Wkt1 = "LINESTRING(0 1, 0 2)";
-                db.TestGeometries.Value(g => g.Id, 1).Value(g => g.Geometry, () => GeometryInput.STGeomFromText(Wkt1)).Insert();
-
                 const string Wkt2 = "POINT(0 1)";
-                db.TestGeometries.Value(g => g.Id, 2).Value(g => g.Geometry, () => GeometryInput.STGeomFromText(Wkt2)).Insert();
 
-                Assert.AreEqual(
-                                "POINT(0 1)",
-                                db.TestGeometries
-                                    .Where(g => g.Id == 1)
-                                    .Select(g => g.Geometry.STStartPoint().STAsText())
-                                    .Single());
+                const double ExpectedX = 0;
+                const double ExpectedY = 1;
 
-                Assert.IsNull(db.TestGeometries
-                                    .Where(g => g.Id == 2)
-                                    .Select(g => g.Geometry.STStartPoint())
-                                    .Single());
+                var actual11 = db.Select(() => GeometryInput.STGeomFromText(Wkt1).STStartPoint());
+                var actual12 = db.Select(() => GeometryAccessors.STStartPoint(Wkt1));
+
+                var actual2 = db.Select(() => GeometryAccessors.STStartPoint((NTSG)null));
+
+                var actual31 = db.Select(() => GeometryInput.STGeomFromText(Wkt2).STStartPoint());
+                var actual32 = db.Select(() => GeometryAccessors.STStartPoint(Wkt2));
+
+
+                Assert.AreEqual(ExpectedX, actual11.Coordinates[0].X);
+                Assert.AreEqual(ExpectedY, actual11.Coordinates[0].Y);
 
-                Assert.AreEqual("POINT(0 1)", db.Select(() => GeometryAccessors.STStartPoint(Wkt1).STAsText()));
-                Assert.IsNull(db.Select(() => GeometryAccessors.STStartPoint(Wkt2)));
-                Assert.IsNull(db.Select(() => GeometryAccessors.STStartPoint((NTSG)null)));
+                Assert.AreEqual(ExpectedX, actual12.Coordinates[0].X);
+                Assert.AreEqual(ExpectedY, actual12.Coordinates[0].Y);
+
+                Assert.IsNull(actual2);
+
+                if (CurrentVersion < new Version("3.2.0"))
+                {
+                    Assert.IsNull(actual31);
+                    Assert.IsNull(actual32);
+                }
+                else
+                {
+                    Assert.AreEqual(ExpectedX, actual31.Coordinates[0].X);
+                    Assert.AreEqual(ExpectedY, actual31.Coordinates[0].Y);
+                    Assert.AreEqual(ExpectedX, actual32.Coordinates[0].X);
+                    Assert.AreEqual(ExpectedY, actual32.Coordinates[0].Y);
+                }
             }
         }
 

LinqToDBPostGisNetTopologySuite.Tests/GeometryEditorsTests.cs

@@ -672,36 +672,37 @@ public void TestSTLineMerge()
 
                 Assert.AreEqual(
                     "LINESTRING(-29 -27,-30 -29.7,-36 -31,-45 -33,-46 -32)",
-                    db.Select(() => GeometryEditors.STLineMerge("MULTILINESTRING((-29 -27,-30 -29.7,-36 -31,-45 -33),(-45 -33,-46 -32))").STAsText()));
+                    db.Select(() =>
+                        GeometryEditors
+                            .STLineMerge("MULTILINESTRING((-29 -27,-30 -29.7,-36 -31,-45 -33),(-45 -33,-46 -32))")
+                            .STAsText()));
             }
         }
 
-
         [Test]
         public void TestSTLineToCurve()
         {
+            const string Wkt = "POINT(1 3)";
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string Wkt = "POINT(1 3)";
-                db.TestGeometries
-                    .Value(g => g.Id, 1)
-                    .Value(g => g.Geometry, () =>
-                        GeometryInput.STGeomFromText(Wkt).STBuffer(3.0))
-                    .Insert();
+                var itemQuery = db.SelectQuery(() => GeometryInput.STGeomFromText(Wkt).STBuffer(3.0));
 
                 // NTS error: 'Geometry type not recognized. GeometryCode: 10'
-                var curvePolygon = db.TestGeometries
-                    .Where(g => g.Id == 1)
-                    .Select(g => g.Geometry.STLineToCurve().STAsText())
-                    .Single();
-
-                Assert.AreEqual("CURVEPOLYGON(CIRCULARSTRING(4 3,-2 2.99999999999999,4 3))", curvePolygon);
-
-                Assert.IsNull(db.Select(() => GeometryEditors.STLineToCurve((NTSG)null)));
+                var actual1 = itemQuery
+                    .Select(item => item.STLineToCurve().STPoints()).Single();
+                var actual2 = db.Select(() => GeometryEditors.STLineToCurve((NTSG)null));
+
+                Assert.AreEqual(4, actual1.Coordinates[0].X, 5);
+                Assert.AreEqual(3, actual1.Coordinates[0].Y, 5);
+                Assert.AreEqual(-2, actual1.Coordinates[1].X, 5);
+                Assert.AreEqual(3, actual1.Coordinates[1].Y, 5);
+                Assert.AreEqual(4, actual1.Coordinates[2].X, 5);
+                Assert.AreEqual(3, actual1.Coordinates[2].Y, 5);
+
+                Assert.IsNull(actual2);
             }
         }
 
-
         [Test]
         public void TestSTMulti()
         {