From e115dccdae219927b08c33286f27e7286b6bb0d7 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 19 Jun 2025 10:03:12 +0200 Subject: [PATCH] MariaDB: Parse COLLATE in routine definition (fix #1104) --- CHANGELOG.md | 1 + adminer/drivers/mysql.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd7bc56a..c8aa54d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add section links in database overview - Warn about exceeded max_file_uploads in import - MySQL 5.0-: Do not load partitioning info in alter table (bug #1099) +- MariaDB: Parse COLLATE in routine definition (bug #1104) - PostgreSQL: Show structure of inherited tables - PostgreSQL: Display index expressions - PostgreSQL: Add SQL operator to select diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index a3ec0c42..0f5d850c 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -896,7 +896,7 @@ if (!defined('Adminer\DRIVER')) { $space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)"; $enum = driver()->enumLength; $type_pattern = "((" . implode("|", array_merge(array_keys(driver()->types()), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$enum)++)\\))?" - . "\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?"; + . "\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?(?:\\s*COLLATE\\s*['\"]?([^'\"\\s,]+)['\"]?)?"; //! store COLLATE $pattern = "$space*(" . ($type == "FUNCTION" ? "" : driver()->inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern"; $create = get_val("SHOW CREATE $type " . idf_escape($name), 2); preg_match("~\\(((?:$pattern\\s*,?)*)\\)\\s*" . ($type == "FUNCTION" ? "RETURNS\\s+$type_pattern\\s+" : "") . "(.*)~is", $create, $match);