apache
diff --git a/‎jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java‎
Lines changed: 4 additions & 13 deletions b/‎jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java‎
Lines changed: 4 additions & 13 deletions
@@ -201,18 +201,8 @@ private void setMaxLineResults() {
 
   private SqlCompleter createSqlCompleter(Connection jdbcConnection) {
 
-    SqlCompleter completer = null;
-    try {
-      Set<String> keywordsCompletions = SqlCompleter.getSqlKeywordsCompletions(jdbcConnection);
-      Set<String> dataModelCompletions =
-          SqlCompleter.getDataModelMetadataCompletions(jdbcConnection);
-      SetView<String> allCompletions = Sets.union(keywordsCompletions, dataModelCompletions);
-      completer = new SqlCompleter(allCompletions, dataModelCompletions);
-
-    } catch (IOException | SQLException e) {
-      logger.error("Cannot create SQL completer", e);
-    }
-
+    SqlCompleter completer = new SqlCompleter();
+    completer.initFromConnection(jdbcConnection, "");
     return completer;
   }
 
@@ -712,7 +702,8 @@ public Scheduler getScheduler() {
   public List<InterpreterCompletion> completion(String buf, int cursor) {
     List<CharSequence> candidates = new ArrayList<>();
     SqlCompleter sqlCompleter = propertyKeySqlCompleterMap.get(getPropertyKey(buf));
-    if (sqlCompleter != null && sqlCompleter.complete(buf, cursor, candidates) >= 0) {
+    // It's strange but here cursor comes with additional +1 (even if buf is "" cursor = 1)
+    if (sqlCompleter != null && sqlCompleter.complete(buf, cursor - 1, candidates) >= 0) {
       List<InterpreterCompletion> completion;
       completion = Lists.transform(candidates, sequenceToStringTransformer);