Skip to content

Commit 162e292

Browse files
author
Suraiya Hameed
authored
Merge pull request #113 from Microsoft/dev
For Release 6.1.2
2 parents eb14f63 + dd9b336 commit 162e292

File tree

92 files changed

+5532
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5532
-383
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: required
33
language: java
44
jdk:
55
- oraclejdk8
6-
6+
77
services:
88
- docker
99

@@ -21,4 +21,4 @@ before_script:
2121
script:
2222
- docker ps -a
2323
- mvn test -B -Pbuild41
24-
- mvn test -B -Pbuild42
24+
- mvn test -B -Pbuild42

‎CHANGELOG.md

+23-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55

6+
## [6.1.2]
7+
### Added
8+
- Socket timeout implementation for both connection string and data source [#85](https://github.com/Microsoft/mssql-jdbc/pull/85)
9+
- Query timeout API for datasource [#88](https://github.com/Microsoft/mssql-jdbc/pull/88)
10+
- Added connection tests [#95](https://github.com/Microsoft/mssql-jdbc/pull/95)
11+
- Added Support for FIPS enabled JVM [#97](https://github.com/Microsoft/mssql-jdbc/pull/97)
12+
- Added additional tests for bulk copy [#110] (https://github.com/Microsoft/mssql-jdbc/pull/110)
13+
14+
### Changed
15+
- Remove redundant type casts [#63](https://github.com/Microsoft/mssql-jdbc/pull/63)
16+
- Read SQL Server error message if status flag has DONE_ERROR set [#73](https://github.com/Microsoft/mssql-jdbc/pull/73)
17+
- Fix a bug when the value of queryTimeout is bigger than the max value of integer [#78](https://github.com/Microsoft/mssql-jdbc/pull/78)
18+
- Add new dependencies to gradle build script [#81](https://github.com/Microsoft/mssql-jdbc/pull/81)
19+
- Updates to test framework [#90](https://github.com/Microsoft/mssql-jdbc/pull/90)
20+
21+
### Fixed Issues
22+
- Set the jre8 version as default [#59](https://github.com/Microsoft/mssql-jdbc/issues/59)
23+
- Fixed exception SQL Server instance in use does not support column encryption [#65](https://github.com/Microsoft/mssql-jdbc/issues/65)
24+
- TVP Handling is causing exception when calling SP with return value [#80](https://github.com/Microsoft/mssql-jdbc/issues/80)
25+
- BigDecimal in TVP can incorrectly cause SQLServerException related to invalid precision or scale [#86](https://github.com/Microsoft/mssql-jdbc/issues/86)
26+
- Fixed the connection close issue on using variant type [#91] (https://github.com/Microsoft/mssql-jdbc/issues/91)
27+
28+
629
## [6.1.1]
730
### Added
831
- Java Docs [#46](https://github.com/Microsoft/mssql-jdbc/pull/46)
@@ -29,6 +52,3 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
2952
## [6.1.0]
3053
### Changed
3154
- Open Sourced.
32-
33-
34-

‎README.md

+9-10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ We hope you enjoy using the Microsoft JDBC Driver for SQL Server.
88

99
SQL Server Team
1010

11+
## Status of Most Recent Builds
12+
| AppVeyor (Windows) | Travis CI (Linux) |
13+
|--------------------------|--------------------------|
14+
| [![av-image][]][av-site] | [![tv-image][]][tv-site] |
15+
16+
[av-image]: https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true "Windows"
17+
[av-site]: https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc
18+
[tv-image]: https://travis-ci.org/Microsoft/mssql-jdbc.svg? "Linux"
19+
[tv-site]: https://travis-ci.org/Microsoft/mssql-jdbc
1120

1221
## Announcements
1322
What's coming next? We will look into adding a more comprehensive set of tests, improving our javadocs, and start developing the next set of features.
@@ -48,16 +57,6 @@ To build the jar files, you must use Java 8 with either Ant (with Ivy), Maven or
4857
* Run `gradle build -Pbuild=build41`. This creates JDBC 4.1 compliant jar in \build\libs directory
4958
* Run `gradle build -Pbuild=build42`. This creates JDBC 4.2 compliant jar in \build\libs directory
5059

51-
### Status of Most Recent Builds
52-
| AppVeyor (Windows) | Travis CI (Linux) |
53-
|--------------------------|--------------------------|
54-
| [![av-image][]][av-site] | [![tv-image][]][tv-site] |
55-
56-
[av-image]: https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true
57-
[av-site]: https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc
58-
[tv-image]: https://travis-ci.org/Microsoft/mssql-jdbc.svg?
59-
[tv-site]: https://travis-ci.org/Microsoft/mssql-jdbc
60-
6160
## Resources
6261

6362
### Documentation

‎build.gradle

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22

33
archivesBaseName = 'mssql-jdbc'
4-
version = '6.1.1'
4+
version = '6.1.2'
55

66
allprojects {
77
tasks.withType(JavaCompile) {
@@ -59,8 +59,17 @@ repositories {
5959
}
6060

6161
dependencies {
62-
compile 'com.microsoft.azure:azure-keyvault:0.9.7',
63-
'junit:junit:4.12'
62+
compile 'com.microsoft.azure:azure-keyvault:0.9.7'
63+
64+
testCompile 'junit:junit:4.12',
65+
'org.junit.platform:junit-platform-console:1.0.0-M3',
66+
'org.junit.platform:junit-platform-commons:1.0.0-M3',
67+
'org.junit.platform:junit-platform-engine:1.0.0-M3',
68+
'org.junit.platform:junit-platform-launcher:1.0.0-M3',
69+
'org.junit.platform:junit-platform-runner:1.0.0-M3',
70+
'org.junit.platform:junit-platform-surefire-provider:1.0.0-M3',
71+
'org.junit.jupiter:junit-jupiter-api:5.0.0-M3',
72+
'org.junit.jupiter:junit-jupiter-engine:5.0.0-M3'
6473
}
6574

6675

‎build.xml

+16-7
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,26 @@
44
</description>
55
<!-- set global properties for this build -->
66
<property name="artifactId" value="mssql-jdbc"/>
7-
<property name="version" value="6.1.1"/>
7+
<property name="version" value="6.1.2"/>
88

99
<property name="src" location="src/main/java"/>
1010
<property name="build" location="build"/>
11-
<property name="test" location="src/test/java"/>
11+
<property name="bvtTest" location="src/test/java/com/microsoft/sqlserver/jdbc/bvt/"/>
1212
<property name="bvtTest_Classes" location="${build}/classes/test/bvt"/>
1313

1414
<!-- download dependencies -->
1515
<ivy:resolve>
1616
<dependency org="com.microsoft.azure" name="azure-keyvault" rev="0.9.7"/>
1717
<dependency org="junit" name="junit" rev="4.12"/>
18+
<dependency org="org.junit.platform" name="junit-platform-console" rev="1.0.0-M3"/>
19+
<dependency org="org.junit.platform" name="junit-platform-commons" rev="1.0.0-M3"/>
20+
<dependency org="org.junit.platform" name="junit-platform-engine" rev="1.0.0-M3"/>
21+
<dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.0.0-M3"/>
22+
<dependency org="org.junit.platform" name="junit-platform-runner" rev="1.0.0-M3"/>
23+
<dependency org="org.junit.platform" name="junit-platform-surefire-provider" rev="1.0.0-M3"/>
24+
<dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.0.0-M3"/>
25+
<dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.0.0-M3"/>
26+
1827
</ivy:resolve>
1928

2029
<!-- retrieves all the dependencies of the resolve call to lib directory -->
@@ -96,7 +105,7 @@
96105

97106
<target name="compile_test"
98107
description="compile the junit source">
99-
<javac classpathref="${JDBC_VERSION}" srcdir="${test}"
108+
<javac classpathref="${JDBC_VERSION}" srcdir="${bvtTest}"
100109
destdir="${bvtTest_Classes}"
101110
encoding="UTF-8"
102111
source="${JAVA_VERSION}"
@@ -110,10 +119,10 @@
110119
<param name="JAVA_VERSION" value="1.7"/>
111120
<param name="JDBC_VERSION" value="test_classpath41"/>
112121
</antcall>
113-
<junit haltonfailure="true" printsummary="true" showoutput="true">
122+
<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
114123
<formatter type="plain" usefile="false" />
115124
<classpath><path refid="test_classpath41" /></classpath>
116-
<test name="bvtTest"></test>
125+
<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
117126
</junit>
118127
</target>
119128

@@ -122,10 +131,10 @@
122131
<param name="JAVA_VERSION" value="1.8"/>
123132
<param name="JDBC_VERSION" value="test_classpath42"/>
124133
</antcall>
125-
<junit haltonfailure="true" printsummary="true" showoutput="true">
134+
<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
126135
<formatter type="plain" usefile="false" />
127136
<classpath><path refid="test_classpath42" /></classpath>
128-
<test name="bvtTest"></test>
137+
<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
129138
</junit>
130139
</target>
131140

‎pom.xml

+69-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.microsoft.sqlserver</groupId>
66
<artifactId>mssql-jdbc</artifactId>
7-
<version>6.1.1</version>
7+
<version>6.1.2</version>
88

99
<packaging>jar</packaging>
1010

@@ -58,7 +58,63 @@
5858
<version>4.12</version>
5959
<scope>test</scope>
6060
</dependency>
61-
61+
62+
<dependency>
63+
<groupId>org.junit.platform</groupId>
64+
<artifactId>junit-platform-console</artifactId>
65+
<version>1.0.0-M3</version>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.junit.platform</groupId>
70+
<artifactId>junit-platform-commons</artifactId>
71+
<version>1.0.0-M3</version>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.junit.platform</groupId>
76+
<artifactId>junit-platform-engine</artifactId>
77+
<version>1.0.0-M3</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.junit.platform</groupId>
82+
<artifactId>junit-platform-launcher</artifactId>
83+
<version>1.0.0-M3</version>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.junit.platform</groupId>
88+
<artifactId>junit-platform-runner</artifactId>
89+
<version>1.0.0-M3</version>
90+
<scope>test</scope>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.junit.platform</groupId>
94+
<artifactId>junit-platform-surefire-provider</artifactId>
95+
<version>1.0.0-M3</version>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.junit.jupiter</groupId>
100+
<artifactId>junit-jupiter-api</artifactId>
101+
<version>5.0.0-M3</version>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.junit.jupiter</groupId>
106+
<artifactId>junit-jupiter-engine</artifactId>
107+
<version>5.0.0-M3</version>
108+
<scope>test</scope>
109+
</dependency>
110+
<!--
111+
<dependency>
112+
<groupId>org.junit.vintage</groupId>
113+
<artifactId>junit-vintage-engine</artifactId>
114+
<version>4.12.0-M3</version>
115+
<scope>test</scope>
116+
</dependency>
117+
-->
62118
</dependencies>
63119

64120
<profiles>
@@ -93,9 +149,12 @@
93149
</plugins>
94150
</build>
95151
</profile>
96-
152+
97153
<profile>
98154
<id>build42</id>
155+
<activation>
156+
<activeByDefault>true</activeByDefault>
157+
</activation>
99158
<build>
100159
<plugins>
101160
<plugin>
@@ -106,41 +165,41 @@
106165
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc41.java</exclude>
107166
</excludes>
108167
<source>1.8</source>
109-
<target>1.8</target>
168+
<target>1.8</target>
110169
</configuration>
111170
</plugin>
112171
<plugin>
113172
<groupId>org.apache.maven.plugins</groupId>
114173
<artifactId>maven-jar-plugin</artifactId>
115174
<version>3.0.2</version>
116175
<configuration>
117-
<finalName>${project.artifactId}-${project.version}.jre8</finalName>
176+
<finalName>${project.artifactId}-${project.version}.jre8</finalName>
118177
<archive>
119178
<manifest>
120179
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
121180
</manifest>
122181
</archive>
123182
</configuration>
124-
</plugin>
183+
</plugin>
125184
</plugins>
126185
</build>
127186
</profile>
128-
187+
129188
</profiles>
130189

131190
<build>
132191

133192
<resources>
134193
<resource>
135-
<directory>${basedir}</directory>
194+
<directory>${basedir}</directory>
136195
<includes>
137196
<include>META-INF/services/java.sql.Driver</include>
138197
</includes>
139198
</resource>
140199
</resources>
141-
200+
142201
<plugins>
143-
202+
144203
<plugin>
145204
<groupId>org.apache.maven.plugins</groupId>
146205
<artifactId>maven-source-plugin</artifactId>

‎src/main/java/com/microsoft/sqlserver/jdbc/DDC.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -706,15 +706,15 @@ else if (StreamType.CHARACTER == getterArgs.streamType ||
706706

707707
// Returns date portion of string.
708708
// Expects one of "<date>" or "<date><space><time>".
709-
private static final String getDatePart(String s)
709+
private static String getDatePart(String s)
710710
{
711711
int sp = s.indexOf(' ');
712712
if (-1 == sp) return s;
713713
return s.substring(0,sp);
714714
}
715715
// Returns time portion of string.
716716
// Expects one of "<time>" or "<date><space><time>".
717-
private static final String getTimePart(String s)
717+
private static String getTimePart(String s)
718718
{
719719
int sp = s.indexOf(' ');
720720
if (-1 == sp) return s;

0 commit comments

Comments
 (0)