Merging in Dev to Master for 6.3.0 release

AppVeyorJCE/README.md

@@ -1,31 +1,31 @@
-# JCE chocolatey package
-
-### Disclaimers:
-1. All contents within this directory originate from [this GitHub project](https://github.com/TobseF/jce-chocolatey-package). This project was added to allow us to test the Always Encrypted feature on AppVeyor builds.
-
-2. This is not an official project of Oracle. It\`s only easy of the manual installation: It downloads the JCE from oracle.com and unpacks it to the installed JDK.
-
-
-[Chocolatey](https://chocolatey.org/) package for the [JCE (Unlimited Strength Java Cryptography Extension Policy Files)](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html)
-
-This chocolatey package adds the JCE to latest installed Java SDK. The The `JAVA_HOME` environment variable has to point to the JDK. If `JAVA_HOME` is not set, nothing will be changed. The original files are backuped (renamed to `*_old`) and can be reverted at any time. This package is a perfect addion to the [JDK8 package](https://chocolatey.org/packages/jdk8).
-
-#### Install with [Chocolatey](https://chocolatey.org/)
-```PowerShell
-choco install jce -y
-```
-
-#### Build from source:
-1. Install [Chocolatey](https://chocolatey.org/).
-2. Open cmd with admin rights in jce package directory.
-3. Pack NuGet Package (.nupkg).
-```PowerShell
-cpack
-```
-4. Install JCE NuGet Package.
-```PowerShell
-choco install jce -fdv -s . -y
-```
-
-
-
+# JCE chocolatey package
+
+### Disclaimers:
+1. All contents within this directory originate from [this GitHub project](https://github.com/TobseF/jce-chocolatey-package). This project was added to allow us to test the Always Encrypted feature on AppVeyor builds.
+
+2. This is not an official project of Oracle. It\`s only easy of the manual installation: It downloads the JCE from oracle.com and unpacks it to the installed JDK.
+
+
+[Chocolatey](https://chocolatey.org/) package for the [JCE (Unlimited Strength Java Cryptography Extension Policy Files)](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html)
+
+This chocolatey package adds the JCE to latest installed Java SDK. The The `JAVA_HOME` environment variable has to point to the JDK. If `JAVA_HOME` is not set, nothing will be changed. The original files are backuped (renamed to `*_old`) and can be reverted at any time. This package is a perfect addion to the [JDK8 package](https://chocolatey.org/packages/jdk8).
+
+#### Install with [Chocolatey](https://chocolatey.org/)
+```PowerShell
+choco install jce -y
+```
+
+#### Build from source:
+1. Install [Chocolatey](https://chocolatey.org/).
+2. Open cmd with admin rights in jce package directory.
+3. Pack NuGet Package (.nupkg).
+```PowerShell
+cpack
+```
+4. Install JCE NuGet Package.
+```PowerShell
+choco install jce -fdv -s . -y
+```
+
+
+

CHANGELOG.md

@@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.3.0] Preview Release
+### Added
+- Added support for sql_variant datatype [#387](https://github.com/Microsoft/mssql-jdbc/pull/387)
+- Added more Junit tests for AlwaysEncrpyted [#404](https://github.com/Microsoft/mssql-jdbc/pull/404)
+
+### Fixed Issues 
+- Fixed Turkey locale issue when lowercasing an "i" [#384](https://github.com/Microsoft/mssql-jdbc/pull/384)
+- Fixed issue with incorrect parameter count for INSERT with subquery [#373](https://github.com/Microsoft/mssql-jdbc/pull/373)
+- Fixed issue with running DDL in PreparedStatement [#372](https://github.com/Microsoft/mssql-jdbc/pull/372)
+- Fixed issue with parameter metadata with whitespace characters [#371](https://github.com/Microsoft/mssql-jdbc/pull/371)
+- Fixed handling of explicit boxing and unboxing [#84](https://github.com/Microsoft/mssql-jdbc/pull/84)
+- Fixed metadata caching batch query issue [#393](https://github.com/Microsoft/mssql-jdbc/pull/393)
+- Fixed javadoc issue for the newest maven version [#385](https://github.com/Microsoft/mssql-jdbc/pull/385)
+
 ## [6.2.1] Hotfix & Stable Release
 ### Fixed Issues 
 - Fixed queries without parameters using preparedStatement [#372](https://github.com/Microsoft/mssql-jdbc/pull/372)

README.md

@@ -1,5 +1,6 @@
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Microsoft/mssql-jdbc/master/LICENSE)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.microsoft.sqlserver/mssql-jdbc/badge.svg)](http://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc)
+[![codecov.io](http://codecov.io/github/Microsoft/mssql-jdbc/coverage.svg?branch=master)](http://codecov.io/github/Microsoft/mssql-jdbc?branch=master)
 [![Javadocs](http://javadoc.io/badge/com.microsoft.sqlserver/mssql-jdbc.svg)](http://javadoc.io/doc/com.microsoft.sqlserver/mssql-jdbc)
 [![Gitter](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/Microsoft/mssql-developers)
 </br>
@@ -61,6 +62,8 @@ To build the jar files, you must use Java 8 with Maven.  You can choose to build
 ## Resources
 
 ### Documentation
+API reference documentation is available in [Javadocs](https://aka.ms/jdbcjavadocs).
+
 This driver is documented on [Microsoft's Documentation web site](https://msdn.microsoft.com/en-us/library/mt720657).
 
 ### Sample Code

build.gradle

@@ -80,4 +80,4 @@ dependencies {
 	'org.junit.jupiter:junit-jupiter-engine:5.0.0-M3',
 	'com.zaxxer:HikariCP:2.6.0',
 	'org.apache.commons:commons-dbcp2:2.1.1'
-}
+}

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.2.0</version>
+	<version>6.3.0</version>
 
 	<packaging>jar</packaging>
 
@@ -48,14 +48,14 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-keyvault</artifactId>
-			<version>0.9.7</version>
+			<version>1.0.0</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>adal4j</artifactId>
-			<version>1.1.3</version>
+			<version>1.2.0</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -158,7 +158,7 @@
 						<artifactId>maven-jar-plugin</artifactId>
 						<version>3.0.2</version>
 						<configuration>
-							<finalName>${project.artifactId}-${project.version}.jre7</finalName>
+							<finalName>${project.artifactId}-${project.version}.jre7-preview</finalName>
 							<archive>
 								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>
@@ -192,7 +192,7 @@
 						<artifactId>maven-jar-plugin</artifactId>
 						<version>3.0.2</version>
 						<configuration>
-							<finalName>${project.artifactId}-${project.version}.jre8</finalName>
+							<finalName>${project.artifactId}-${project.version}.jre8-preview</finalName>
 							<archive>
 								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>

src/main/java/com/microsoft/sqlserver/jdbc/Column.java

@@ -18,7 +18,16 @@
 final class Column {
     private TypeInfo typeInfo;
     private CryptoMetadata cryptoMetadata;
-
+    private SqlVariant internalVariant;   
+
+    final void setInternalVariant(SqlVariant type){
+        this.internalVariant = type;
+    }
+
+    final SqlVariant getInternalVariant(){
+        return this.internalVariant;
+    }
+
     final TypeInfo getTypeInfo() {
         return typeInfo;
     }
@@ -187,11 +196,12 @@ Object getValue(JDBCType jdbcType,
             Calendar cal,
             TDSReader tdsReader) throws SQLServerException {
         Object value = getterDTV.getValue(jdbcType, typeInfo.getScale(), getterArgs, cal, typeInfo, cryptoMetadata, tdsReader);
+        setInternalVariant(getterDTV.getInternalVariant());
         return (null != filter) ? filter.apply(value, jdbcType) : value;
     }
 
     int getInt(TDSReader tdsReader) throws SQLServerException {
-        return ((Integer) getValue(JDBCType.INTEGER, null, null, tdsReader)).intValue();
+        return (Integer) getValue(JDBCType.INTEGER, null, null, tdsReader);
     }
 
     void updateValue(JDBCType jdbcType,

src/main/java/com/microsoft/sqlserver/jdbc/DDC.java

@@ -54,25 +54,25 @@ static final Object convertIntegerToObject(int intValue,
             StreamType streamType) {
         switch (jdbcType) {
             case INTEGER:
-                return new Integer(intValue);
+                return intValue;
             case SMALLINT: // 2.21 small and tinyint returned as short
             case TINYINT:
-                return new Short((short) intValue);
+                return (short) intValue;
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != intValue);
+                return 0 != intValue;
             case BIGINT:
-                return new Long(intValue);
+                return (long) intValue;
             case DECIMAL:
             case NUMERIC:
             case MONEY:
             case SMALLMONEY:
                 return new BigDecimal(Integer.toString(intValue));
             case FLOAT:
             case DOUBLE:
-                return new Double(intValue);
+                return (double) intValue;
             case REAL:
-                return new Float(intValue);
+                return (float) intValue;
             case BINARY:
                 return convertIntToBytes(intValue, valueLength);
             default:
@@ -99,25 +99,25 @@ static final Object convertLongToObject(long longVal,
             StreamType streamType) {
         switch (jdbcType) {
             case BIGINT:
-                return new Long(longVal);
+                return longVal;
             case INTEGER:
-                return new Integer((int) longVal);
+                return (int) longVal;
             case SMALLINT: // small and tinyint returned as short
             case TINYINT:
-                return new Short((short) longVal);
+                return (short) longVal;
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != longVal);
+                return 0 != longVal;
             case DECIMAL:
             case NUMERIC:
             case MONEY:
             case SMALLMONEY:
                 return new BigDecimal(Long.toString(longVal));
             case FLOAT:
             case DOUBLE:
-                return new Double(longVal);
+                return (double) longVal;
             case REAL:
-                return new Float(longVal);
+                return (float) longVal;
             case BINARY:
                 byte[] convertedBytes = convertLongToBytes(longVal);
                 int bytesToReturnLength;
@@ -152,23 +152,23 @@ static final Object convertLongToObject(long longVal,
             case VARBINARY:
                 switch (baseSSType) {
                     case BIGINT:
-                        return new Long(longVal);
+                        return longVal;
                     case INTEGER:
-                        return new Integer((int) longVal);
+                        return (int) longVal;
                     case SMALLINT: // small and tinyint returned as short
                     case TINYINT:
-                        return new Short((short) longVal);
+                        return (short) longVal;
                     case BIT:
-                        return new Boolean(0 != longVal);
+                        return 0 != longVal;
                     case DECIMAL:
                     case NUMERIC:
                     case MONEY:
                     case SMALLMONEY:
                         return new BigDecimal(Long.toString(longVal));
                     case FLOAT:
-                        return new Double(longVal);
+                        return (double) longVal;
                     case REAL:
-                        return new Float(longVal);
+                        return (float) longVal;
                     case BINARY:
                         return convertLongToBytes(longVal);
                     default:
@@ -214,25 +214,25 @@ static final Object convertFloatToObject(float floatVal,
             StreamType streamType) {
         switch (jdbcType) {
             case REAL:
-                return new Float(floatVal);
+                return floatVal;
             case INTEGER:
-                return new Integer((int) floatVal);
+                return (int) floatVal;
             case SMALLINT: // small and tinyint returned as short
             case TINYINT:
-                return new Short((short) floatVal);
+                return (short) floatVal;
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != Float.compare(0.0f, floatVal));
+                return 0 != Float.compare(0.0f, floatVal);
             case BIGINT:
-                return new Long((long) floatVal);
+                return (long) floatVal;
             case DECIMAL:
             case NUMERIC:
             case MONEY:
             case SMALLMONEY:
                 return new BigDecimal(Float.toString(floatVal));
             case FLOAT:
             case DOUBLE:
-                return new Double((new Float(floatVal)).doubleValue());
+                return (new Float(floatVal)).doubleValue();
             case BINARY:
                 return convertIntToBytes(Float.floatToRawIntBits(floatVal), 4);
             default:
@@ -273,19 +273,19 @@ static final Object convertDoubleToObject(double doubleVal,
         switch (jdbcType) {
             case FLOAT:
             case DOUBLE:
-                return new Double(doubleVal);
+                return doubleVal;
             case REAL:
-                return new Float((new Double(doubleVal)).floatValue());
+                return (new Double(doubleVal)).floatValue();
             case INTEGER:
-                return new Integer((int) doubleVal);
+                return (int) doubleVal;
             case SMALLINT: // small and tinyint returned as short
             case TINYINT:
-                return new Short((short) doubleVal);
+                return (short) doubleVal;
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != Double.compare(0.0d, doubleVal));
+                return 0 != Double.compare(0.0d, doubleVal);
             case BIGINT:
-                return new Long((long) doubleVal);
+                return (long) doubleVal;
             case DECIMAL:
             case NUMERIC:
             case MONEY:
@@ -355,19 +355,19 @@ static final Object convertBigDecimalToObject(BigDecimal bigDecimalVal,
                 return bigDecimalVal;
             case FLOAT:
             case DOUBLE:
-                return new Double(bigDecimalVal.doubleValue());
+                return bigDecimalVal.doubleValue();
             case REAL:
-                return new Float(bigDecimalVal.floatValue());
+                return bigDecimalVal.floatValue();
             case INTEGER:
-                return new Integer(bigDecimalVal.intValue());
+                return bigDecimalVal.intValue();
             case SMALLINT: // small and tinyint returned as short
             case TINYINT:
-                return new Short(bigDecimalVal.shortValue());
+                return bigDecimalVal.shortValue();
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0)));
+                return 0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0));
             case BIGINT:
-                return new Long(bigDecimalVal.longValue());
+                return bigDecimalVal.longValue();
             case BINARY:
                 return convertBigDecimalToBytes(bigDecimalVal, bigDecimalVal.scale());
             default:
@@ -400,19 +400,19 @@ static final Object convertMoneyToObject(BigDecimal bigDecimalVal,
                 return bigDecimalVal;
             case FLOAT:
             case DOUBLE:
-                return new Double(bigDecimalVal.doubleValue());
+                return bigDecimalVal.doubleValue();
             case REAL:
-                return new Float(bigDecimalVal.floatValue());
+                return bigDecimalVal.floatValue();
             case INTEGER:
-                return new Integer(bigDecimalVal.intValue());
+                return bigDecimalVal.intValue();
             case SMALLINT: // small and tinyint returned as short
             case TINYINT:
-                return new Short(bigDecimalVal.shortValue());
+                return bigDecimalVal.shortValue();
             case BIT:
             case BOOLEAN:
-                return new Boolean(0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0)));
+                return 0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0));
             case BIGINT:
-                return new Long(bigDecimalVal.longValue());
+                return bigDecimalVal.longValue();
             case BINARY:
                 return convertToBytes(bigDecimalVal, bigDecimalVal.scale(), numberOfBytes);
             default: