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 into master for 6.5.0 preview #650

Merged
merged 73 commits into from
Mar 9, 2018
Merged

Merge dev into master for 6.5.0 preview #650

merged 73 commits into from
Mar 9, 2018

Conversation

rene-ye
Copy link
Member

@rene-ye rene-ye commented Mar 9, 2018

No description provided.

peterbae and others added 30 commits September 27, 2017 14:23
Fills the contents of a blob and makes it availible for use after the RS or statement has been closed. Addresses the TDS issue from #567.
Fix to issue #611, where calling length() would close the stream.
To debug a random mismatch error which can't be reproduced locally.
don't attempt mismatch logic if there's no columns to look for. fall through to sql server and do a lookup on the first column.
fix for automatic credential discarding
To debug a random mismatch error which can't be reproduced locally.
removed arraylist to avoid costly traversal. Blobs now fill anytime the resultset moves its cursor.
added tests which specifically test blob streams and behavior after the RS is closed.
rene-ye and others added 26 commits March 5, 2018 12:45
Misleading error message fix, added fall through logic
Fix to the persistence of blobs, and a small adjustment on how the blob retrieves its length when streaming.
…rypted column (#632)

* Workaround for #624

* Apply the fix to only variable length types

* Adding comments
* initial fix

added an error code to determine if the query has timed out. Statement will attempt to catch a timeout error, and throw java.sql.TimeoutException if it does.

* shortened implementation

more readable, and shorter

* Exception handling fixes

* quick fix for junit test

changed test to expect the new SQLTimeoutException

* cleaning up implementation

less catching, more throwing.

* moved implementation into SQLServerException

Have the exception handle setting its own properties instead of setting it in IOBuffer where it's out of place.

* Update IOBuffer.java

* test changes

changed tests to expect SQLException instead of SQLServerException.

* Revert ISQLServerBulkRecord

reverted typed changes due to possibility of breaking customer applications.

* Updating comments

* Update SQLServerXAResource.java

* Changed string compare

Handles a case where strings would be translated and the error would not be thrown

* fixed redundent exception throwing

fixed an error where the script replaced SQLServerException would produce "throw SQLException, SQLException"
Changes in preparation for 6.5.0 release
6.5.0 preview release readme change
@codecov-io
Copy link

codecov-io commented Mar 9, 2018

Codecov Report

Merging #650 into master will increase coverage by 1.86%.
The diff coverage is 82.08%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #650      +/-   ##
============================================
+ Coverage     46.62%   48.49%   +1.86%     
- Complexity     2227     2608     +381     
============================================
  Files           109      113       +4     
  Lines         25409    26574    +1165     
  Branches       4187     4429     +242     
============================================
+ Hits          11847    12887    +1040     
- Misses        11529    11642     +113     
- Partials       2033     2045      +12
Flag Coverage Δ Complexity Δ
#JDBC42 48.44% <82.08%> (+1.92%) 2605 <350> (+382) ⬆️
#JDBC43 48.07% <82.08%> (+1.65%) 2576 <350> (+358) ⬆️
Impacted Files Coverage Δ Complexity Δ
src/main/java/microsoft/sql/Types.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...soft/sqlserver/jdbc/SQLServerDatabaseMetaData.java 36.03% <ø> (ø) 55 <0> (ø) ⬇️
.../microsoft/sqlserver/jdbc/SQLServerXAResource.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...oft/sqlserver/jdbc/SQLServerCallableStatement.java 30.44% <0%> (-0.05%) 96 <0> (ø)
...n/java/com/microsoft/sqlserver/jdbc/DataTypes.java 78.01% <100%> (+0.22%) 5 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/SQLServerException.java 78.86% <100%> (+2%) 32 <0> (+3) ⬆️
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java 63.41% <100%> (+0.2%) 0 <0> (ø) ⬇️
...rc/main/java/com/microsoft/sqlserver/jdbc/DDC.java 45.41% <100%> (+0.26%) 108 <0> (+4) ⬆️
...m/microsoft/sqlserver/jdbc/SQLServerStatement.java 59.91% <100%> (+0.46%) 138 <0> (+7) ⬆️
... and 26 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 e8ad454...0766990. Read the comment docs.

@rene-ye rene-ye merged commit b1b5904 into master Mar 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants