Skip to content

Commit 3b44118

Browse files
authored
Merge pull request #131 from peetw/remove-postgis-1
Remove support for PostGIS 1.x
2 parents b695295 + 74d5fe2 commit 3b44118

25 files changed

+732
-1074
lines changed

NHibernate.Spatial.PostGis/Dialect/PostGis20Dialect.cs

Lines changed: 532 additions & 6 deletions
Large diffs are not rendered by default.

NHibernate.Spatial.PostGis/Dialect/PostGisDialect.cs

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

NHibernate.Spatial.PostGis/Metadata/GeometryColumn.PostGisDialect.hbm.xml

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

NHibernate.Spatial.PostGis/Metadata/SpatialReferenceSystem.PostGisDialect.hbm.xml

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

NHibernate.Spatial.PostGis/NHibernate.Spatial.PostGis.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@
1515

1616
<ItemGroup>
1717
<None Remove="Metadata\GeometryColumn.PostGis20Dialect.hbm.xml" />
18-
<None Remove="Metadata\GeometryColumn.PostGisDialect.hbm.xml" />
1918
<None Remove="Metadata\SpatialReferenceSystem.PostGis20Dialect.hbm.xml" />
20-
<None Remove="Metadata\SpatialReferenceSystem.PostGisDialect.hbm.xml" />
2119
</ItemGroup>
2220

2321
<ItemGroup>
2422
<EmbeddedResource Include="Metadata\GeometryColumn.PostGis20Dialect.hbm.xml" />
25-
<EmbeddedResource Include="Metadata\GeometryColumn.PostGisDialect.hbm.xml" />
2623
<EmbeddedResource Include="Metadata\SpatialReferenceSystem.PostGis20Dialect.hbm.xml" />
27-
<EmbeddedResource Include="Metadata\SpatialReferenceSystem.PostGisDialect.hbm.xml" />
2824
</ItemGroup>
2925

3026
<ItemGroup>

NHibernate.Spatial.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.NHibernate.Spatial.My
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.NHibernate.Spatial.MySQL57", "Tests.NHibernate.Spatial.MySQL57\Tests.NHibernate.Spatial.MySQL57.csproj", "{1825222A-AC75-48B4-8283-BA5FEEE4AC7E}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.NHibernate.Spatial.PostGis", "Tests.NHibernate.Spatial.PostGis\Tests.NHibernate.Spatial.PostGis.csproj", "{D3DFBAD4-92B3-4CA6-9867-6CFCD1449457}"
21-
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.NHibernate.Spatial.PostGis20", "Tests.NHibernate.Spatial.PostGis20\Tests.NHibernate.Spatial.PostGis20.csproj", "{DAEF5C4F-234D-402D-96E5-1B2CB6EBF10E}"
2321
EndProject
2422
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Spatial.MsSql", "NHibernate.Spatial.MsSql\NHibernate.Spatial.MsSql.csproj", "{3BA49B38-653B-4B24-8F2D-3416B07AAA5D}"
@@ -66,10 +64,6 @@ Global
6664
{1825222A-AC75-48B4-8283-BA5FEEE4AC7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
6765
{1825222A-AC75-48B4-8283-BA5FEEE4AC7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
6866
{1825222A-AC75-48B4-8283-BA5FEEE4AC7E}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{D3DFBAD4-92B3-4CA6-9867-6CFCD1449457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{D3DFBAD4-92B3-4CA6-9867-6CFCD1449457}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{D3DFBAD4-92B3-4CA6-9867-6CFCD1449457}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{D3DFBAD4-92B3-4CA6-9867-6CFCD1449457}.Release|Any CPU.Build.0 = Release|Any CPU
7367
{DAEF5C4F-234D-402D-96E5-1B2CB6EBF10E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7468
{DAEF5C4F-234D-402D-96E5-1B2CB6EBF10E}.Debug|Any CPU.Build.0 = Debug|Any CPU
7569
{DAEF5C4F-234D-402D-96E5-1B2CB6EBF10E}.Release|Any CPU.ActiveCfg = Release|Any CPU

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ The code has been updated to compile with the latest NTS, GeoAPI and NHibernate
1111
| [NHibernate.Spatial.MySQL](https://www.nuget.org/packages/NHibernate.Spatial.MySQL) | [![NuGet Status](http://img.shields.io/nuget/v/NHibernate.Spatial.MySQL.svg?style=flat)](http://www.nuget.org/packages/NHibernate.Spatial.MySQL) |
1212
| [NHibernate.Spatial.PostGis](https://www.nuget.org/packages/NHibernate.Spatial.PostGis) | [![NuGet Status](http://img.shields.io/nuget/v/NHibernate.Spatial.PostGis.svg?style=flat)](http://www.nuget.org/packages/NHibernate.Spatial.PostGis) |
1313

14+
## Supported Databases
15+
16+
| Package | Minimum Version | CI Tests |
17+
| ------- | --------------- | -------- |
18+
| NHibernate.Spatial.MsSql | SQL Server 2008 | SQL Server 2008, SQL Server 2012 |
19+
| NHibernate.Spatial.MySQL | MySQL 5.6 | MySQL 5.6, MySQL 5.7 |
20+
| NHibernate.Spatial.PostGis | PostgreSQL 10 w/ PostGIS 2.5 <sup>1</sup> | PostgreSQL 10 w/ PostGIS 2.5, PostgreSQL 14 w/ PostGIS 3.2 |
21+
22+
<sup>1</sup> PostgreSQL 9.1 w/ PostGIS 2.0 or later will likely work, but are not explicitly supported here as they are EOL (see [here](https://trac.osgeo.org/postgis/wiki/UsersWikiPostgreSQLPostGIS#PostGISSupportMatrix)).
23+
1424
## Getting Started
1525
For configuring your application, please refer to [Configuration and Mapping](http://nhibernate.info/doc/spatial/configuration-and-mapping.html) on the NHForge Wiki.
1626
Furthermore you can read about [sample usage](http://nhibernate.info/doc/spatial/sample-usage.html). For an updated in-depth look at NHibernate.Spatial, you can

Tests.NHibernate.Spatial.PostGis/PostGisConformanceItemsFixture.cs

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

Tests.NHibernate.Spatial.PostGis/PostGisCriteriaFixture.cs

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

Tests.NHibernate.Spatial.PostGis/PostGisNtsTestCasesFixture.cs

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

0 commit comments

Comments
 (0)