From 62bdcd1bb2dab3afbc86d0579feb28beba8b93ce Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Thu, 28 Aug 2014 09:53:16 +0100
Subject: [PATCH] 1.33: SqlGeometry (core) and DbGeometry (EF) support

---
 Dapper NET40/Properties/AssemblyInfo.cs       |  4 +-
 Dapper NET40/SqlMapper.cs                     | 11 +++--
 .../Properties/AssemblyInfo.cs                |  4 +-
 Dapper.Contrib/Properties/AssemblyInfo.cs     |  4 +-
 .../Dapper.EntityFramework NET40.csproj       | 10 ++++-
 .../Properties/AssemblyInfo.cs                | 36 ---------------
 .../Dapper.EntityFramework NET45.csproj       |  1 +
 .../DbGeometryHandler.cs                      | 45 +++++++++++++++++++
 Dapper.EntityFramework NET45/Handlers.cs      |  1 +
 .../Properties/AssemblyInfo.cs                |  1 -
 Dapper.EntityFramework.nuspec                 |  4 +-
 Dapper.SqlBuilder/Properties/AssemblyInfo.cs  |  4 +-
 DapperTests NET35/Properties/AssemblyInfo.cs  |  4 +-
 DapperTests NET45/Properties/AssemblyInfo.cs  |  4 +-
 Tests/Properties/AssemblyInfo.cs              |  4 +-
 Tests/Tests.cs                                | 18 +++++---
 dapper.nuspec                                 |  3 +-
 17 files changed, 93 insertions(+), 65 deletions(-)
 delete mode 100644 Dapper.EntityFramework NET40/Properties/AssemblyInfo.cs
 create mode 100644 Dapper.EntityFramework NET45/DbGeometryHandler.cs

diff --git a/Dapper NET40/Properties/AssemblyInfo.cs b/Dapper NET40/Properties/AssemblyInfo.cs
index c266cc1a..5e8e55e7 100644
--- a/Dapper NET40/Properties/AssemblyInfo.cs	
+++ b/Dapper NET40/Properties/AssemblyInfo.cs	
@@ -32,5 +32,5 @@ using System;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/Dapper NET40/SqlMapper.cs b/Dapper NET40/SqlMapper.cs
index 925c62d4..0a6a7a6f 100644
--- a/Dapper NET40/SqlMapper.cs	
+++ b/Dapper NET40/SqlMapper.cs	
@@ -839,11 +839,14 @@ namespace Dapper
             {
                 return DbType.Object;
             }
-            if(type.FullName == "Microsoft.SqlServer.Types.SqlGeography")
+            switch (type.FullName)
             {
-                handler = new UdtTypeHandler("GEOGRAPHY");
-                AddTypeHandler(type, handler);
-                return DbType.Object;
+                case "Microsoft.SqlServer.Types.SqlGeography":
+                    AddTypeHandler(type, handler = new UdtTypeHandler("GEOGRAPHY"));
+                    return DbType.Object;
+                case "Microsoft.SqlServer.Types.SqlGeometry":
+                    AddTypeHandler(type, handler = new UdtTypeHandler("GEOMETRY"));
+                    return DbType.Object;
             }
             throw new NotSupportedException(string.Format("The member {0} of type {1} cannot be used as a parameter value", name, type));
         }
diff --git a/Dapper.Contrib.Tests/Properties/AssemblyInfo.cs b/Dapper.Contrib.Tests/Properties/AssemblyInfo.cs
index 869cf580..10613ac7 100644
--- a/Dapper.Contrib.Tests/Properties/AssemblyInfo.cs
+++ b/Dapper.Contrib.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/Dapper.Contrib/Properties/AssemblyInfo.cs b/Dapper.Contrib/Properties/AssemblyInfo.cs
index c3bfc737..07083a77 100644
--- a/Dapper.Contrib/Properties/AssemblyInfo.cs
+++ b/Dapper.Contrib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/Dapper.EntityFramework NET40/Dapper.EntityFramework NET40.csproj b/Dapper.EntityFramework NET40/Dapper.EntityFramework NET40.csproj
index f9125c2c..97a04426 100644
--- a/Dapper.EntityFramework NET40/Dapper.EntityFramework NET40.csproj	
+++ b/Dapper.EntityFramework NET40/Dapper.EntityFramework NET40.csproj	
@@ -57,10 +57,15 @@
     <Compile Include="..\Dapper.EntityFramework NET45\DbGeographyHandler.cs">
       <Link>DbGeographyHandler.cs</Link>
     </Compile>
+    <Compile Include="..\Dapper.EntityFramework NET45\DbGeometryHandler.cs">
+      <Link>DbGeometryHandler.cs</Link>
+    </Compile>
     <Compile Include="..\Dapper.EntityFramework NET45\Handlers.cs">
       <Link>Handlers.cs</Link>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\Dapper.EntityFramework NET45\Properties\AssemblyInfo.cs">
