[ZEPPELIN-1876] add support for databases with only catalogs without schemas (like mysql)

Sotnichenko Sergey · Sotnichenko Sergey · commit f4b03dfb4e7e · 2017-02-09T11:40:21.000+03:00
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java
@@ -163,6 +163,7 @@ private static void fillTableAndColumnNames(DatabaseMetaData meta, String schema
       try {
         while (cols.next()) {
           String schema = cols.getString("TABLE_SCHEM");
+          if (schema == null) schema = cols.getString("TABLE_CAT");
           String table = cols.getString("TABLE_NAME");
           String column = cols.getString("COLUMN_NAME");
           if (!isBlank(table)) {
@@ -197,14 +198,17 @@ public static Set<String> getSqlKeywordsCompletions(Connection connection) throw
       // Add the driver specific SQL completions
       String driverSpecificKeywords =
               "/" + metaData.getDriverName().replace(" ", "-").toLowerCase() + "-sql.keywords";
-
       logger.info("JDBC DriverName:" + driverSpecificKeywords);
-
-      if (SqlCompleter.class.getResource(driverSpecificKeywords) != null) {
-        String driverKeywords =
-                new BufferedReader(new InputStreamReader(
-                        SqlCompleter.class.getResourceAsStream(driverSpecificKeywords))).readLine();
-        keywords += "," + driverKeywords.toUpperCase();
+      try {
+        if (SqlCompleter.class.getResource(driverSpecificKeywords) != null) {
+          String driverKeywords =
+                  new BufferedReader(new InputStreamReader(
+                          SqlCompleter.class.getResourceAsStream(driverSpecificKeywords))).readLine();
+          keywords += "," + driverKeywords.toUpperCase();
+        }
+      } catch (Exception e) {
+        logger.debug("fail to get driver specific SQL completions for " +
+                driverSpecificKeywords + " : " + e, e);
       }
 
 
@@ -317,6 +321,7 @@ public void initFromConnection(Connection connection, String schemaFilter) {
       Set<String> keywords = getSqlKeywordsCompletions(connection);
       if (connection != null) {
         schemas = getSchemaNames(connection.getMetaData(), schemaFilter);
+        if (schemas.size() == 0) schemas.add(connection.getCatalog());
         fillTableAndColumnNames(connection.getMetaData(), schemaFilter, tables, columns);
       }
       init(schemas, tables, columns, keywords);
