gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19294 from faissaloux/query-generator-in-without-quotes

Browse Source 
[Query Generator] simplify IN, NOT IN criteria text
This commit is contained in:
Maurício Meneghini Fauth 2024-10-16 11:56:05 -03:00 committed by GitHub
commit 4341ab6993
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
resources/js/src/database/multi_table_query.ts
View File

@ -35,6 +35,8 @@ AJAX.registerTeardown('database/multi_table_query.js', function () {
$('#update_query_button').off('click');
$('#add_column_button').off('click');
$('body').off('click', 'input.add-option');
$('body').off('click', 'input.remove-option');
});
AJAX.registerOnload('database/multi_table_query.js', function () {
@ -45,11 +47,8 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
var columnCount = 3;
addNewColumnCallbacks();
function theHints () {
return {
'IN (...)': 'Separate the values by commas',
'NOT IN (...)': 'Separate the values by commas',
};
function opsWithMultipleArgs (): string[] {
return ['IN (...)', 'NOT IN (...)'];
}
$('#update_query_button').on('click', function () {
@ -200,22 +199,53 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
});
});
const acceptsMultipleArgs: string[] = opsWithMultipleArgs();
$('.criteria_op').each(function () {
$(this).on('change', function () {
showHint($(this));
if (acceptsMultipleArgs.includes($(this).val().toString())) {
showMultiFields($(this));
} else {
const options: JQuery<HTMLElement> = $(this).closest('table').find('.options');
options.parent().prepend('<input type="text" class="rhs_text_val query-form__input--wide" placeholder="Enter criteria as free text"></input>');
options.remove();
}
});
});
function showHint (opSelect) {
const hints = theHints();
const value = opSelect.val();
const criteriaInputCol = opSelect.closest('table').find('.rhs_text_val').parent();
function showMultiFields (opSelect: JQuery<HTMLElement>) {
const criteriaInput: JQuery<HTMLElement> = opSelect.closest('table').find('.rhs_text_val');
const criteriaInputCol: JQuery<HTMLElement> = criteriaInput.parent();
const hasAtLeastOneOption: boolean = criteriaInputCol.find('.option').length > 0;
criteriaInputCol.find('.rhs_hint').remove();
if (!hasAtLeastOneOption) {
criteriaInputCol.append(`
<div class="options">
<div class="option">
<input type="text" class="val" placeholder="Enter an option" value="${criteriaInput.val()}" />
<input type="button" class="btn btn-secondary add-option" value="+" />
</div>
</div>
`);
}
Object.keys(hints).includes(value) && criteriaInputCol.append(`<p class="rhs_hint">${hints[value]}</p>`);
criteriaInput.remove();
}
$('body').on('click', 'input.add-option', function () {
const options: JQuery<HTMLElement> = $(this).closest('.options');
options.find('.option').first().clone().appendTo(options);
const newAdded: JQuery<HTMLElement> = options.find('.option').last();
newAdded.find('input.val').val('');
newAdded.append('<input type="button" class="btn btn-secondary remove-option" value="-" />');
});
$('body').on('click', 'input.remove-option', function () {
$(this).closest('.option').remove();
});
function addNewColumnCallbacks () {
$('.tableNameSelect').each(function () {
$(this).on('change', function () {

38
resources/js/src/database/query_generator.ts
View File

@ -41,10 +41,32 @@ function opsWithoutArg () {
return ['IS NULL', 'IS NOT NULL'];
}
function opsWithMultipleArgs (): string[] {
return ['IN (...)', 'NOT IN (...)'];
}
function isOpWithoutArg (op) {
return opsWithoutArg().includes(op);
}
function acceptsMultipleValues (op: string): boolean {
return opsWithMultipleArgs().includes(op);
}
function joinWrappingElementsWith (array: string[], char: string, separator: string = ','): string {
let string: string = '';
array.forEach(function (option: string, index: number) {
string += `${char}${option}${char}`;
if (index !== array.length - 1) {
string += separator;
}
});
return string;
}
function generateCondition (criteriaDiv, table) {
const tableName = table.val();
const tableAlias = table.siblings('.table_alias').val();
@ -56,13 +78,21 @@ function generateCondition (criteriaDiv, table) {
if (criteriaDiv.find('.criteria_rhs').first().val() === 'text') {
if (isOpWithoutArg(criteriaOp)) {
query += ' ' + criteriaOp;
} else if (acceptsMultipleValues(criteriaOp)) {
const formatsText = getFormatsText();
const valuesInputs = criteriaDiv.find('input.val');
let critertiaTextArray = [];
valuesInputs.each(function () {
critertiaTextArray.push(escapeSingleQuote($(this).val()));
});
criteriaText = joinWrappingElementsWith(critertiaTextArray, '\'');
query += window.sprintf(formatsText[criteriaOp], criteriaText);
} else {
const formatsText = getFormatsText();
if (!['IN (...)', 'NOT IN (...)'].includes(criteriaOp)) {
criteriaText = escapeSingleQuote(criteriaText);
}
query += window.sprintf(formatsText[criteriaOp], criteriaText);
}
} else {