+      <Link>AssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="SqlServerTypes\Loader.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -92,6 +97,9 @@
       <Name>Dapper NET40</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Dapper.EntityFramework NET40/Properties/AssemblyInfo.cs b/Dapper.EntityFramework NET40/Properties/AssemblyInfo.cs
deleted file mode 100644
index 29636014..00000000
--- a/Dapper.EntityFramework NET40/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Dapper.EntityFramework NET40")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Dapper.EntityFramework NET40")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("85331b38-d6e0-41f6-b1ed-b27a8747f827")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Dapper.EntityFramework NET45/Dapper.EntityFramework NET45.csproj b/Dapper.EntityFramework NET45/Dapper.EntityFramework NET45.csproj
index b5e0498a..0cd85121 100644
--- a/Dapper.EntityFramework NET45/Dapper.EntityFramework NET45.csproj	
+++ b/Dapper.EntityFramework NET45/Dapper.EntityFramework NET45.csproj	
@@ -52,6 +52,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DbGeometryHandler.cs" />
     <Compile Include="DbGeographyHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Handlers.cs" />
diff --git a/Dapper.EntityFramework NET45/DbGeometryHandler.cs b/Dapper.EntityFramework NET45/DbGeometryHandler.cs
new file mode 100644
index 00000000..89c6ac20
--- /dev/null
+++ b/Dapper.EntityFramework NET45/DbGeometryHandler.cs	
@@ -0,0 +1,45 @@
+using Microsoft.SqlServer.Types;
+using System;
+using System.Data;
+using System.Data.Entity.Spatial;
+using System.Data.SqlClient;
+
+namespace Dapper.EntityFramework
+{
+    /// <summary>
+    /// Type-handler for the DbGeometry spatial type
+    /// </summary>
+    public class DbGeometryHandler : Dapper.SqlMapper.TypeHandler<DbGeometry>
+    {
+        /// <summary>
+        /// Create a new handler instance
+        /// </summary>
+        protected DbGeometryHandler() { }
+        /// <summary>
+        /// Default handler instance
+        /// </summary>
+        public static readonly DbGeometryHandler Default = new DbGeometryHandler();
+        /// <summary>
+        /// Assign the value of a parameter before a command executes
+        /// </summary>
+        /// <param name="parameter">The parameter to configure</param>
+        /// <param name="value">Parameter value</param>
+        public override void SetValue(IDbDataParameter parameter, DbGeometry value)
+        {
+            parameter.Value = value == null ? (object)DBNull.Value : (object)SqlGeometry.Parse(value.AsText());
+            if (parameter is SqlParameter)
+            {
+                ((SqlParameter)parameter).UdtTypeName = "GEOMETRY";
+            }
+        }
+        /// <summary>
+        /// Parse a database value back to a typed value
+        /// </summary>
+        /// <param name="value">The value from the database</param>
+        /// <returns>The typed value</returns>
+        public override DbGeometry Parse(object value)
+        {
+            return (value == null || value is DBNull) ? null : DbGeometry.FromText(value.ToString());
+        }
+    }
+}
diff --git a/Dapper.EntityFramework NET45/Handlers.cs b/Dapper.EntityFramework NET45/Handlers.cs
index c89e6384..26a06a6d 100644
--- a/Dapper.EntityFramework NET45/Handlers.cs	
+++ b/Dapper.EntityFramework NET45/Handlers.cs	
@@ -11,6 +11,7 @@
         public static void Register()
         {
             SqlMapper.AddTypeHandler(DbGeographyHandler.Default);
+            SqlMapper.AddTypeHandler(DbGeometryHandler.Default);
         }
     }
 }
diff --git a/Dapper.EntityFramework NET45/Properties/AssemblyInfo.cs b/Dapper.EntityFramework NET45/Properties/AssemblyInfo.cs
index 0df1d2c0..790774b6 100644
--- a/Dapper.EntityFramework NET45/Properties/AssemblyInfo.cs	
+++ b/Dapper.EntityFramework NET45/Properties/AssemblyInfo.cs	
@@ -31,6 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Dapper.EntityFramework.nuspec b/Dapper.EntityFramework.nuspec
index 38387bca..31c363ef 100644
--- a/Dapper.EntityFramework.nuspec
+++ b/Dapper.EntityFramework.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata schemaVersion="2">
     <id>Dapper.EntityFramework</id>
-    <version>1.26</version>
+    <version>1.33</version>
     <title>Dapper entity framework type handlers</title>
     <authors>Marc Gravell</authors>
     <owners>Marc Gravell</owners>
@@ -14,7 +14,7 @@
     <tags>orm sql micro-orm</tags>
     <dependencies>
       <dependency id="EntityFramework" version="6.1.1" />
-      <dependency id="Dapper" version="1.26" />
+      <dependency id="Dapper" version="1.33" />
     </dependencies>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Core"/>
