Skip to content

merge dev to master for 6.3.2#479

Merged
xiangyushawn merged 69 commits intomasterfrom
dev
Sep 6, 2017
Merged

merge dev to master for 6.3.2#479
xiangyushawn merged 69 commits intomasterfrom
dev

Conversation

@xiangyushawn
Copy link
Copy Markdown
Contributor

No description provided.

ulvii and others added 30 commits July 28, 2017 13:23
This removes duplicated information when instantiating variables, and increases the readability. For example:

```Java
EnumMap<CallableHandles, HandleAssociation> handleMap =
      new EnumMap<CallableHandles, HandleAssociation>(CallableHandles.class);
```

becomes

```Java
EnumMap<CallableHandles, HandleAssociation> handleMap =
            new EnumMap<>(CallableHandles.class);
```

and

```Java
private static final EnumMap<SSType.Category, EnumSet<JDBCType.Category>> conversionMap =
            new EnumMap<SSType.Category, EnumSet<JDBCType.Category>>(SSType.Category.class);
```

becomes

```Java
private static final EnumMap<SSType.Category, EnumSet<JDBCType.Category>> conversionMap =
                new EnumMap<>(SSType.Category.class);
```
This increases the overall readability of the code, and has been supported since Java 5.
Replace tabs with spaces
Fixed issue with returning class type of time object in sql_variant
update error messages for localization
AfsanehR-zz and others added 26 commits August 28, 2017 14:44
…l_variant_temproal_fix

# Conflicts:
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java
sql_variant issue with String type
Fixed issue with throwing error message for unsupported datatype.
…de-impact-setNull

Make send string parameter as unicode impact set/update null
* Fixing a few mistakes in SQLServerResource

* Fix the test
* Removing fipsProvider connection property

* Minor fix

* Update IOBuffer.java

Fix typo

* update FipsTest
Replace for and while loops with foeach loops
Replace explicit types with <> (The diamond operator).
@codecov-io
Copy link
Copy Markdown

codecov-io commented Sep 6, 2017

Codecov Report

Merging #479 into master will decrease coverage by 0.06%.
The diff coverage is 60.78%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #479      +/-   ##
============================================
- Coverage     46.37%   46.31%   -0.07%     
- Complexity     2204     2207       +3     
============================================
  Files           108      108              
  Lines         25212    25231      +19     
  Branches       4165     4173       +8     
============================================
- Hits          11693    11686       -7     
- Misses        11492    11526      +34     
+ Partials       2027     2019       -8
Flag Coverage Δ Complexity Δ
#JDBC41 46.08% <60.78%> (-0.11%) 2197 <11> (+3)
#JDBC42 46.19% <60.78%> (+0.08%) 2204 <11> (+13) ⬆️
Impacted Files Coverage Δ Complexity Δ
...rc/main/java/com/microsoft/sqlserver/jdbc/DDC.java 44.26% <ø> (-1.13%) 104 <0> (-1)
...osoft/sqlserver/jdbc/SQLServerBulkCopyOptions.java 73.91% <ø> (ø) 16 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...main/java/com/microsoft/sqlserver/jdbc/Column.java 34.54% <ø> (ø) 34 <0> (ø) ⬇️
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...c/main/java/com/microsoft/sqlserver/jdbc/Util.java 59.17% <0%> (-0.65%) 88 <0> (-1)
.../microsoft/sqlserver/jdbc/SQLServerXAResource.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...om/microsoft/sqlserver/jdbc/JaasConfiguration.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...n/java/com/microsoft/sqlserver/jdbc/Parameter.java 62.44% <0%> (-1.29%) 63 <0> (+1)
... and 46 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 00c2207...756bbb5. Read the comment docs.

@xiangyushawn xiangyushawn merged commit 19af32b into master Sep 6, 2017
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.

10 participants