From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 30 Jan 2018 14:55:50 +0000 (+0100)
Subject: PostgreSQL: Allow creating trigger functions
X-Git-Tag: v4.6.0~54
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=1f21cd43;p=adminer.git

PostgreSQL: Allow creating trigger functions
---

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 983e6c0d..619bb27e 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -135,20 +135,21 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 * @param array
 * @param array
 * @param array returned by referencable_primary()
+* @param array extra types to prepend
 * @return null
 */
-function edit_type($key, $field, $collations, $foreign_keys = array()) {
+function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
 	$type = $field["type"];
 	?>
 <td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
-if ($type && !isset($types[$type]) && !isset($foreign_keys[$type])) {
-	array_unshift($structured_types, $type);
+if ($type && !isset($types[$type], $foreign_keys[$type]) && !in_array($type, $extra_types)) {
+	$extra_types[] = $type;
 }
 if ($foreign_keys) {
 	$structured_types[lang('Foreign keys')] = $foreign_keys;
 }
-echo optionlist($structured_types, $type);
+echo optionlist(array_merge($extra_types, $structured_types), $type);
 ?></select>
 <?php echo on_help("getTarget(event).value", 1); ?>
 <?php echo script("mixin(qsl('select'), {onfocus: function () { lastType = selectValue(this); }, onchange: editingTypeChange});", ""); ?>
diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 942dd189..4a2731ac 100644
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -43,7 +43,7 @@ $routine_languages = routine_languages();
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
 	echo "<tr><td>" . lang('Return type');
-	edit_type("returns", $row["returns"], $collations);
+	edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
 }
 ?>
 </table>