Skip to content

Merge dev to master (pre RTW release 6.4.0)#631

Merged
cheenamalhotra merged 111 commits intomasterfrom
dev
Feb 27, 2018
Merged

Merge dev to master (pre RTW release 6.4.0)#631
cheenamalhotra merged 111 commits intomasterfrom
dev

Conversation

@cheenamalhotra
Copy link
Copy Markdown
Member

@cheenamalhotra cheenamalhotra commented Feb 21, 2018

No description provided.

AfsanehR-zz and others added 30 commits September 24, 2017 20:14
@AfsanehR-zz
removing java.xml.bind dependency
40edfde
@AfsanehR-zz
removed dependency of java.xml.bind and updated pom file with latest …
380ab87 
…javadoc pluggin.
@AfsanehR-zz
disabled appveyor and updated travic to use java 9
04e4a0b
@AfsanehR-zz
Fixed NoSuchMethodError when compiling with Java 9 but running on jav…
0b094dc 
…a 8 and lower.
@AfsanehR-zz
add support for JDBC 4.3 APIs and throw unsupported exceptions for th…
022d747 
…ose not implemented yet. Also updated the jdbc file to include building jre8 jar.
@AfsanehR-zz
fixed the javadoc warnings.
98f9f65
@AfsanehR-zz
update SQLServerJdbc41 to throw unsupportedError for 4.3 APIs
7ed782d
@xiangyushawn
works for AAD integrated on driver side changes
b42c200
@xiangyushawn
remove hardcoded username from exception message
d95575b
@xiangyushawn
cleanup
9d604ee
@xiangyushawn
remove error message when running AAD integrated on non-windows OS
c399a60
@xiangyushawn
read user name from kerberos TGT client name
db5f09f
@xiangyushawn
add error message when Future's outcome has no AuthenticationResult b…
1cc1170 
…ut exception
@nsidhaye
Version Update Configuration Rules.
0691598
@nsidhaye
Added outdated-dependencies.txt in .gitignore
74e12a9
@xiangyushawn
if password is null, it means AAD integrated auth
8004cdf
@AfsanehR-zz
remove apache code for encoder and remove 4.1 compaitble jars
1c389e8
@AfsanehR-zz
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into Java9
8ef32d8 
# Conflicts:
#	pom.xml
@AfsanehR-zz
Merge pull request #565 from Microsoft/dev
6f9fec6 
Update JDBC4.3 branch with latest changes from Dev branch
@AfsanehR-zz
updated dependency versions in pom file for jdbc 4.3 branch
778d3ee
@AfsanehR-zz
Merge pull request #566 from v-afrafi/Java9
8c7f465 
Java 9 Updates for JDBC4.3 branch only
@AfsanehR-zz
update samples in JDBC 4.3 branch + change the the junit.platform.ver…
27b9414 
…sion
@AfsanehR-zz
Merge pull request #570 from v-afrafi/Java9
b1dbacc 
Update samples in JDBC 4.3 branch
@AfsanehR-zz
update sendTimeAsDateTime property to false.
f1674af
@AfsanehR-zz
remove deprecated APIs
7ec7356
@AfsanehR-zz
add more catch blocks for new getDeclaredConstructor method.
3a21346
@AfsanehR-zz
update Travis script with official support of jdk 9
9540cce
@AfsanehR-zz
fix comment
24486c9
@AfsanehR-zz
update readme file
47ddc43
@AfsanehR-zz
Merge pull request #577 from v-afrafi/Java9
7a2bbef 
Removal of deprecated APIs and update travic script with jdk 9
AfsanehR-zz and others added 25 commits January 31, 2018 12:44
@AfsanehR-zz
add the setter and getter methods for disableStatementPooling property
b8e9ff9
@cheenamalhotra
Merge pull request #616 from Microsoft/preSendTime
6c79be8 
Change back 'sendTimeAsDatetime' property's default value to 'true'
@AfsanehR-zz
move same code in a function.
af76bfc
@AfsanehR-zz
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into re…
fee85b2 
…tryLogic
@AfsanehR-zz
update for jdk9
d6d8310
@AfsanehR-zz
prepare cache in setDisableStatementPooling()
a237ebe
@AfsanehR-zz
a small fix
63ab78f
@AfsanehR-zz
fixed the double insertion issue with retry
dbefa1c
@AfsanehR-zz
fixed some review comments and updated test to use raiseError
870e853
@AfsanehR-zz
added a fix with connection property
f523ca9
@AfsanehR-zz
added unit Tests
6ed48e2
@cheenamalhotra
Merge pull request #619 from v-afrafi/appveyor
12d5eae 
Update Appveyor for jdk9
@cheenamalhotra
Revert back needsPrepare check in retryBasedOnFailedReuseOfCachedHandle
e221b32
@cheenamalhotra
Remove unwanted method parameter
9ae0843
@cheenamalhotra
Merge pull request #618 from AfsanehR/retryLogic
a64b9ef 
Re-introduce Retry logic for prepared statement caching
@cheenamalhotra
Update changelog and driver version for RTW release
74dd4c2
@cheenamalhotra
Minor Fix
89c552b
@cheenamalhotra
Minor change to update to jre9
77ff9de
@cheenamalhotra
Added needsPrepare Check and removed error code 99586 check
ff1f049
@cheenamalhotra
Added check for needsPrepare and removed 99586 check + Moved NeedsPre…
ba2460c 
…pare to class level declaration to avoid multi-threading issues.
@cheenamalhotra
Moved 'needsPrepare' to local variable.
0eb0a61
@cheenamalhotra
Defaulting needsPrepare to true.
ea723f6
@cheenamalhotra
Merge pull request #629 from cheenamalhotra/retry-fix
782dd1b 
Added needsPrepare Check and removed error code 99586 check
@cheenamalhotra
Moving JDK9 support to added section
d6a4d35
@cheenamalhotra
Merge pull request #626 from cheenamalhotra/dev
9277451 
Update changelog and driver version for RTW 6.4 release
@codecov-io
Copy link
Copy Markdown

codecov-io commented Feb 21, 2018 •
edited
Loading

Codecov Report

Merging #631 into master will decrease coverage by 0.09%.
The diff coverage is 46.08%.

Impacted file tree graph

@@             Coverage Diff             @@
##             master     #631     +/-   ##
===========================================
- Coverage     46.65%   46.55%   -0.1%     
- Complexity     2221     2226      +5     
===========================================
  Files           108      109      +1     
  Lines         25335    25409     +74     
  Branches       4177     4187     +10     
===========================================
+ Hits          11820    11830     +10     
- Misses        11488    11546     +58     
- Partials       2027     2033      +6
Flag Coverage Δ Complexity Δ
#JDBC41 ? ?
#JDBC42 46.39% <44.98%> (-0.09%) 2214 <21> (+2)
#JDBC43 46.46% <44.71%> (?) 2225 <21> (?)
Impacted Files Coverage Δ Complexity Δ
...oft/sqlserver/jdbc/SQLServerResultSetMetaData.java 40.97% <ø> (ø) 23 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/SQLServerResultSet.java 33.27% <ø> (+0.05%) 245 <0> (+1) ⬆️
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...ncurrentlinkedhashmap/ConcurrentLinkedHashMap.java 38.75% <ø> (-0.64%) 42 <0> (-2)
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/KerbAuthentication.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...t/sqlserver/jdbc/SQLServerConnectionPoolProxy.java 14.65% <ø> (-0.45%) 14 <0> (ø)
...erverColumnEncryptionCertificateStoreProvider.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...microsoft/sqlserver/jdbc/SQLServerADAL4JUtils.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java 63.2% <0%> (-0.04%) 0 <0> (ø)
... and 42 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b09a02e...9277451. Read the comment docs.

@cheenamalhotra cheenamalhotra requested a review from ulvii February 21, 2018 21:06
@cheenamalhotra cheenamalhotra added this to the 6.4.0 milestone Feb 23, 2018
@cheenamalhotra cheenamalhotra merged commit e8ad454 into master Feb 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@ulvii ulvii ulvii approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

6.4.0

Development

Successfully merging this pull request may close these issues.

8 participants

@cheenamalhotra @codecov-io @ulvii @AfsanehR-zz @xiangyushawn @nsidhaye @peterbae @rene-ye