Browse Source

[beeswax] Don't include db references in autocomplete for the old editors

Johan Ahlen 9 years ago
parent
commit
e066c23a54

+ 2 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -1152,7 +1152,8 @@ var snippet = notebook.newSnippet(snippetType);
 var assistHelper = snippet.getAssistHelper();
 var autocompleter = new Autocompleter({
   snippet: snippet,
-  user: HIVE_AUTOCOMPLETE_USER
+  user: HIVE_AUTOCOMPLETE_USER,
+  oldEditor: true
 });
 
 var escapeOutput = function (str) {

+ 2 - 1
desktop/core/src/desktop/static/desktop/js/autocompleter.js

@@ -44,7 +44,8 @@
       if (self.snippet.isSqlDialect()) {
         self.autocompleter = new SqlAutocompleter({
           hdfsAutocompleter: hdfsAutocompleter,
-          snippet: options.snippet
+          snippet: options.snippet,
+          oldEditor: options.oldEditor
         })
       } else {
         self.autocompleter = hdfsAutocompleter;

+ 2 - 1
desktop/core/src/desktop/static/desktop/js/sqlAutocompleter.js

@@ -34,6 +34,7 @@
     var self = this;
     self.snippet = options.snippet;
     self.hdfsAutocompleter = options.hdfsAutocompleter;
+    self.oldEditor = options.oldEditor || false;
 
     // Speed up by caching the databases
     var initDatabases = function () {
@@ -297,7 +298,7 @@
           type: "table"
         }
       });
-      if (! excludeDatabases) {
+      if (! excludeDatabases && ! self.oldEditor) {
         // No FROM prefix
         prependedFields = prependedFields.concat(fields);
         fields = $.map(self.snippet.getAssistHelper().lastKnownDatabases[self.snippet.type()], function(database) {