Skip to content

[ZEPPELIN-1876] improved comptetion with schema/table/column separati… #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sotnich wants to merge 7 commits into from
Closed

[ZEPPELIN-1876] improved comptetion with schema/table/column separati… #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d40166
[ZEPPELIN-1876] improved comptetion with schema/table/column separati…
Jan 11, 2017
895c35a
[ZEPPELIN-1876] SQLException instead of Throwable
Jan 15, 2017
9fac1d0
[ZEPPELIN-1876] SQLException instead of Throwable
Jan 20, 2017
675c629
[ZEPPELIN-1876] Adding licence header
Jan 20, 2017
f4b03df
[ZEPPELIN-1876] add support for databases with only catalogs without …
Feb 2, 2017
a048ef2
[ZEPPELIN-1876] add support for databases with only catalogs without …
Feb 2, 2017
2db7ed8
[ZEPPELIN-1876] add support for databases with only catalogs without …
Feb 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down
Loading