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

Add back UUID and UUID_SHORT to functions on MySQL and all MariaDB versions

Browse Source 
Ref: https://github.com/phpmyadmin/phpmyadmin/pull/17767

It was a mistake to remove the UUID functions, they are not the UUID type

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2023-01-20 20:18:55 +04:00
parent 7eec8c18cd
commit 6d482de7b8
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/classes/Query/Compatibility.php
View File

@ -207,6 +207,7 @@ class Compatibility
*/ */
public static function isUUIDSupported(DatabaseInterface $dbi): bool public static function isUUIDSupported(DatabaseInterface $dbi): bool
{ {
// @see: https://mariadb.com/kb/en/mariadb-1070-release-notes/#uuid
return $dbi->isMariaDB() && $dbi->getVersion() >= 100700; // 10.7.0 return $dbi->isMariaDB() && $dbi->getVersion() >= 100700; // 10.7.0
} }

9
libraries/classes/Types.php
View File

@ -529,7 +529,6 @@ class Types
{ {
$isMariaDB = $this->dbi->isMariaDB(); $isMariaDB = $this->dbi->isMariaDB();
$serverVersion = $this->dbi->getVersion(); $serverVersion = $this->dbi->getVersion();
$isUUIDSupported = Compatibility::isUUIDSupported($this->dbi);
switch ($class) { switch ($class) {
case 'CHAR': case 'CHAR':
@ -574,10 +573,6 @@ class Types
$ret = array_diff($ret, ['INET6_NTOA']); $ret = array_diff($ret, ['INET6_NTOA']);
} }
if (! $isUUIDSupported) {
$ret = array_diff($ret, ['UUID']);
}
return array_values($ret); return array_values($ret);
case 'DATE': case 'DATE':
@ -659,10 +654,6 @@ class Types
$ret = array_diff($ret, ['INET6_ATON']); $ret = array_diff($ret, ['INET6_ATON']);
} }
if (! $isUUIDSupported) {
$ret = array_diff($ret, ['UUID_SHORT']);
}
return array_values($ret); return array_values($ret);
case 'SPATIAL': case 'SPATIAL':