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.

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

Merge dev to master for 6.5.4 release #733

Merged
merged 123 commits into from
Jun 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
838ddd7
623 fix
peterbae Feb 23, 2018
92a164a
623 change stash
peterbae Feb 27, 2018
4daa214
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into gi…
peterbae Feb 27, 2018
5e251c9
Prepared Statement Caching fix for 'handle not found' errors
cheenamalhotra Mar 6, 2018
c582d76
Merge branch 'dev' into github-623
peterbae Mar 6, 2018
bfa21eb
Fix for PS Caching issue - Calling reset instead of on type def changes
cheenamalhotra Mar 7, 2018
c80c93e
Updated comparison
cheenamalhotra Mar 8, 2018
7978516
Change back assert check.
cheenamalhotra Mar 8, 2018
f091eff
Adding call to removeReference back + Fix for Batch processes intermi…
cheenamalhotra Mar 12, 2018
cbd3158
Merge branch 'dev' into pstmt_caching
cheenamalhotra Mar 13, 2018
2909654
Removed DBName and made changes to resetPrepStmtHandle method
cheenamalhotra Apr 3, 2018
c3365fb
Check for null handle before proceed
cheenamalhotra Apr 5, 2018
2754d87
Merge branch 'ms-dev' into pstmt_caching_ongit
cheenamalhotra Apr 10, 2018
560c0ea
Merge branch 'pstmt_caching' into pstmt_caching_ongit
cheenamalhotra Apr 11, 2018
0b1d915
Adding Old Constrcutor back to AKV Implementation
cheenamalhotra Apr 12, 2018
43f6e91
Making baseURL final
cheenamalhotra Apr 12, 2018
433abda
Remove unnecessary code.
cheenamalhotra Apr 12, 2018
b727aa0
Use Bulk Copy API for batch insert operation
peterbae Apr 20, 2018
52da9aa
Parse bug fixing and test added
peterbae Apr 27, 2018
e0281cb
Merge branch 'dev' into pstmt_caching
cheenamalhotra Apr 30, 2018
5bb79a2
bug fix + additional tests
peterbae May 1, 2018
5cf28ad
change reflection for testing
peterbae May 1, 2018
59d29d7
more test changes
peterbae May 1, 2018
dc42708
Add parsing logic for -- comment
peterbae May 1, 2018
f67cad1
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae May 3, 2018
dca4cb5
refactoring
peterbae May 3, 2018
1c6a186
Merge branch 'dev' into batch-insert-improvement
cheenamalhotra May 3, 2018
8f036b1
Update snapshot
peterbae May 4, 2018
58f4f1d
Merge pull request #694 from peterbae/snapshot-update
cheenamalhotra May 5, 2018
80112c5
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae May 7, 2018
8ed14fe
Merge branch 'batch-insert-improvement' of https://github.com/peterba…
peterbae May 7, 2018
b67ccfb
Bug fix / testing change
peterbae May 8, 2018
a677b28
Reflect comment change
peterbae May 8, 2018
1c32278
Merge branch 'dev' into pstmt_caching
cheenamalhotra May 9, 2018
ab6ad0c
Merge branch 'dev' into akv-old-constructor
cheenamalhotra May 11, 2018
e05abee
Feature | AKV Old Constructor changes - Reformatted code + Deprecated…
cheenamalhotra May 12, 2018
7d89b06
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into gi…
peterbae May 14, 2018
195c601
Merge branch 'github-623' of https://github.com/peterbae/mssql-jdbc i…
peterbae May 14, 2018
8cf4afb
Mark computed columns as IS_GENERATEDCOLUMN in the result set returne…
ulvii May 15, 2018
633fe83
Merge branch 'dev' into akv-old-constructor
cheenamalhotra May 15, 2018
4b128db
fix issue with redirection
peterbae May 15, 2018
d27677b
Fix | PS Caching - Remove commented lines
cheenamalhotra May 22, 2018
f1789e4
Merge branch 'dev' into pstmt_caching
cheenamalhotra May 23, 2018
c48cef5
Trigger Appveyor test
cheenamalhotra May 23, 2018
fc1303c
Fix | AKV Old Constructor - Calling the other constructor instead.
cheenamalhotra May 23, 2018
252cacd
Fix | Reversed null checks
cheenamalhotra May 23, 2018
e3bdaec
Resolving alignment problems and comments
cheenamalhotra May 24, 2018
feaa8c3
Merge pull request #675 from cheenamalhotra/akv-old-constructor
cheenamalhotra May 25, 2018
60b437e
Refactor two Bulk files into a common parent
peterbae May 25, 2018
8604ff4
javadoc changes
peterbae May 25, 2018
9cb981a
Applied formatter
cheenamalhotra May 25, 2018
0ba04de
Merge branch 'dev' into pstmt_caching
cheenamalhotra May 25, 2018
34d8bb1
fix problem with precision / scale
peterbae May 28, 2018
cbea8bd
Fix | Fix some of the Javadoc warnings (#702)
ulvii May 28, 2018
39060b7
fix issue with setting all to true
peterbae May 29, 2018
1153362
Resolved maven build warnings and java warnings regarding deprecated …
rene-ye May 29, 2018
d61f6fa
Merge branch 'dev' into pstmt_caching
cheenamalhotra May 29, 2018
d80908e
make bamoo fixes
peterbae May 29, 2018
4f1b3e1
resource bundle for junit test error strings (#698)
lilgreenbird May 29, 2018
f713515
Merge branch 'dev' into pstmt_caching
cheenamalhotra May 29, 2018
eb312a0
Merge pull request #644 from peterbae/github-623
peterbae May 29, 2018
a409708
Merge pull request #648 from cheenamalhotra/pstmt_caching
cheenamalhotra May 29, 2018
aa34276
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae May 30, 2018
8d044b1
undo some changes made to SQLServerConnection
peterbae May 30, 2018
70bea50
apply resource bundling changes
peterbae May 30, 2018
ae8d4a1
Add support for JDK 10 in both Maven and Gradle (#691)
cheenamalhotra May 31, 2018
99a2e0f
Kerberos Constrained Delegation Impersonated Credential Expiry fix (#…
rene-ye May 31, 2018
5c6ccd3
changes for 6.5.3 preview release
rene-ye May 31, 2018
6a3f676
Revert "changes for 6.5.3 preview release"
rene-ye Jun 1, 2018
c8e638d
Changes in preparation for 6.5.3 preview release (#710)
rene-ye Jun 1, 2018
c3f0a21
snapshot updates post release
rene-ye Jun 1, 2018
15a01c9
Merge pull request #714 from rene-ye/dev-post-release
rene-ye Jun 1, 2018
8b45a21
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae Jun 4, 2018
c204354
remove on_dw, and remove redundant fmtonly
peterbae Jun 5, 2018
f218fe3
formatting
peterbae Jun 5, 2018
a8dcc9e
fix for getSchema when using "-" in name
rene-ye Jun 6, 2018
3c5d023
Reformatting + adding more tests
peterbae Jun 6, 2018
dcd63d3
inherit the connection property in statement + fix issue with null / …
peterbae Jun 8, 2018
5887439
Request Boundary methods - beginRequest()/endRequest() implementation…
ulvii Jun 8, 2018
29cc48c
added error message in resource file and changed files accordingly
peterbae Jun 12, 2018
c322174
comment revisions
peterbae Jun 13, 2018
ba8fd5c
use TestResource
peterbae Jun 13, 2018
0700749
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae Jun 14, 2018
b713507
test changes
rene-ye Jun 18, 2018
876a375
drop database before creating
rene-ye Jun 18, 2018
a968dd9
Merge pull request #44 from Microsoft/dev
rene-ye Jun 18, 2018
4c85049
replaced dropDBIfExists with Utils function
rene-ye Jun 18, 2018
fc78177
added try-with-resources nest
rene-ye Jun 18, 2018
7dd2d42
Fixing logic / adding more tests
peterbae Jun 19, 2018
84acbb8
dont use test database in tests
peterbae Jun 19, 2018
38bcdc6
Change exception handling as per JDBC specs
peterbae Jun 20, 2018
3cb80b3
Add | Add missing license headers (#725)
ulvii Jun 20, 2018
3fbb7d2
Merge pull request #718 from rene-ye/issue715
rene-ye Jun 20, 2018
11deb1a
Merge branch 'dev' into spatial-datatypes-error-message
ulvii Jun 20, 2018
b4d4b26
remove some comments
peterbae Jun 20, 2018
48139e7
Enable verify data (#724)
rene-ye Jun 20, 2018
61b78d7
Fix | Refactored socket creation to simplify handling of socket creation
sehrope Jun 21, 2018
cc86123
Merge branch 'dev' into spatial-datatypes-error-message
cheenamalhotra Jun 21, 2018
c34e1a9
Merge pull request #723 from peterbae/spatial-datatypes-error-message
peterbae Jun 21, 2018
9b7f40c
reflect comments
peterbae Jun 22, 2018
c6f8011
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae Jun 22, 2018
abc9851
Add support for UTF-8 feature extension. (#722)
ulvii Jun 22, 2018
405b47e
changed how logger works, refactored code in SQLServerBulkCommon due …
peterbae Jun 22, 2018
66c0b19
add more tests, make the prepared statement property go away
peterbae Jun 22, 2018
09d7967
Feature | Introduce support for "Data Classification Specifications" …
cheenamalhotra Jun 23, 2018
0b65647
Merge branch 'dev' into batch-insert-improvement
cheenamalhotra Jun 24, 2018
80b396a
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ba…
peterbae Jun 25, 2018
d2d5d23
Merge branch 'batch-insert-improvement' of https://github.com/peterba…
peterbae Jun 25, 2018
2369bb2
Added getter/setter public for the useBulkCopyForBatchInsert connecti…
peterbae Jun 25, 2018
bae637c
Change implementation of child classes a bit
peterbae Jun 25, 2018
397a1f4
Remove dependencies from tests that are from outside required libraries
peterbae Jun 26, 2018
d63dc9f
also remove hex from DBTable
peterbae Jun 26, 2018
b8afb58
Fix bamboo problem + refactor test code
peterbae Jun 26, 2018
096d78e
Replace all connection and statements with try blocks
peterbae Jun 26, 2018
bf880f1
change spacing
peterbae Jun 27, 2018
02ef8d8
refactor code
peterbae Jun 27, 2018
523fdfe
refactoring
peterbae Jun 27, 2018
6ddd9d0
Merge pull request #686 from peterbae/batch-insert-improvement
peterbae Jun 27, 2018
9b871b8
Merge pull request #729 from peterbae/remove_dependencies
peterbae Jun 27, 2018
18abb70
Fix | Making driver default compliant to JDBC 4.2 Specs and update AD…
cheenamalhotra Jun 29, 2018
641a44a
6.5.4 preview release changelog (#731)
peterbae Jun 29, 2018
173b814
Merge branch 'master' into dev
cheenamalhotra Jun 29, 2018
f8b061f
Fix Conflict issues with master branch
cheenamalhotra Jun 30, 2018
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
20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.

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

## [6.5.4] Preview Release
### Added
- Added new connection property "useBulkCopyForBatchInsert" to enable Bulk Copy API support for batch insert operation [#686](https://github.com/Microsoft/mssql-jdbc/pull/686)
- Added implementation for Java 9 introduced Boundary methods APIs on Connection interface [#708](https://github.com/Microsoft/mssql-jdbc/pull/708)
- Added support for "Data Classification Specifications" on fetched resultsets [#709](https://github.com/Microsoft/mssql-jdbc/pull/709)
- Added support for UTF-8 feature extension [#722](https://github.com/Microsoft/mssql-jdbc/pull/722)

### Fixed Issues
- Fixed issue with escaping catalog name when retrieving from database metadata [#718](https://github.com/Microsoft/mssql-jdbc/pull/718)
- Fixed issue with tests requiring additional dependencies [#729](https://github.com/Microsoft/mssql-jdbc/pull/729)

### Changed
- Made driver default compliant to JDBC 4.2 specifications [#711](https://github.com/Microsoft/mssql-jdbc/pull/711)
- Updated ADAL4J dependency version to 1.6.0 [#711](https://github.com/Microsoft/mssql-jdbc/pull/711)
- Cleaned up socket handling implementation to generalize functionality for different JVMs and simplified the logic for single address case [#663](https://github.com/Microsoft/mssql-jdbc/pull/663)

## [6.5.3] Preview Release
### Added
- Added removed constructor back to AKV Provider which supports authentication with a customized method to fetch accessToken [#675](https://github.com/Microsoft/mssql-jdbc/pull/675)
Expand Down Expand Up @@ -35,7 +51,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)

## [6.5.1] Preview Release
### Added
- Test cases for Date, Time, and Datetime2 data types. [#558](https://github.com/Microsoft/mssql-jdbc/pull/558)
- Test cases for Date, Time, and Datetime2 data types [#558](https://github.com/Microsoft/mssql-jdbc/pull/558)

### Fixed Issues
- Fixed an issue where ResultSetMetadata returned incorrect columnType for Geometry and Geography data types [#657](https://github.com/Microsoft/mssql-jdbc/pull/657)
Expand Down Expand Up @@ -93,7 +109,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)

## [6.3.4] Preview Release
### Added
- Added new ThreadGroup creation to prevent IllegalThreadStateException if the underlying ThreadGroup has been destroyed. [#474](https://github.com/Microsoft/mssql-jdbc/pull/474)
- Added new ThreadGroup creation to prevent IllegalThreadStateException if the underlying ThreadGroup has been destroyed [#474](https://github.com/Microsoft/mssql-jdbc/pull/474)
- Added try-with-resources to JUnit tests [#520](https://github.com/Microsoft/mssql-jdbc/pull/520)

### Fixed Issues
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ To get the latest preview version of the driver, add the following to your POM f
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.5.3.jre10-preview</version>
<version>6.5.4.jre10-preview</version>
</dependency>
```

Expand Down Expand Up @@ -118,14 +118,14 @@ Projects that require either of the two features need to explicitly declare the
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.5.3.jre10-preview</version>
<version>6.5.4.jre10-preview</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
</dependency>
```

Expand All @@ -134,14 +134,14 @@ Projects that require either of the two features need to explicitly declare the
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.5.3.jre10-preview</version>
<version>6.5.4.jre10-preview</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

apply plugin: 'java'

version = '6.5.3'
version = '6.5.4'
def jreVersion = ""
def testOutputDir = file("build/classes/java/test")
def archivesBaseName = 'mssql-jdbc'
Expand Down Expand Up @@ -79,7 +79,7 @@ repositories {

dependencies {
compile 'com.microsoft.azure:azure-keyvault:1.0.0',
'com.microsoft.azure:adal4j:1.5.0'
'com.microsoft.azure:adal4j:1.6.0'
testCompile 'junit:junit:4.12',
'org.junit.platform:junit-platform-console:1.2.0',
'org.junit.platform:junit-platform-commons:1.2.0',
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.5.3</version>
<version>6.5.4</version>
<packaging>jar</packaging>

<name>Microsoft JDBC Driver for SQL Server</name>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<optional>true</optional>
</dependency>

Expand Down
Loading