diff --git a/Dapper.SqlBuilder/Properties/AssemblyInfo.cs b/Dapper.SqlBuilder/Properties/AssemblyInfo.cs
index f4530780..1e8c26c5 100644
--- a/Dapper.SqlBuilder/Properties/AssemblyInfo.cs
+++ b/Dapper.SqlBuilder/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/DapperTests NET35/Properties/AssemblyInfo.cs b/DapperTests NET35/Properties/AssemblyInfo.cs
index 03291f4a..a2c70649 100644
--- a/DapperTests NET35/Properties/AssemblyInfo.cs	
+++ b/DapperTests NET35/Properties/AssemblyInfo.cs	
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/DapperTests NET45/Properties/AssemblyInfo.cs b/DapperTests NET45/Properties/AssemblyInfo.cs
index 415421e2..acc2b79f 100644
--- a/DapperTests NET45/Properties/AssemblyInfo.cs	
+++ b/DapperTests NET45/Properties/AssemblyInfo.cs	
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
index 8e66ad3c..bc3e504e 100644
--- a/Tests/Properties/AssemblyInfo.cs
+++ b/Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.32.0.0")]
-[assembly: AssemblyFileVersion("1.32.0.0")]
+[assembly: AssemblyVersion("1.33.0.0")]
+[assembly: AssemblyFileVersion("1.33.0.0")]
diff --git a/Tests/Tests.cs b/Tests/Tests.cs
index bc7a02ea..9dd76b36 100644
--- a/Tests/Tests.cs
+++ b/Tests/Tests.cs
@@ -2986,45 +2986,51 @@ option (optimize for (@vals unKnoWn))";
         {
             public int Id { get; set; }
             public DbGeography Geo { get; set; }
+            public DbGeometry Geometry { get; set; }
         }
         class HazSqlGeo
         {
             public int Id { get; set; }
             public SqlGeography Geo { get; set; }
+            public SqlGeometry Geometry { get; set; }
         }
         public void DBGeography_SO24405645_SO24402424()
         {
             Dapper.EntityFramework.Handlers.Register();
 
-            connection.Execute("create table #Geo (id int, geo geography)");
+            connection.Execute("create table #Geo (id int, geo geography, geometry geometry)");
 
             var obj = new HazGeo
             {
                 Id = 1,
-                Geo = DbGeography.LineFromText("LINESTRING(-122.360 47.656, -122.343 47.656 )", 4326)
+                Geo = DbGeography.LineFromText("LINESTRING(-122.360 47.656, -122.343 47.656 )", 4326),
+                Geometry = DbGeometry.LineFromText("LINESTRING (100 100, 20 180, 180 180)", 0)
             };
-            connection.Execute("insert #Geo(id, geo) values (@Id, @Geo)", obj);
+            connection.Execute("insert #Geo(id, geo, geometry) values (@Id, @Geo, @Geometry)", obj);
             var row = connection.Query<HazGeo>("select * from #Geo where id=1").SingleOrDefault();
             row.IsNotNull();
             row.Id.IsEqualTo(1);
             row.Geo.IsNotNull();
+            row.Geometry.IsNotNull();
         }
 
         public void SqlGeography_SO25538154()
         {
             Dapper.SqlMapper.ResetTypeHandlers();
-            connection.Execute("create table #SqlGeo (id int, geo geography)");
+            connection.Execute("create table #SqlGeo (id int, geo geography, geometry geometry)");
 
             var obj = new HazSqlGeo
             {
                 Id = 1,
-                Geo = SqlGeography.STLineFromText(new SqlChars(new SqlString("LINESTRING(-122.360 47.656, -122.343 47.656 )")), 4326)
+                Geo = SqlGeography.STLineFromText(new SqlChars(new SqlString("LINESTRING(-122.360 47.656, -122.343 47.656 )")), 4326),
+                Geometry = SqlGeometry.STLineFromText(new SqlChars(new SqlString("LINESTRING (100 100, 20 180, 180 180)")), 0)
             };
-            connection.Execute("insert #SqlGeo(id, geo) values (@Id, @Geo)", obj);
+            connection.Execute("insert #SqlGeo(id, geo, geometry) values (@Id, @Geo, @Geometry)", obj);
             var row = connection.Query<HazSqlGeo>("select * from #SqlGeo where id=1").SingleOrDefault();
             row.IsNotNull();
             row.Id.IsEqualTo(1);
             row.Geo.IsNotNull();
+            row.Geometry.IsNotNull();
         }
 
         public void TypeBasedViaDynamic()
diff --git a/dapper.nuspec b/dapper.nuspec
index f38dfc0a..e3a46b77 100644
--- a/dapper.nuspec
+++ b/dapper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata schemaVersion="2">
     <id>Dapper</id>
-    <version>1.32</version>
+    <version>1.33</version>
     <title>Dapper dot net</title>
     <authors>Sam Saffron,Marc Gravell</authors>
     <owners>Sam Saffron,Marc Gravell</owners>
@@ -19,6 +19,7 @@
       <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0-Client, .NETFramework4.0" />
     </frameworkAssemblies>
     <releaseNotes>
+      * 1.33    - Support for SqlGeometry (core) and DbGeometry (EF)
       * 1.32    - Support for SqlGeography in core library
       * 1.31    - Fix issue with error message when there is a column/type mismatch
       * 1.30    - Better async cancellation