Эх сурвалжийг харах

HUE-8011 [editor] Fix the asterisk column expansion popover

Johan Ahlen 7 жил өмнө
parent
commit
5c43d83

+ 8 - 11
desktop/core/src/desktop/templates/ko_components/ko_context_popover.mako

@@ -1028,23 +1028,16 @@ from metadata.conf import has_navigator
               delete colIndex[name];
               delete colIndex[name];
             }
             }
           });
           });
-          var sqlAutocompleter = new SqlAutocompleter2({
-            snippet: {
-              type: function () {
-                return sourceType;
-              }
-            }
-          });
           huePubSub.publish('ace.replace', {
           huePubSub.publish('ace.replace', {
             location: data.location,
             location: data.location,
             text: $.map(colsToExpand, function (column) {
             text: $.map(colsToExpand, function (column) {
               if (column.tableAlias) {
               if (column.tableAlias) {
-                return sqlAutocompleter.backTickIfNeeded(column.tableAlias) + '.' + sqlAutocompleter.backTickIfNeeded(column.name);
+                return SqlUtils.backTickIfNeeded(sourceType, column.tableAlias) + '.' + SqlUtils.backTickIfNeeded(sourceType, column.name);
               }
               }
               if (colIndex[column.name]) {
               if (colIndex[column.name]) {
-                return sqlAutocompleter.backTickIfNeeded(column.table) + '.' + sqlAutocompleter.backTickIfNeeded(column.name);
+                return SqlUtils.backTickIfNeeded(sourceType, column.table) + '.' + SqlUtils.backTickIfNeeded(sourceType, column.name);
               }
               }
-              return sqlAutocompleter.backTickIfNeeded(column.name)
+              return SqlUtils.backTickIfNeeded(sourceType, column.name)
             }).join(', ')
             }).join(', ')
           });
           });
           huePubSub.publish('context.popover.hide');
           huePubSub.publish('context.popover.hide');
@@ -1055,9 +1048,13 @@ from metadata.conf import has_navigator
           if (table.identifierChain) {
           if (table.identifierChain) {
             var fetchDeferred = $.Deferred();
             var fetchDeferred = $.Deferred();
             deferrals.push(fetchDeferred);
             deferrals.push(fetchDeferred);
+            var path = $.map(table.identifierChain, function (identifier) { return identifier.name });
+            if (path.length === 1) {
+              path.unshift(defaultDatabase);
+            }
             DataCatalog.getEntry({
             DataCatalog.getEntry({
               sourceType: sourceType,
               sourceType: sourceType,
-              path: $.map(table.identifierChain, function (identifier) { return identifier.name })
+              path: path
             }).done(function (entry) {
             }).done(function (entry) {
               entry.getSourceMeta({ silenceErrors: true }).done(function (sourceMeta) {
               entry.getSourceMeta({ silenceErrors: true }).done(function (sourceMeta) {
                 if (typeof sourceMeta.extended_columns !== 'undefined') {
                 if (typeof sourceMeta.extended_columns !== 'undefined') {