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

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2025-03-27 20:11:13 -03:00
commit 9291a9ff8f
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/js/src/table/change.ts
View File

@ -426,6 +426,11 @@ function verificationsAfterFieldChange (urlField, multiEdit, theType) {
$thisInput.removeAttr('min');
$thisInput.removeAttr('max');
// @todo: put back attributes if corresponding function is deselected
if ($thisFunction.val() === 'NOW') {
$thisInput.attr('min', 0);
$thisInput.attr('max', $thisInput.parent().attr('data-decimals'));
}
}
if ($thisInput.data('rulesadded') === null && ! functionSelected) {

2
resources/js/src/table/select.ts
View File

@ -306,7 +306,7 @@ AJAX.registerOnload('table/select.js', function () {
// Get the operator.
const operator = ($(this).val() as string);
const $targetField = $(this).closest('tr').find('[name*="criteriaValues"]')
const $targetField = $(this).closest('tr').find('[name*="criteriaValues"]');
$targetField.prop('disabled', opIsUnary(operator));
$targetField.siblings('.ui-datepicker-trigger').eq(0).toggle(!opIsUnary(operator));

10
src/InsertEdit.php
View File

@ -24,6 +24,7 @@ use function htmlspecialchars;
use function implode;
use function in_array;
use function is_array;
use function is_numeric;
use function is_string;
use function json_encode;
use function max;
@ -44,7 +45,7 @@ use const PASSWORD_DEFAULT;
class InsertEdit
{
private const FUNC_OPTIONAL_PARAM = ['RAND', 'UNIX_TIMESTAMP'];
private const FUNC_OPTIONAL_PARAM = ['NOW', 'RAND', 'UNIX_TIMESTAMP'];
private const FUNC_NO_PARAM = [
'CONNECTION_ID',
@ -1132,6 +1133,13 @@ class InsertEdit
. $this->dbi->quoteString($editField->salt) . ')';
}
if (
$editField->function === 'NOW'
&& (is_numeric($editField->value) && $editField->value >= 0 && $editField->value <= 6)
) {
return $editField->function . '(' . (int) $editField->value . ')';
}
return $editField->function . '(' . $this->dbi->quoteString($editField->value) . ')';
}