Skip to content

Merging in Dev to Master for 6.3.0 release#415

Merged
peterbae merged 134 commits intomasterfrom
dev
Jul 28, 2017
Merged

Merging in Dev to Master for 6.3.0 release#415
peterbae merged 134 commits intomasterfrom
dev

Conversation

@peterbae
Copy link
Copy Markdown
Contributor

No description provided.

AfsanehR-zz and others added 30 commits January 26, 2017 15:26
… will be only for getters and adding the test
…lVariant

# Conflicts:
#	src/main/java/com/microsoft/sqlserver/jdbc/PLPInputStream.java

resolved conflicts
Sql_Variant initial development
Java offers two kinds of multi line comments /** and /*.
The first is called Javadoc and ends up in generated API documentation
and is displayed by IDEs. The second is a multi line comment that does
not show up.

There are several places there /* instead of /** is used for API
documentation.

 [1] https://stackoverflow.com/questions/29815636/and-in-java-comments
 [2] http://javadude.com/articles/comments.html
The optional ResultSet#getObject(int, Class) and
ResultSet#getObject(String, Class) methods are currently not
implemented.

Besides the conversions mentioned in appendix Appendix B, Table B-3 we
also support uniqueidentifier <-> UUID.

This commit does not include support for JSR-310 data types in order to
keep it smaller.

Fixes #6
Usage of the Java Enum feature can be improved by the driver. This
commit includes the following changes:

 - use ordinal where possible
 - make enum fields final where possible
All tests are passing, merging for next major release. @brettwooldridge, now you can start a PR against dev :-)
Revert "Metadata caching - Parsed SQL and prepared statement handle caching"
UTC is an enum with one constant and a static variable. It has the
following comment

> The enum type delays initialization until first use.

This is demonstrably wrong.

The static variable is initialized when the class is initialized. If we
look at the decompiled static initializer of UTC we see that.

```
  // access flags 0x8
  static <clinit>()V
   L0
    LINENUMBER 522 L0
    NEW com/microsoft/sqlserver/jdbc/UTC
    DUP
    LDC "INSTANCE"
    ICONST_0
    INVOKESPECIAL com/microsoft/sqlserver/jdbc/UTC.<init> (Ljava/lang/String;I)V
    PUTSTATIC com/microsoft/sqlserver/jdbc/UTC.INSTANCE : Lcom/microsoft/sqlserver/jdbc/UTC;
    ICONST_1
    ANEWARRAY com/microsoft/sqlserver/jdbc/UTC
    DUP
    ICONST_0
    GETSTATIC com/microsoft/sqlserver/jdbc/UTC.INSTANCE : Lcom/microsoft/sqlserver/jdbc/UTC;
    AASTORE
    PUTSTATIC com/microsoft/sqlserver/jdbc/UTC.ENUM$VALUES : [Lcom/microsoft/sqlserver/jdbc/UTC;
   L1
    LINENUMBER 524 L1
    NEW java/util/SimpleTimeZone
    DUP
    ICONST_0
    LDC "UTC"
    INVOKESPECIAL java/util/SimpleTimeZone.<init> (ILjava/lang/String;)V
    PUTSTATIC com/microsoft/sqlserver/jdbc/UTC.timeZone : Ljava/util/TimeZone;
    RETURN
    MAXSTACK = 4
    MAXLOCALS = 0
```
…into SqlVariant

# Conflicts:
#	src/test/java/com/microsoft/sqlserver/jdbc/parametermetadata/ParameterMetaDataTest.java
#	src/test/java/com/microsoft/sqlserver/testframework/Utils.java
peterbae and others added 23 commits July 25, 2017 10:57
…lVariant

# Conflicts:
#	src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
@msftclas
Copy link
Copy Markdown

@peterbae,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 28, 2017

Codecov Report

Merging #415 into master will increase coverage by 6.09%.
The diff coverage is 55.59%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #415      +/-   ##
============================================
+ Coverage     40.08%   46.17%   +6.09%     
- Complexity     1887     2205     +318     
============================================
  Files           107      108       +1     
  Lines         24482    25210     +728     
  Branches       4038     4164     +126     
============================================
+ Hits           9813    11641    +1828     
+ Misses        12832    11648    -1184     
- Partials       1837     1921      +84
Flag Coverage Δ Complexity Δ
#JDBC41 45.95% <55.45%> (+6.08%) 2195 <107> (+323) ⬆️
#JDBC42 46.04% <55.52%> (+6.03%) 2199 <107> (+314) ⬆️
Impacted Files Coverage Δ Complexity Δ
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
src/main/java/microsoft/sql/Types.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/SQLServerException.java 77.23% <ø> (ø) 29 <0> (ø) ⬇️
...rc/main/java/com/microsoft/sqlserver/jdbc/TVP.java 45.26% <ø> (ø) 27 <0> (ø) ⬇️
...va/com/microsoft/sqlserver/jdbc/SQLServerBlob.java 33.51% <0%> (+5.85%) 16 <0> (+2) ⬆️
...microsoft/sqlserver/jdbc/SQLServerResultSet42.java 4.54% <0%> (ø) 1 <0> (ø) ⬇️
...QLServerColumnEncryptionAzureKeyVaultProvider.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/KeyVaultCredential.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...va/com/microsoft/sqlserver/jdbc/SQLServerClob.java 28.26% <0%> (+1.73%) 4 <0> (ø) ⬇️
... and 56 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 25c5e59...2c6b705. Read the comment docs.

@peterbae peterbae merged commit 029c478 into master Jul 28, 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.