Merge pull request #188 from databricks/fix-like-metadata

[PECO-1685] Fix use of new Metadata client for Metadata calls

Author: madhav-db

src/main/java/com/databricks/jdbc/client/impl/helper/CommandConstants.java

@@ -13,7 +13,7 @@ public class CommandConstants {
   public static final String IN_ABSOLUTE_SCHEMA_SQL = " IN SCHEMA %s";
   public static final String IN_ABSOLUTE_TABLE_SQL = " IN TABLE %s";
   public static final String SHOW_SCHEMA_IN_CATALOG_SQL = "SHOW SCHEMAS IN %s";
-  public static final String LIKE_SQL = " LIKE `%s`";
+  public static final String LIKE_SQL = " LIKE '%s'";
   public static final String SCHEMA_LIKE_SQL = " SCHEMA" + LIKE_SQL;
   public static final String TABLE_LIKE_SQL = " TABLE" + LIKE_SQL;
   public static final String SHOW_TABLES_SQL = "SHOW TABLES" + IN_CATALOG_SQL;

src/main/java/com/databricks/jdbc/client/impl/helper/MetadataResultSetBuilder.java

@@ -5,6 +5,7 @@
 
 import com.databricks.jdbc.client.StatementType;
 import com.databricks.jdbc.core.DatabricksResultSet;
+import com.databricks.jdbc.core.DatabricksSQLException;
 import com.databricks.sdk.service.sql.StatementState;
 import com.databricks.sdk.service.sql.StatementStatus;
 import java.sql.ResultSet;
@@ -62,8 +63,14 @@ private static List<List<Object>> getRows(ResultSet resultSet, List<ResultColumn
     while (resultSet.next()) {
       List<Object> row = new ArrayList<>();
       for (ResultColumn column : columns) {
-        Object object = resultSet.getObject(column.getResultSetColumnName());
-        if (object == null) {
+        Object object;
+        try {
+          object = resultSet.getObject(column.getResultSetColumnName());
+          if (object == null) {
+            object = NULL_STRING;
+          }
+        } catch (DatabricksSQLException e) {
+          // Remove non-relevant columns from the obtained result set
           object = NULL_STRING;
         }
         row.add(object);

src/test/java/com/databricks/jdbc/client/impl/DatabricksNewMetadataSdkClientTest.java

@@ -35,7 +35,7 @@ public class DatabricksNewMetadataSdkClientTest {
   private static Stream<Arguments> listTableTestParams() {
     return Stream.of(
         Arguments.of(
-            "SHOW TABLES IN CATALOG catalog1 SCHEMA LIKE `testSchema` LIKE `testTable`",
+            "SHOW TABLES IN CATALOG catalog1 SCHEMA LIKE 'testSchema' LIKE 'testTable'",
             TEST_CATALOG,
             TEST_SCHEMA,
             TEST_TABLE,
@@ -47,13 +47,13 @@ private static Stream<Arguments> listTableTestParams() {
             null,
             "test for all tables and schemas"),
         Arguments.of(
-            "SHOW TABLES IN CATALOG catalog1 SCHEMA LIKE `testSchema`",
+            "SHOW TABLES IN CATALOG catalog1 SCHEMA LIKE 'testSchema'",
             TEST_CATALOG,
             TEST_SCHEMA,
             null,
             "test for all tables"),
         Arguments.of(
-            "SHOW TABLES IN CATALOG catalog1 LIKE `testTable`",
+            "SHOW TABLES IN CATALOG catalog1 LIKE 'testTable'",
             TEST_CATALOG,
             null,
             TEST_TABLE,
@@ -62,26 +62,26 @@ private static Stream<Arguments> listTableTestParams() {
 
   private static Stream<Arguments> listSchemasTestParams() {
     return Stream.of(
-        Arguments.of("SHOW SCHEMAS IN catalog1 LIKE `testSchema`", TEST_SCHEMA, "test for schema"),
+        Arguments.of("SHOW SCHEMAS IN catalog1 LIKE 'testSchema'", TEST_SCHEMA, "test for schema"),
         Arguments.of("SHOW SCHEMAS IN catalog1", null, "test for all schemas"));
   }
 
   private static Stream<Arguments> listFunctionsTestParams() {
     return Stream.of(
         Arguments.of(
-            "SHOW FUNCTIONS IN CATALOG catalog1 SCHEMA LIKE `testSchema` LIKE `functionPattern`",
+            "SHOW FUNCTIONS IN CATALOG catalog1 SCHEMA LIKE 'testSchema' LIKE 'functionPattern'",
             TEST_CATALOG,
             TEST_SCHEMA,
             TEST_FUNCTION_PATTERN,
             "test for get functions"),
         Arguments.of(
-            "SHOW FUNCTIONS IN CATALOG catalog1 LIKE `functionPattern`",
+            "SHOW FUNCTIONS IN CATALOG catalog1 LIKE 'functionPattern'",
             TEST_CATALOG,
             null,
             TEST_FUNCTION_PATTERN,
             "test for get functions without schema"),
         Arguments.of(
-            "SHOW FUNCTIONS IN CATALOG catalog1 SCHEMA LIKE `testSchema`",
+            "SHOW FUNCTIONS IN CATALOG catalog1 SCHEMA LIKE 'testSchema'",
             TEST_CATALOG,
             TEST_SCHEMA,
             null,
@@ -91,7 +91,7 @@ private static Stream<Arguments> listFunctionsTestParams() {
   private static Stream<Arguments> listColumnTestParams() {
     return Stream.of(
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE `testSchema` TABLE LIKE `testTable`",
+            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE 'testSchema' TABLE LIKE 'testTable'",
             TEST_CATALOG,
             TEST_TABLE,
             TEST_SCHEMA,
@@ -105,42 +105,42 @@ private static Stream<Arguments> listColumnTestParams() {
             null,
             "test for all tables and schemas"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE `testSchema`",
+            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE 'testSchema'",
             TEST_CATALOG,
             null,
             TEST_SCHEMA,
             null,
             "test for schema"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 TABLE LIKE `testTable`",
+            "SHOW COLUMNS IN CATALOG catalog1 TABLE LIKE 'testTable'",
             TEST_CATALOG,
             TEST_TABLE,
             null,
             null,
             "test for table"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE `testSchema` TABLE LIKE `testTable` LIKE `testColumn`",
+            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE 'testSchema' TABLE LIKE 'testTable' LIKE 'testColumn'",
             TEST_CATALOG,
             TEST_TABLE,
             TEST_SCHEMA,
             TEST_COLUMN,
             "test for table, schema and column"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 LIKE `testColumn`",
+            "SHOW COLUMNS IN CATALOG catalog1 LIKE 'testColumn'",
             TEST_CATALOG,
             null,
             null,
             TEST_COLUMN,
             "test for column"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE `testSchema` LIKE `testColumn`",
+            "SHOW COLUMNS IN CATALOG catalog1 SCHEMA LIKE 'testSchema' LIKE 'testColumn'",
             TEST_CATALOG,
             null,
             TEST_SCHEMA,
             TEST_COLUMN,
             "test for schema and column"),
         Arguments.of(
-            "SHOW COLUMNS IN CATALOG catalog1 TABLE LIKE `testTable` LIKE `testColumn`",
+            "SHOW COLUMNS IN CATALOG catalog1 TABLE LIKE 'testTable' LIKE 'testColumn'",
             TEST_CATALOG,
             TEST_TABLE,
             null,