From 69ba814833655738ee1c5b47d6476b65681ebc53 Mon Sep 17 00:00:00 2001 From: Richard DiCroce Date: Tue, 4 Oct 2022 14:42:34 -0400 Subject: [PATCH] MS SQL Server: replace old, unmaintained jTDS driver with mssql-jdbc --- pom.xml | 4 ++-- querydsl-jpa/pom.xml | 6 +++--- .../src/test/resources/META-INF/persistence.xml | 4 ++-- .../com/querydsl/jpa/testutil/mssql.properties | 4 ++-- querydsl-sql-codegen/pom.xml | 6 +++--- querydsl-sql-spatial/pom.xml | 6 +++--- querydsl-sql/pom.xml | 6 +++--- .../src/test/java/com/querydsl/sql/Connections.java | 11 +++-------- .../src/test/java/com/querydsl/sql/SelectBase.java | 3 +-- 9 files changed, 22 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 968bd8f41..af600c9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 42.3.4 11.2.0.4 8.0.29 - 1.3.1 + 11.2.1.jre8 9.3.9.0002 3.36.0.3 13.10.00.35 @@ -431,7 +431,7 @@ com.h2database:h2:*:*:compile org.apche.derby:derby:*:*:compile mysql:mysql-connector-java:*:*:compile - net.sourceforge.jtds:jtds:*:*:compile + com.microsoft.sqlserver:mssql-jdbc:*:*:compile com.oracle:ojdbc6:*:*:compile org.postgresql:postgresql:*:*:compile cubrid:cubrid-jdbc:*:*:compile diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml index af8dd9ed5..1993cf120 100644 --- a/querydsl-jpa/pom.xml +++ b/querydsl-jpa/pom.xml @@ -187,9 +187,9 @@ test - net.sourceforge.jtds - jtds - ${jtds.version} + com.microsoft.sqlserver + mssql-jdbc + ${mssql.version} test diff --git a/querydsl-jpa/src/test/resources/META-INF/persistence.xml b/querydsl-jpa/src/test/resources/META-INF/persistence.xml index 3b5b0bf82..5ad7132c7 100644 --- a/querydsl-jpa/src/test/resources/META-INF/persistence.xml +++ b/querydsl-jpa/src/test/resources/META-INF/persistence.xml @@ -235,8 +235,8 @@ - - + + diff --git a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties index 10fbdc982..b7b000204 100644 --- a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties +++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties @@ -1,7 +1,7 @@ ## MSSQL hibernate.dialect=com.querydsl.jpa.support.QSQLServer2008Dialect -hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sqlserver://localhost:1433/tempdb +hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver +hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true hibernate.connection.username=sa hibernate.connection.password=Password1! diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml index 445c6b9b1..a59bf2b64 100644 --- a/querydsl-sql-codegen/pom.xml +++ b/querydsl-sql-codegen/pom.xml @@ -103,9 +103,9 @@ - net.sourceforge.jtds - jtds - ${jtds.version} + com.microsoft.sqlserver + mssql-jdbc + ${mssql.version} test diff --git a/querydsl-sql-spatial/pom.xml b/querydsl-sql-spatial/pom.xml index 693c0599b..324fe4596 100644 --- a/querydsl-sql-spatial/pom.xml +++ b/querydsl-sql-spatial/pom.xml @@ -130,9 +130,9 @@ test - net.sourceforge.jtds - jtds - ${jtds.version} + com.microsoft.sqlserver + mssql-jdbc + ${mssql.version} test diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml index e71d30143..ead2f035b 100644 --- a/querydsl-sql/pom.xml +++ b/querydsl-sql/pom.xml @@ -118,9 +118,9 @@ test - net.sourceforge.jtds - jtds - ${jtds.version} + com.microsoft.sqlserver + mssql-jdbc + ${mssql.version} test diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java index b920955af..955f8a9c4 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -136,14 +136,9 @@ public final class Connections { } private static Connection getSQLServer() throws ClassNotFoundException, SQLException { - Class.forName("net.sourceforge.jtds.jdbc.Driver"); - Properties props = new Properties(); - props.put("user", "sa"); - props.put("password", "Password1!"); - props.put("sendTimeAsDatetime", "false"); - String url = "jdbc:jtds:sqlserver://localhost:1433/tempdb"; -// return DriverManager.getConnection(url, "querydsl", "querydsl"); - return DriverManager.getConnection(url, props); + Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); + String url = "jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true"; + return DriverManager.getConnection(url, "sa", "Password1!"); } private static Connection getCubrid() throws ClassNotFoundException, SQLException { diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java index f981fb2dd..bd9fc5e38 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -1687,8 +1687,7 @@ public class SelectBase extends AbstractBaseTest { standardTest.runStringTests(employee.firstname, employee2.firstname, "Jennifer"); Target target = Connections.getTarget(); - if (target != SQLITE && target != SQLSERVER) { - // jTDS driver does not support TIME SQL data type + if (target != SQLITE) { standardTest.runTimeTests(employee.timefield, employee2.timefield, time); }