CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-04 21:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

MS SQL Server: replace old, unmaintained jTDS driver with mssql-jdbc

Browse Source
This commit is contained in:
Richard DiCroce 2022-10-04 14:42:34 -04:00
parent 657a29346f
commit 69ba814833
9 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -47,7 +47,7 @@
<postgresql.version>42.3.4</postgresql.version>
<oracle.version>11.2.0.4</oracle.version>
<mysql.version>8.0.29</mysql.version>
<jtds.version>1.3.1</jtds.version>
<mssql.version>11.2.1.jre8</mssql.version>
<cubrid.version>9.3.9.0002</cubrid.version>
<sqlite.version>3.36.0.3</sqlite.version>
<teradata.version>13.10.00.35</teradata.version>
@ -431,7 +431,7 @@
<exclude>com.h2database:h2:*:*:compile</exclude>
<exclude>org.apche.derby:derby:*:*:compile</exclude>
<exclude>mysql:mysql-connector-java:*:*:compile</exclude>
<exclude>net.sourceforge.jtds:jtds:*:*:compile</exclude>
<exclude>com.microsoft.sqlserver:mssql-jdbc:*:*:compile</exclude>
<exclude>com.oracle:ojdbc6:*:*:compile</exclude>
<exclude>org.postgresql:postgresql:*:*:compile</exclude>
<exclude>cubrid:cubrid-jdbc:*:*:compile</exclude>

6
querydsl-jpa/pom.xml
View File

@ -187,9 +187,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql.version}</version>
<scope>test</scope>
</dependency>
<dependency>

4
querydsl-jpa/src/test/resources/META-INF/persistence.xml
View File

@ -235,8 +235,8 @@
<properties>
<property name="hibernate.archive.autodetection" value="class" />
<property name="hibernate.dialect" value="com.querydsl.jpa.support.QSQLServer2008Dialect" />
<property name="hibernate.connection.driver_class" value="net.sourceforge.jtds.jdbc.Driver" />
<property name="hibernate.connection.url" value="jdbc:jtds:sqlserver://localhost:1433/tempdb" />
<property name="hibernate.connection.driver_class" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
<property name="hibernate.connection.url" value="jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true" />
<property name="hibernate.connection.username" value="sa" />
<property name="hibernate.connection.password" value="Password1!" />
<!-- <property name="hibernate.show_sql" value="true"/> -->

4
querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties
View File

@ -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!

6
querydsl-sql-codegen/pom.xml
View File

@ -103,9 +103,9 @@
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql.version}</version>
<scope>test</scope>
</dependency>
<dependency>

6
querydsl-sql-spatial/pom.xml
View File

@ -130,9 +130,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql.version}</version>
<scope>test</scope>
</dependency>
<dependency>

6
querydsl-sql/pom.xml
View File

@ -118,9 +118,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql.version}</version>
<scope>test</scope>
</dependency>
<dependency>

11
querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
View File

@ -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 {

3
querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
View File

@ -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);
}