mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-13 01:54:00 +02:00
Code Issues Releases Wiki Activity

Show comments at routine call (bug #874)

Browse Source
This commit is contained in:
Jakub Vrana
2025-02-23 16:35:11 +01:00
parent 42de70d032
commit 3ad62d55c8
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
adminer/call.inc.php
View File

@@ -88,3 +88,22 @@ if ($in) {
<input type="submit" value="<?php echo lang('Call'); ?>">
<input type="hidden" name="token" value="<?php echo $token; ?>">
</form>
<pre>
<?php
function pre_tr($s) {
return preg_replace('~^~m', '<tr>', preg_replace('~\|~', '<td>', preg_replace('~\|$~m', "", rtrim($s))));
}
$table = '(?:\+--[-+]+\+\n)';
$row = '(?:\| .* \|\n)';
echo
preg_replace_callback("~^($table?)($row)$table?($row*)$table?~m", function ($match) {
$first_row = pre_tr($match[2]);
return "<table>\n" . ($match[1] ? "<thead>$first_row</thead>\n" : $first_row) . pre_tr($match[3]) . "\n</table>";
},
preg_replace('~(\n( -|mysql)&gt; )(.+)~', "\\1<code class='jush-sql'>\\3</code>",
preg_replace('~(.+)\n---+\n~', "<b>\\1</b>\n",
h($routine['comment'])
)));
?>
</pre>

11
adminer/drivers/mysql.inc.php
View File

@@ -926,11 +926,14 @@ if (!defined("DRIVER")) {
"collation" => strtolower($param[9]),
);
}
if ($type != "FUNCTION") {
return array("fields" => $fields, "definition" => $match[11]);
}
return array(
$return = array(
"fields" => $fields,
"comment" => $connection->result("SELECT ROUTINE_COMMENT FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB) . " AND ROUTINE_NAME = " . q($name)),
);
if ($type != "FUNCTION") {
return $return + array("definition" => $match[11]);
}
return $return + array(
"returns" => array("type" => $match[12], "length" => $match[13], "unsigned" => $match[15], "collation" => $match[16]),
"definition" => $match[17],
"language" => "SQL", // available in information_schema.ROUTINES.PARAMETER_STYLE

1
changes.txt
View File

@@ -2,6 +2,7 @@ Adminer 4.17.0-dev:
Hide index column options by default
Offer original values in multi-row editing (regression from 4.16.0)
MySQL, PostgreSQL, MS SQL: Support CHECK constraint
MySQL: Show comments at routine call (bug #874)
MySQL: Don't offer empty enum value in edit
PostgreSQL: Link user defined types
PostgreSQL: Constraint enum values in editing (bug #270)