DRILL-2466: Fix "<a>.VARCHAR -> <b>.NVARCHAR" to "-> <b>.VARCHAR" (Ty…

…pes.h).

- Fixed mapping from TypeProtos.MinorType.VARCHAR to java.sql.Types.NVARCHAR
  to be to java.sql.Types.VARCHAR.
- Also renamed getSqlType to getJdbcType, getSqlTypeName to getSqlTypeName.

common/src/main/java/org/apache/drill/common/types/Types.java

@@ -82,12 +82,15 @@ public static boolean isNumericType(MajorType type) {
     }
   }
 
-  public static int getSqlType(MajorType type) {
+  /***
+   * Gets JDBC type code for given Drill RPC-/protobuf-level type.
+   */
+  public static int getJdbcType(MajorType type) {
     if (type.getMode() == DataMode.REPEATED) {
       return java.sql.Types.ARRAY;
     }
 
-    switch(type.getMinorType()) {
+    switch (type.getMinorType()) {
     case BIGINT:
       return java.sql.Types.BIGINT;
     case BIT:
@@ -146,9 +149,13 @@ public static int getSqlType(MajorType type) {
     case VARBINARY:
       return java.sql.Types.VARBINARY;
     case VARCHAR:
-      return java.sql.Types.NVARCHAR;
+      return java.sql.Types.VARCHAR;
     default:
-      throw new UnsupportedOperationException();
+      // TODO:  This isn't really an unsupported-operation/-type case; this
+      //   is an unexpected, code-out-of-sync-with-itself case, so use an
+      //   exception intended for that.
+      throw new UnsupportedOperationException(
+          "Unexpected/unhandled " + type.getMinorType() + " value " + type.getMinorType() );
     }
   }
 

exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java

@@ -82,11 +82,11 @@ public void updateColumnMetaData(String catalogName, String schemaName, String t
   }
 
   private static AvaticaType getAvaticaType(MajorType t){
-    int sqlTypeId = Types.getSqlType(t);
-    return ColumnMetaData.scalar(sqlTypeId, getSqlTypeName(sqlTypeId), Rep.BOOLEAN /* dummy value, unused */);
+    final int jdbcTypeId = Types.getJdbcType(t);
+    return ColumnMetaData.scalar(jdbcTypeId, getJdbcTypeName(jdbcTypeId), Rep.BOOLEAN /* dummy value, unused */);
   }
 
-  private static String getSqlTypeName(int type) {
+  private static String getJdbcTypeName(int type) {
     switch (type) {
     case java.sql.Types.BIT:
         return "BIT";