Updated SqlServer spatial converters and unit tests

1. Renamed HierarchyIdTests.cs to SqlServerHierarchyIdTests.cs
2. Renamed SqlServerConvertersOrmLiteTestBase to
SqlServer2012ConvertersOrmLiteTestBase in ConvertersOrmLiteTestBase.cs
3. Added SqlServer2014ConvertersOrmLiteTestBase &
SqlServer2016ConvertersOrmLiteTestBase in ConvertersOrmLiteTestBase.cs
for more targetted Sql Server version testing.
4. Updated SqlGeometry, SqlGeography, & SqlHierarchyId converters to be
more complete (overrides for InitDbParam, ToDbValue, FromDbValue, and
ToQuotedString).
5. Added more unit tests for SqlGeometry, SqlGeography, & SqlHierarchyId
converters to cover the ToDBValue, FromDBValue, and ToQuotedString
methods.

Author: KevinHoward

src/ServiceStack.OrmLite.SqlServer.Converters/ServiceStack.OrmLite.SqlServer.Converters.csproj

@@ -70,7 +70,6 @@
     <Compile Include="SqlServerHierarchyIdTypeConverter.cs" />
     <Compile Include="SqlServerGeographyTypeConverter.cs" />
     <Compile Include="SqlServerGeometryTypeConverter.cs" />
-    <Compile Include="SqlServerTypeConverter.cs" />
     <Compile Include="SqlServerExtendedStringConverters.cs" />
   </ItemGroup>
   <ItemGroup>

src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerGeographyTypeConverter.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Data;
+using System.Data.SqlClient;
 using Microsoft.SqlServer.Types;
 
 namespace ServiceStack.OrmLite.SqlServer.Converters
@@ -7,24 +9,61 @@ namespace ServiceStack.OrmLite.SqlServer.Converters
     /// SqlServer Database Converter for the Geometry data type
     /// https://msdn.microsoft.com/en-us/library/microsoft.sqlserver.types.sqlgeography.aspx
     /// </summary>
-    public class SqlServerGeographyTypeConverter : SqlServerSpatialTypeConverter
+    public class SqlServerGeographyTypeConverter : OrmLiteConverter
     {
-        public override string ColumnDefinition => "GEOGRAPHY";
+        public override string ColumnDefinition => "geography";
+
+        public override DbType DbType => DbType.Object;
+
+        public override string ToQuotedString(Type fieldType, object value)
+        {
+            if (fieldType == typeof(SqlGeography))
+            {
+                string str = null;
+                if (value != null)
+                {
+                    var geo = (SqlGeography)value;
+                    if (!geo.IsNull)
+                        str = geo.ToString();
+                }
+                str = (str == null) ? "null" : $"'{str}'";
+                return $"CAST({str} AS {ColumnDefinition})";
+            }
+
+            return base.ToQuotedString(fieldType, value);
+        }
+
+        public override void InitDbParam(IDbDataParameter p, Type fieldType)
+        {
+            if (fieldType == typeof(SqlGeography))
+            {
+                var sqlParam = (SqlParameter)p;
+                sqlParam.IsNullable = fieldType.IsNullableType();
+                sqlParam.SqlDbType = SqlDbType.Udt;
+                sqlParam.UdtTypeName = ColumnDefinition;
+            }
+            base.InitDbParam(p, fieldType);
+        }
 
         public override object FromDbValue(Type fieldType, object value)
         {
-            var geo = value as SqlGeography;
-            if (geo == null || geo.IsNull)
+            if (value == null || value is DBNull)
+                return SqlGeography.Null;
+
+            if (value is SqlGeography)
+                return (SqlGeography)value;
+
+            if (value is string)
             {
-                return null;
+                return SqlGeography.Parse(value.ToString());
             }
 
             return base.FromDbValue(fieldType, value);
         }
 
         public override object ToDbValue(Type fieldType, object value)
         {
-            if (value == null)
+            if (value == null || value is DBNull)
             {
                 return SqlGeography.Null;
             }
@@ -40,14 +79,6 @@ public override object ToDbValue(Type fieldType, object value)
                 return SqlGeography.Parse(str);
             }
 
-            if (value is byte[])
-            {
-                var bin = value as byte[];
-                var sqlBin = new System.Data.SqlTypes.SqlBytes(bin);
-
-                return SqlGeography.Deserialize(sqlBin);
-            }
-
             return base.ToDbValue(fieldType, value);
         }
     }

src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerGeometryTypeConverter.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Data;
+using System.Data.SqlClient;
 using Microsoft.SqlServer.Types;
 
 namespace ServiceStack.OrmLite.SqlServer.Converters
