|
@@ -1003,6 +1003,7 @@ var SqlAutocompleter3 = (function () {
|
|
|
tables: suggestJoins.tables,
|
|
tables: suggestJoins.tables,
|
|
|
successCallback: function (data) {
|
|
successCallback: function (data) {
|
|
|
var joinSuggestions = [];
|
|
var joinSuggestions = [];
|
|
|
|
|
+ var totalCount = 0;
|
|
|
data.values.forEach(function (value) {
|
|
data.values.forEach(function (value) {
|
|
|
var suggestionString = suggestJoins.prependJoin ? (self.parseResult.lowerCase ? 'join ' : 'JOIN ') : '';
|
|
var suggestionString = suggestJoins.prependJoin ? (self.parseResult.lowerCase ? 'join ' : 'JOIN ') : '';
|
|
|
var first = true;
|
|
var first = true;
|
|
@@ -1039,6 +1040,7 @@ var SqlAutocompleter3 = (function () {
|
|
|
suggestionString += self.convertNavOptQualifiedIdentifier(joinColPair.columns[0], suggestJoins.tables) + ' = ' + self.convertNavOptQualifiedIdentifier(joinColPair.columns[1], suggestJoins.tables);
|
|
suggestionString += self.convertNavOptQualifiedIdentifier(joinColPair.columns[0], suggestJoins.tables) + ' = ' + self.convertNavOptQualifiedIdentifier(joinColPair.columns[1], suggestJoins.tables);
|
|
|
first = false;
|
|
first = false;
|
|
|
});
|
|
});
|
|
|
|
|
+ totalCount += value.totalQueryCount;
|
|
|
joinSuggestions.push({
|
|
joinSuggestions.push({
|
|
|
value: suggestionString,
|
|
value: suggestionString,
|
|
|
meta: AutocompleterGlobals.i18n.meta.join,
|
|
meta: AutocompleterGlobals.i18n.meta.join,
|
|
@@ -1048,6 +1050,10 @@ var SqlAutocompleter3 = (function () {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ joinSuggestions.forEach(function (suggestion) {
|
|
|
|
|
+ suggestion.details.relativePopularity = totalCount === 0 ? suggestion.details.totalQueryCount : Math.round(100 * suggestion.details.totalQueryCount / totalCount);
|
|
|
|
|
+ suggestion.weightAdjust = suggestion.details.relativePopularity + 1;
|
|
|
|
|
+ });
|
|
|
self.entries(self.entries().concat(joinSuggestions));
|
|
self.entries(self.entries().concat(joinSuggestions));
|
|
|
self.loadingJoins(false);
|
|
self.loadingJoins(false);
|
|
|
joinsDeferred.resolve(joinSuggestions);
|
|
joinsDeferred.resolve(joinSuggestions);
|
|
@@ -1077,6 +1083,7 @@ var SqlAutocompleter3 = (function () {
|
|
|
tables: suggestJoinConditions.tables,
|
|
tables: suggestJoinConditions.tables,
|
|
|
successCallback: function (data) {
|
|
successCallback: function (data) {
|
|
|
var joinConditionSuggestions = [];
|
|
var joinConditionSuggestions = [];
|
|
|
|
|
+ var totalCount = 0;
|
|
|
data.values.forEach(function (value) {
|
|
data.values.forEach(function (value) {
|
|
|
if (value.joinCols.length > 0) {
|
|
if (value.joinCols.length > 0) {
|
|
|
var suggestionString = suggestJoinConditions.prependOn ? (self.parseResult.lowerCase ? 'on ' : 'ON ') : '';
|
|
var suggestionString = suggestJoinConditions.prependOn ? (self.parseResult.lowerCase ? 'on ' : 'ON ') : '';
|
|
@@ -1088,6 +1095,7 @@ var SqlAutocompleter3 = (function () {
|
|
|
suggestionString += self.convertNavOptQualifiedIdentifier(joinColPair.columns[0], suggestJoinConditions.tables) + ' = ' + self.convertNavOptQualifiedIdentifier(joinColPair.columns[1], suggestJoinConditions.tables);
|
|
suggestionString += self.convertNavOptQualifiedIdentifier(joinColPair.columns[0], suggestJoinConditions.tables) + ' = ' + self.convertNavOptQualifiedIdentifier(joinColPair.columns[1], suggestJoinConditions.tables);
|
|
|
first = false;
|
|
first = false;
|
|
|
});
|
|
});
|
|
|
|
|
+ totalCount += value.totalQueryCount;
|
|
|
joinConditionSuggestions.push({
|
|
joinConditionSuggestions.push({
|
|
|
value: suggestionString,
|
|
value: suggestionString,
|
|
|
meta: AutocompleterGlobals.i18n.meta.joinCondition,
|
|
meta: AutocompleterGlobals.i18n.meta.joinCondition,
|
|
@@ -1097,6 +1105,11 @@ var SqlAutocompleter3 = (function () {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ joinConditionSuggestions.forEach(function (suggestion) {
|
|
|
|
|
+ suggestion.details.relativePopularity = totalCount === 0 ? suggestion.details.totalQueryCount : Math.round(100 * suggestion.details.totalQueryCount / totalCount);
|
|
|
|
|
+ suggestion.weightAdjust = suggestion.details.relativePopularity + 1;
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
self.entries(self.entries().concat(joinConditionSuggestions));
|
|
self.entries(self.entries().concat(joinConditionSuggestions));
|
|
|
joinConditionsDeferred.resolve();
|
|
joinConditionsDeferred.resolve();
|
|
|
self.loadingJoinConditions(false);
|
|
self.loadingJoinConditions(false);
|