|
@@ -746,7 +746,7 @@ var AutocompleteResults = (function () {
|
|
|
addSubQueryColumns(foundSubQuery.columns);
|
|
addSubQueryColumns(foundSubQuery.columns);
|
|
|
}
|
|
}
|
|
|
addColumnsDeferred.resolve();
|
|
addColumnsDeferred.resolve();
|
|
|
- } else {
|
|
|
|
|
|
|
+ } else if (typeof table.identifierChain !== 'undefined') {
|
|
|
var callback = function (data) {
|
|
var callback = function (data) {
|
|
|
if (data.extended_columns) {
|
|
if (data.extended_columns) {
|
|
|
data.extended_columns.forEach(function (column) {
|
|
data.extended_columns.forEach(function (column) {
|
|
@@ -954,15 +954,13 @@ var AutocompleteResults = (function () {
|
|
|
addColumnsDeferred.resolve();
|
|
addColumnsDeferred.resolve();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- try {
|
|
|
|
|
- if (self.parseResult.suggestColumns && self.parseResult.suggestColumns.identifierChain) {
|
|
|
|
|
- self.fetchFieldsForIdentifiers(table.identifierChain.concat(self.parseResult.suggestColumns.identifierChain), callback, addColumnsDeferred.resolve);
|
|
|
|
|
- } else {
|
|
|
|
|
- self.fetchFieldsForIdentifiers(table.identifierChain, callback, addColumnsDeferred.resolve);
|
|
|
|
|
- }
|
|
|
|
|
- } catch (e) {
|
|
|
|
|
- addColumnsDeferred.resolve();
|
|
|
|
|
- } // TODO: Ignore for subqueries
|
|
|
|
|
|
|
+ if (self.parseResult.suggestColumns && self.parseResult.suggestColumns.identifierChain) {
|
|
|
|
|
+ self.fetchFieldsForIdentifiers(table.identifierChain.concat(self.parseResult.suggestColumns.identifierChain), callback, addColumnsDeferred.resolve);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ self.fetchFieldsForIdentifiers(table.identifierChain, callback, addColumnsDeferred.resolve);
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ addColumnsDeferred.resolve();
|
|
|
}
|
|
}
|
|
|
return addColumnsDeferred;
|
|
return addColumnsDeferred;
|
|
|
};
|
|
};
|