Skip to content

Push dev to Master post release v7.1.1#810

Merged
cheenamalhotra merged 9 commits intomasterfrom
dev
Sep 28, 2018
Merged

Push dev to Master post release v7.1.1#810
cheenamalhotra merged 9 commits intomasterfrom
dev

Conversation

@cheenamalhotra
Copy link
Member

No description provided.

cheenamalhotra and others added 9 commits August 29, 2018 15:41
* Update driver patch for next release.

* Modify test to always check for equal Driver version and Build versions.
1st part of Junit test cleanup:
-  use try-with-resources on closeables and fix leaks
- get rid shared variables between tests
- move testframework/util/Util.java to TestUtil (part of work get rid of testframework)
1. Removing the catch block, because the driver should not blindly send attention packets. To cancel a query, attention packets should only be sent if the client has already sent a request, which has the last packet with EOM bit (0x01) set in status. If a complete request has not been sent to the server, the driver MUST send the next packet with both ignore bit (0x02) and EOM bit (0x01) set in the status to cancel the request (2.2.1.7 of TDS Technical Documentation). This is already properly handled in IOBuffer.execute(), which is the only method that calls doInsertBulk().
2. Adding this.tdsMessageType == TDS.PKT_BULK, because prior to TDS.PKT_BULK, the driver has already sent INSERT BULK SQL statement to the server, which in case of an exception needs to be cancelled too.
…se the stream for Clobs/NClobs (#799)

Addresses #788. Also addressed an issue where varchar(max)/Clob objects were always being encoded to UTF-16LE instead of using the Collation specified in the Clob object.

List of Changes (the following applies to NClob as well):

1. calling Clob.length() no longer attempts to load the stream into a string. This fixes a null pointer issue as well as length() closing user streams.
2. added streaming capabilities for Clob.getAsciiStream(). NClobs will always have a non-streaming implementation for getAsciiStream().
3. Clobs no longer default to UTF-16LE. Clobs now respect the collation from the SQL Server. NClobs remain unchanged, will always be UTF-16LE encoding.
@codecov-io
Copy link

codecov-io commented Sep 28, 2018

Codecov Report

Merging #810 into master will increase coverage by 0.48%.
The diff coverage is 42.78%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #810      +/-   ##
============================================
+ Coverage     48.23%   48.72%   +0.48%     
- Complexity     2788     2817      +29     
============================================
  Files           116      116              
  Lines         27862    27878      +16     
  Branches       4641     4651      +10     
============================================
+ Hits          13440    13583     +143     
+ Misses        12201    12162      -39     
+ Partials       2221     2133      -88
Flag Coverage Δ Complexity Δ
#JDBC42 48.27% <42.78%> (+0.55%) 2776 <4> (+33) ⬆️
#JDBC43 48.35% <42.78%> (+0.18%) 2789 <4> (+4) ⬆️
Impacted Files Coverage Δ Complexity Δ
...om/microsoft/sqlserver/jdbc/SimpleInputStream.java 54.41% <ø> (+1.47%) 12 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/PLPInputStream.java 59.52% <ø> (+6.54%) 34 <0> (+5) ⬆️
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java 62.46% <0%> (+0.08%) 0 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLServerNClob.java 74.07% <100%> (+4.5%) 13 <3> (+1) ⬆️
...m/microsoft/sqlserver/jdbc/SQLServerException.java 78.94% <100%> (+1.67%) 33 <0> (+2) ⬆️
...oft/sqlserver/jdbc/SQLServerPreparedStatement.java 52.23% <100%> (-0.01%) 216 <0> (-1)
...in/java/com/microsoft/sqlserver/jdbc/IOBuffer.java 56.55% <100%> (+2.33%) 0 <0> (ø) ⬇️
...c/main/java/com/microsoft/sqlserver/jdbc/Util.java 62.06% <100%> (+1.8%) 93 <1> (+6) ⬆️
... and 20 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 6c761ea...593ffb1. Read the comment docs.

@cheenamalhotra cheenamalhotra merged commit de44ae4 into master Sep 28, 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