Skip to content

Commit d079428

Browse files
committed
Replace Microsoft.SqlServer.Types with NTS SqlServerBytes
1 parent e531577 commit d079428

18 files changed

+109
-1193
lines changed

NHibernate.Spatial.MsSql/Dialect/MsSql2008GeographyDialect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace NHibernate.Spatial.Dialect
2323
public class MsSql2008GeographyDialect : MsSql2008SpatialDialect
2424
{
2525

26-
private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeographyType), null);
26+
private static readonly IType geometryType = new CustomType(typeof(MsSqlGeographyType), null);
2727

2828
public MsSql2008GeographyDialect()
2929
: base("geography", "NHSP_GEOGRAPHY_COLUMNS", geometryType)
@@ -36,7 +36,7 @@ public MsSql2008GeographyDialect()
3636
/// <returns></returns>
3737
public override IGeometryUserType CreateGeometryUserType()
3838
{
39-
return new MsSql2008GeographyType();
39+
return new MsSqlGeographyType();
4040
}
4141
}
4242
}

NHibernate.Spatial.MsSql/Dialect/MsSql2008GeometryDialect.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ namespace NHibernate.Spatial.Dialect
2323
public class MsSql2008GeometryDialect : MsSql2008SpatialDialect
2424
{
2525

26-
private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeometryType), null);
26+
private static readonly IType geometryType = new CustomType(typeof(MsSqlGeometryType), null);
2727

2828
public MsSql2008GeometryDialect()
29-
: base("geometry", "NHSP_GEOMETRY_COLUMNS",geometryType)
29+
: base("geometry", "NHSP_GEOMETRY_COLUMNS", geometryType)
3030
{
3131
}
3232

@@ -36,7 +36,7 @@ public MsSql2008GeometryDialect()
3636
/// <returns></returns>
3737
public override IGeometryUserType CreateGeometryUserType()
3838
{
39-
return new MsSql2008GeometryType();
39+
return new MsSqlGeometryType();
4040
}
4141
}
4242
}

NHibernate.Spatial.MsSql/Dialect/MsSql2012GeographyDialect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace NHibernate.Spatial.Dialect
2222
{
2323
public class MsSql2012GeographyDialect : MsSql2012SpatialDialect
2424
{
25-
private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeographyType), null);
25+
private static readonly IType geometryType = new CustomType(typeof(MsSqlGeographyType), null);
2626

2727
public MsSql2012GeographyDialect()
2828
: base("geography", "NHSP_GEOGRAPHY_COLUMNS", geometryType)
@@ -34,7 +34,7 @@ public MsSql2012GeographyDialect()
3434
/// <returns></returns>
3535
public override IGeometryUserType CreateGeometryUserType()
3636
{
37-
return new MsSql2008GeographyType();
37+
return new MsSqlGeographyType();
3838
}
3939
}
4040
}

NHibernate.Spatial.MsSql/Dialect/MsSql2012GeometryDialect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace NHibernate.Spatial.Dialect
2222
{
2323
public class MsSql2012GeometryDialect : MsSql2012SpatialDialect
2424
{
25-
private static readonly IType geometryType = new CustomType(typeof(MsSql2008GeometryType), null);
25+
private static readonly IType geometryType = new CustomType(typeof(MsSqlGeometryType), null);
2626

2727
public MsSql2012GeometryDialect()
2828
: base("geometry", "NHSP_GEOMETRY_COLUMNS", geometryType)
@@ -34,7 +34,7 @@ public MsSql2012GeometryDialect()
3434
/// <returns></returns>
3535
public override IGeometryUserType CreateGeometryUserType()
3636
{
37-
return new MsSql2008GeometryType();
37+
return new MsSqlGeometryType();
3838
}
3939
}
4040
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.SqlServer.Types" Version="11.0.2" />
15+
<PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="1.15.1" />
16+
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
1617
</ItemGroup>
1718

1819
<ItemGroup>

NHibernate.Spatial.MsSql/Type/MsSql2008GeographyReader.cs

Lines changed: 0 additions & 46 deletions
This file was deleted.

NHibernate.Spatial.MsSql/Type/MsSql2008GeographyType.cs

Lines changed: 0 additions & 106 deletions
This file was deleted.

NHibernate.Spatial.MsSql/Type/MsSql2008GeographyWriter.cs

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)