@@ -7,24 +9,61 @@ namespace ServiceStack.OrmLite.SqlServer.Converters
     /// SqlServer Database Converter for the Geometry data type
     /// https://msdn.microsoft.com/en-us/library/microsoft.sqlserver.types.sqlgeometry.aspx
     /// </summary>
-    public class SqlServerGeometryTypeConverter : SqlServerSpatialTypeConverter
+    public class SqlServerGeometryTypeConverter : OrmLiteConverter
     {
-        public override string ColumnDefinition => "GEOMETRY";
+        public override string ColumnDefinition => "geometry";
+
+        public override DbType DbType => DbType.Object;
+
+        public override string ToQuotedString(Type fieldType, object value)
+        {
+            if (fieldType == typeof(SqlGeometry))
+            {
+                string str = null;
+                if (value != null)
+                {
+                    var geo = (SqlGeometry)value;
+                    if (!geo.IsNull)
+                        str = geo.ToString();
+                }
+                str = (str == null) ? "null" : $"'{str}'";
+                return $"CAST({str} AS {ColumnDefinition})";
+            }
+
+            return base.ToQuotedString(fieldType, value);
+        }
+
+        public override void InitDbParam(IDbDataParameter p, Type fieldType)
+        {
+            if (fieldType == typeof(SqlGeometry))
+            {
+                var sqlParam = (SqlParameter)p;
+                sqlParam.IsNullable = fieldType.IsNullableType();
+                sqlParam.SqlDbType = SqlDbType.Udt;
+                sqlParam.UdtTypeName = ColumnDefinition;
+            }
+            base.InitDbParam(p, fieldType);
+        }
 
         public override object FromDbValue(Type fieldType, object value)
         {
-            var geo = value as SqlGeometry;
-            if (geo == null || geo.IsNull)
+            if (value == null || value is DBNull)
+                return SqlGeometry.Null;
+
+            if (value is SqlGeometry)
+                return (SqlGeometry)value;
+
+            if (value is string)
             {
-                return null;
+                return SqlGeometry.Parse(value.ToString());
             }
 
             return base.FromDbValue(fieldType, value);
         }
 
         public override object ToDbValue(Type fieldType, object value)
         {
-            if (value == null)
+            if (value == null || value is DBNull)
             {
                 return SqlGeometry.Null;
             }
@@ -40,14 +79,6 @@ public override object ToDbValue(Type fieldType, object value)
                 return SqlGeometry.Parse(str);
             }
 
-            if (value is byte[])
-            {
-                var bin = value as byte[];
-                var sqlBin = new System.Data.SqlTypes.SqlBytes(bin);
-
-                return SqlGeometry.Deserialize(sqlBin);
-            }
-
             return base.ToDbValue(fieldType, value);
         }
     }

src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerHierarchyIdTypeConverter.cs

@@ -11,41 +11,66 @@ namespace ServiceStack.OrmLite.SqlServer.Converters
     /// </summary>
     public class SqlServerHierarchyIdTypeConverter : OrmLiteConverter
     {
-        public SqlServerHierarchyIdTypeConverter() : base()
-        { }
-
-        public override string ColumnDefinition => "HIERARCHYID";
+        public override string ColumnDefinition => "hierarchyId";
 
         public override DbType DbType => DbType.Object;
 
+        public override string ToQuotedString(Type fieldType, object value)
+        {
+            if (fieldType == typeof(SqlHierarchyId))
+            {
+                string str = null;
+                if (value != null)
+                {
+                    var hierarchyId = (SqlHierarchyId)value;
+                    if (!hierarchyId.IsNull)
+                        str = hierarchyId.ToString();
+                }
+                str = (str == null) ? "null" : $"'{str}'";
+                return $"CAST({str} AS {ColumnDefinition})";
+            }
+
+            return base.ToQuotedString(fieldType, value);
+        }
+
         public override void InitDbParam(IDbDataParameter p, Type fieldType)
         {
-            var sqlParam = (SqlParameter)p;
-            sqlParam.IsNullable = fieldType.IsNullableType();
-            sqlParam.SqlDbType = SqlDbType.Udt;
-            sqlParam.UdtTypeName = ColumnDefinition;
+            if (fieldType == typeof(SqlHierarchyId))
+            {
+                var sqlParam = (SqlParameter)p;
+                sqlParam.IsNullable = fieldType.IsNullableType();
+                sqlParam.SqlDbType = SqlDbType.Udt;
+                sqlParam.UdtTypeName = ColumnDefinition;
+            }
+            base.InitDbParam(p, fieldType);
         }
 
         public override object FromDbValue(Type fieldType, object value)
         {
-            if (((SqlHierarchyId)value).IsNull && fieldType.IsNullableType())
+            if (value == null || value is DBNull)
+                return SqlHierarchyId.Null;
+
+            if (value is SqlHierarchyId)
+                return (SqlHierarchyId)value;
+
+            if (value is string)
             {
-                return null;
+                return SqlHierarchyId.Parse(value.ToString());
             }
 
             return base.FromDbValue(fieldType, value);
         }
 
         public override object ToDbValue(Type fieldType, object value)
         {
-            if (value is SqlHierarchyId)
+            if (value == null || value is DBNull)
             {
-                return value;
+                return SqlHierarchyId.Null;
             }
 
-            if (value == null)
+            if (value is SqlHierarchyId)
             {
-                return SqlHierarchyId.Null;
+                return value;
             }
 
             if (value is string)

src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerTypeConverter.cs

@@ -7,14 +7,10 @@
 
 namespace ServiceStack.OrmLite.SqlServerTests.Converters
 {
-    public class SqlServerConvertersOrmLiteTestBase
+    public class SqlServer2012ConvertersOrmLiteTestBase : OrmLiteTestBase
     {
-        protected virtual string ConnectionString { get; set; }
-
-        public IDbConnection Db { get; set; }
-
         [TestFixtureSetUp]
-        public void TestFixtureSetUp()
+        public override void TestFixtureSetUp()
         {
             try
             {
@@ -23,7 +19,7 @@ public void TestFixtureSetUp()
                 // Appending the Sql Server Type System Version to use SqlServerSpatial110.dll (2012) assembly
                 // Sql Server defaults to SqlServerSpatial100.dll (2008 R2) even for versions greater
                 // https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlconnection.connectionstring.aspx
-                ConnectionString = ConfigurationManager.ConnectionStrings["testDb"].ConnectionString + ";Type System Version=SQL Server 2012;";
+                ConnectionString = ConfigurationManager.ConnectionStrings["testDb"].ConnectionString + "Type System Version=SQL Server 2012;";
 
                 var dialectProvider = SqlServerConverters.Configure(SqlServer2012Dialect.Provider);
 
@@ -34,18 +30,55 @@ public void TestFixtureSetUp()
                 throw ex;
             }
         }
+    }
 
-        public void Log(string text)
+    public class SqlServer2014ConvertersOrmLiteTestBase : SqlServer2012ConvertersOrmLiteTestBase
+    {
+        [TestFixtureSetUp]
+        public override void TestFixtureSetUp()
         {
-            Console.WriteLine(text);
+            try
+            {
+                LogManager.LogFactory = new ConsoleLogFactory();
+
+                // Appending the Sql Server Type System Version to use SqlServerSpatial110.dll (2012) assembly
+                // Sql Server defaults to SqlServerSpatial100.dll (2008 R2) even for versions greater
+                // https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlconnection.connectionstring.aspx
+                ConnectionString = ConfigurationManager.ConnectionStrings["testDb"].ConnectionString + "Type System Version=SQL Server 2014;";
+
+                var dialectProvider = SqlServerConverters.Configure(SqlServer2014Dialect.Provider);
+
+                Db = new OrmLiteConnectionFactory(ConnectionString, dialectProvider).OpenDbConnection();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
         }
+    }
 
-        public virtual IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)
+    public class SqlServer2016ConvertersOrmLiteTestBase : SqlServer2014ConvertersOrmLiteTestBase
+    {
+        [TestFixtureSetUp]
+        public override void TestFixtureSetUp()
         {
-            dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;
-            connString = connString ?? ConnectionString;
+            try
+            {
+                LogManager.LogFactory = new ConsoleLogFactory();
 
-            return new OrmLiteConnectionFactory(connString, dialectProvider).OpenDbConnection();
+                // Appending the Sql Server Type System Version to use SqlServerSpatial110.dll (2012) assembly
+                // Sql Server defaults to SqlServerSpatial100.dll (2008 R2) even for versions greater
+                // https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlconnection.connectionstring.aspx
+                ConnectionString = ConfigurationManager.ConnectionStrings["testDb"].ConnectionString + "Type System Version=SQL Server 2016;";
+
+                var dialectProvider = SqlServerConverters.Configure(SqlServer2016Dialect.Provider);
+
+                Db = new OrmLiteConnectionFactory(ConnectionString, dialectProvider).OpenDbConnection();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
         }
     }
 }