Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 12e1bf642596 · 2024-07-13T13:19:30.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/bin/internal/check-release-excludes.sh b/bin/internal/check-release-excludes.sh
@@ -118,6 +118,8 @@ validateExtension() {
         ;;
         vendor/pragmarx/google2fa-qrcode/composer.lock)
         ;;
+        vendor/williamdes/mariadb-mysql-kbs/cliff.toml)
+        ;;
         vendor/williamdes/mariadb-mysql-kbs/dist/merged-ultraslim.json)
         ;;
         vendor/composer/installed.json)
diff --git a/package.json b/package.json
@@ -36,11 +36,11 @@
     "css-loader": "^6.6.0",
     "date-fns": "^3.6.0",
     "jquery": "3.7.1",
-    "jquery-migrate": "3.4.1",
+    "jquery-migrate": "3.5.0",
     "jquery-ui-dist": "1.13.3",
     "jquery-ui-timepicker-addon": "1.6.3",
     "jquery-uitablefilter": "^1.0.0",
-    "jquery-validation": "1.20.0",
+    "jquery-validation": "1.20.1",
     "js-cookie": "3.0.5",
     "locutus.sprintf": "^2.0.32-code-lts.1",
     "mini-css-extract-plugin": "^2.5.3",
diff --git a/src/InsertEdit.php b/src/InsertEdit.php
@@ -1326,7 +1326,7 @@ private function formatAsSqlValueBasedOnType(
 
         if (
             ($editField->type !== 'datetime' && $editField->type !== 'timestamp' && $editField->type !== 'date')
-            || ($editField->value !== 'CURRENT_TIMESTAMP' && $editField->value !== 'current_timestamp()')
+            || preg_match('/^current_timestamp(\([0-6]?\))?$/i', $editField->value) < 1
         ) {
             return $this->dbi->quoteString($editField->value);
         }
diff --git a/src/Util.php b/src/Util.php
@@ -1504,7 +1504,7 @@ public static function getMenuTabList(UserGroupLevel $level): array
      */
     public static function addMicroseconds(string $value): string
     {
-        if ($value === '' || $value === 'CURRENT_TIMESTAMP' || $value === 'current_timestamp()') {
+        if ($value === '' || preg_match('/^current_timestamp(\([0-6]?\))?$/i', $value) > 0) {
             return $value;
         }
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,7 @@ private function formatAsSqlValueBasedOnType(`
`1326`	`1326`
`1327`	`1327`	`if (`
`1328`	`1328`	`($editField->type !== 'datetime' && $editField->type !== 'timestamp' && $editField->type !== 'date')`
`1329`		`- \|\| ($editField->value !== 'CURRENT_TIMESTAMP' && $editField->value !== 'current_timestamp()')`
	`1329`	`+ \|\| preg_match('/^current_timestamp(\([0-6]?\))?$/i', $editField->value) < 1`
`1330`	`1330`	`) {`
`1331`	`1331`	`return $this->dbi->quoteString($editField->value);`
`1332`	`1332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1504,7 +1504,7 @@ public static function getMenuTabList(UserGroupLevel $level): array`
`1504`	`1504`	`*/`
`1505`	`1505`	`public static function addMicroseconds(string $value): string`
`1506`	`1506`	`{`
`1507`		`- if ($value === '' \|\| $value === 'CURRENT_TIMESTAMP' \|\| $value === 'current_timestamp()') {`
	`1507`	`+ if ($value === '' \|\| preg_match('/^current_timestamp(\([0-6]?\))?$/i', $value) > 0) {`
`1508`	`1508`	`return $value;`
`1509`	`1509`	`}`
`1510`	`1510`