Merge pull request #107 from peetw/feature/ms-sql-net-standard

Target .NET Standard with MsSql dialect

Author: peetw

NHibernate.Spatial.MsSql/Dialect/MsSql2008FunctionRegistration.cs

@@ -382,15 +382,23 @@ public virtual SqlString GetSpatialRelationString(object geometry, SpatialRelati
 					return GetSpatialRelationString(anotherGeometry, SpatialRelation.Covers, geometry, criterion);
 
 				default:
-					return new SqlStringBuilder(8)
-						.AddObject(geometry)
-						.Add(".ST")
-						.Add(relation.ToString())
-						.Add("(")
-						.AddObject(anotherGeometry)
-						.Add(")")
-						.Add(criterion ? " = 1" : "")
-						.ToSqlString();
+                    // NOTE: Cast is only required if "geometry" is passed in as a parameter
+                    //       directly, rather than as a column name. This is because parameter
+                    //       will be passed as binary and SQL Server can't call methods on
+                    //       binary data.
+                    return new SqlStringBuilder()
+                        .Add("CAST(")
+                        .AddObject(geometry)
+                        .Add(" AS ")
+                        .Add(sqlTypeName)
+                        .Add(")")
+                        .Add(".ST")
+                        .Add(relation.ToString())
+                        .Add("(")
+                        .AddObject(anotherGeometry)
+                        .Add(")")
+                        .Add(criterion ? " = 1" : "")
+                        .ToSqlString();
 			}
 		}
 

NHibernate.Spatial.MsSql/Dialect/MsSql2008GeographyDialect.cs

@@ -23,7 +23,7 @@ namespace NHibernate.Spatial.Dialect
 	public class MsSql2008GeographyDialect : MsSql2008SpatialDialect
 	{
 
-		private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeographyType), null);
+		private static readonly IType geometryType = new CustomType(typeof(MsSqlGeographyType), null);
 
 		public MsSql2008GeographyDialect()
 			: base("geography", "NHSP_GEOGRAPHY_COLUMNS", geometryType)
@@ -36,7 +36,7 @@ public MsSql2008GeographyDialect()
 		/// <returns></returns>
 		public override IGeometryUserType CreateGeometryUserType()
 		{
-			return new MsSql2008GeographyType();
+			return new MsSqlGeographyType();
 		}
 	}
 }

NHibernate.Spatial.MsSql/Dialect/MsSql2008GeometryDialect.cs

@@ -23,10 +23,10 @@ namespace NHibernate.Spatial.Dialect
 	public class MsSql2008GeometryDialect : MsSql2008SpatialDialect
 	{
 
-		private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeometryType), null);
+		private static readonly IType geometryType = new CustomType(typeof(MsSqlGeometryType), null);
 
 		public MsSql2008GeometryDialect()
-			: base("geometry", "NHSP_GEOMETRY_COLUMNS",geometryType)
+			: base("geometry", "NHSP_GEOMETRY_COLUMNS", geometryType)
 		{
 		}
 
@@ -36,7 +36,7 @@ public MsSql2008GeometryDialect()
 		/// <returns></returns>
 		public override IGeometryUserType CreateGeometryUserType()
 		{
-			return new MsSql2008GeometryType();
+			return new MsSqlGeometryType();
 		}
 	}
 }

NHibernate.Spatial.MsSql/Dialect/MsSql2012GeographyDialect.cs

@@ -22,7 +22,7 @@ namespace NHibernate.Spatial.Dialect
 {
     public class MsSql2012GeographyDialect : MsSql2012SpatialDialect
     {
-        private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeographyType), null);
+        private static readonly IType geometryType = new CustomType(typeof(MsSqlGeographyType), null);
 
         public MsSql2012GeographyDialect()
             : base("geography", "NHSP_GEOGRAPHY_COLUMNS", geometryType)
@@ -34,7 +34,7 @@ public MsSql2012GeographyDialect()
         /// <returns></returns>
         public override IGeometryUserType CreateGeometryUserType()
         {
-            return new MsSql2008GeographyType();
+            return new MsSqlGeographyType();
         }
     }
 }

NHibernate.Spatial.MsSql/Dialect/MsSql2012GeometryDialect.cs

@@ -22,7 +22,7 @@ namespace NHibernate.Spatial.Dialect
 {
     public class MsSql2012GeometryDialect : MsSql2012SpatialDialect
     {
-        private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeometryType), null);
+        private static readonly IType geometryType = new CustomType(typeof(MsSqlGeometryType), null);
 
         public MsSql2012GeometryDialect()
             : base("geometry", "NHSP_GEOMETRY_COLUMNS", geometryType)
@@ -34,7 +34,7 @@ public MsSql2012GeometryDialect()
         /// <returns></returns>
         public override IGeometryUserType CreateGeometryUserType()
         {
-            return new MsSql2008GeometryType();
+            return new MsSqlGeometryType();
         }
     }
 }

NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj

@@ -2,7 +2,7 @@
   <Import Project="../NHibernate.Spatial.props" />
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 
@@ -12,7 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.Types" Version="11.0.2" />
+    <PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="1.15.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
   </ItemGroup>
 
   <ItemGroup>