Fix MySQL57 tests #87

Author: peetw

NHibernate.Spatial.MySQL/Dialect/MySQL57SpatialDialect.cs

@@ -228,6 +228,21 @@ public SqlString GetSpatialTransformString(object geometry, int srid)
         /// <returns></returns>
         public virtual SqlString GetSpatialValidationString(object geometry, SpatialValidation validation, bool criterion)
         {
+            // In MySQL 5.7, the ST_Valid function requires geometries to have an SRID of 0
+            // See: https://dev.mysql.com/doc/refman/5.7/en/spatial-convenience-functions.html#function_st-isvalid
+            if (validation == SpatialValidation.IsValid)
+            {
+                return new SqlStringBuilder()
+                    .Add(DialectPrefix)
+                    .Add(validation.ToString())
+                    .Add("(")
+                    .Add("ST_GeomFromWKB(ST_AsWKB(")
+                    .AddObject(geometry)
+                    .Add("), 0)")
+                    .Add(")")
+                    .ToSqlString();
+            }
+
             return new SqlStringBuilder()
                 .Add(DialectPrefix)
                 .Add(validation.ToString())

NHibernate.Spatial.MySQL/Type/MySQL57GeometryType.cs

@@ -56,16 +56,6 @@ protected override void SetDefaultSRID(Geometry geometry)
                 return null;
             }
 
-            // MySQL parses empty geometry as NULL
-            if (geometry.IsEmpty)
-            {
-                return null; // TODO: Somehow specify an empty geometry and not just null.
-
-                // MySqlGeometry does not support empty geometry collections
-                // so we simply return null for now. At some point we should to
-                // use GeometryCollection.Empty here, when MySQL supports it.
-            }
-
             SetDefaultSRID(geometry);
             byte[] bytes = new MySQLWriter().Write(geometry);
             return new MySqlGeometry(MySqlDbType.Geometry, bytes);

Tests.NHibernate.Spatial.MySQL57/MySQL57NtsTestCasesFixture.cs

@@ -1,18 +1,16 @@
 using NHibernate.Cfg;
-using NHibernate.Spatial.Criterion;
 using NUnit.Framework;
+using System.IO;
 using Tests.NHibernate.Spatial.NtsTestCases;
 
 namespace Tests.NHibernate.Spatial
 {
     [TestFixture]
     public class MySQL57NtsTestCasesFixture : NtsTestCasesFixture
     {
-        [Test]
-        public override void IsValid()
-        {
-            TestBooleanUnaryOperation("IsValid", SpatialProjections.IsValid, SpatialRestrictions.IsValid);
-        }
+        private const string LocalDataPath = "../../../../Tests.NHibernate.Spatial.MySQL57/NtsTestCases/Data/vivid";
+
+        protected override string TestFunctionAAPrecDataPath => Path.Combine(LocalDataPath, "TestFunctionAAPrec.xml");
 
         protected override void Configure(Configuration configuration)
         {

Tests.NHibernate.Spatial.MySQL57/MySQL57SpatialQueriesFixture.cs

@@ -1,5 +1,6 @@
 using NHibernate;
 using NHibernate.Cfg;
+using NHibernate.Spatial.Dialect;
 using NUnit.Framework;
 using Tests.NHibernate.Spatial.RandomGeometries;
 
@@ -46,7 +47,7 @@ protected override string SqlOvelapsLineString(string filterString)
 SELECT count(*)
 FROM linestringtest
 WHERE the_geom IS NOT NULL
-AND Overlaps(PolygonFromText('{filterString}', 4326), the_geom)
+AND {SpatialDialect.IsoPrefix}Overlaps(PolygonFromText('{filterString}', 4326), the_geom)
 ";
         }
 
@@ -56,7 +57,7 @@ protected override string SqlIntersectsLineString(string filterString)
 SELECT count(*)
 FROM linestringtest
 WHERE the_geom IS NOT NULL
-AND Intersects(PolygonFromText('{filterString}', 4326), the_geom)
+AND {SpatialDialect.IsoPrefix}Intersects(PolygonFromText('{filterString}', 4326), the_geom)
 ";
         }