Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored deegree-dialect-mssql module and upgraded JDBC driver for SQL Server #1445

Merged
merged 4 commits into from
Feb 8, 2023
Merged

Refactored deegree-dialect-mssql module and upgraded JDBC driver for SQL Server #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff727e3
1322 refactoring classes from commons to mssql dialect
tfr42 Dec 22, 2022
7293b20
#1322 upgrades JDBC driver to version 10.2
tfr42 Dec 30, 2022
22b0af5
#1322 revert version from dependency
tfr42 Dec 30, 2022
3eaae54
#1322 added dependency to root pom for postgis-geometry
tfr42 Dec 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deegree-core/deegree-core-geometry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<artifactId>postgis-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<groupId>net.postgis</groupId>
<artifactId>postgis-geometry</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 5 additions & 1 deletion deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.2.2.jre8</version>
<version>10.2.2.jre11</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -46,6 +46,10 @@
<artifactId>deegree-core-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

</project>
4 changes: 1 addition & 3 deletions ...ect/deegree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@
import org.deegree.sqldialect.filter.AbstractWhereBuilder;
import org.deegree.sqldialect.filter.PropertyNameMapper;
import org.deegree.sqldialect.filter.UnmappableException;
import org.deegree.sqldialect.filter.mssql.MSSQLGeometryConverter;
import org.deegree.sqldialect.filter.mssql.MSSQLWhereBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.deegree.sqldialect.AbstractSQLDialect;

/**
* {@link SQLDialect} for Microsoft SQL databases.
* {@link SQLDialect} for Microsoft SQL Server databases.
*
* @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
* @author <a href="mailto:schneider@lat-lon.de">Markus Schneider</a>
Expand Down
2 changes: 1 addition & 1 deletion ...ree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialectProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.slf4j.Logger;

/**
* {@link SqlDialectProvider} for Microsoft SQL databases.
* {@link SqlDialectProvider} for Microsoft SQL Server databases.
*
* @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
* @author last edited by: $Author: schneider $
Expand Down
4 changes: 2 additions & 2 deletions .../filter/mssql/MSSQLGeometryConverter.java → ...dialect/mssql/MSSQLGeometryConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

e-mail: info@deegree.org
----------------------------------------------------------------------------*/
package org.deegree.sqldialect.filter.mssql;
package org.deegree.sqldialect.mssql;

import static org.slf4j.LoggerFactory.getLogger;

Expand All @@ -52,7 +52,7 @@
import org.slf4j.Logger;

/**
* {@link GeometryParticleConverter} for PostGIS databases.
* {@link GeometryParticleConverter} for Microsoft SQL Server databases.
*
* @author <a href="mailto:schneider@lat-lon.de">Markus Schneider</a>
* @author last edited by: $Author: mschneider $
Expand Down
2 changes: 1 addition & 1 deletion ...alect/filter/mssql/MSSQLWhereBuilder.java → ...e/sqldialect/mssql/MSSQLWhereBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

e-mail: info@deegree.org
----------------------------------------------------------------------------*/
package org.deegree.sqldialect.filter.mssql;
package org.deegree.sqldialect.mssql;

import static java.sql.Types.BOOLEAN;
import static org.deegree.commons.tom.primitive.BaseType.DECIMAL;
Expand Down
2 changes: 1 addition & 1 deletion ...t/filter/mssql/MSSQLWhereBuilderTest.java → ...ldialect/mssql/MSSQLWhereBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

e-mail: info@deegree.org
----------------------------------------------------------------------------*/
package org.deegree.sqldialect.filter.mssql;
package org.deegree.sqldialect.mssql;

import org.deegree.commons.tom.primitive.PrimitiveValue;
import org.deegree.commons.xml.CommonNamespaces;
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,11 @@
<artifactId>postgis-jdbc</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-geometry</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down