Add infrastructure for chosing index methods initial support for postgresql

adminer/drivers/elastic.inc.php

@@ -341,6 +341,15 @@ function indexes($table, $connection2 = null) {
 		);
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function fields($table) {
 		global $connection;
 

adminer/drivers/mongo.inc.php

@@ -195,6 +195,15 @@ function indexes($table, $connection2 = null) {
 			return $return;
 		}
 
+		/**
+		 * return list of supported index methods first one is default
+		 * @return string[]
+		 */
+		function index_methods()
+		{
+			return array();
+		}
+
 		function fields($table) {
 			return fields_from_edit();
 		}
@@ -445,6 +454,15 @@ function indexes($table, $connection2 = null) {
 			return $return;
 		}
 
+		/**
+		 * return list of supported index methods first one is default
+		 * @return string[]
+		 */
+		function index_methods()
+		{
+			return array();
+		}
+
 		function fields($table) {
 			global $driver;
 			$fields = fields_from_edit();

adminer/drivers/mssql.inc.php

@@ -413,6 +413,15 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function view($name) {
 		global $connection;
 		return array("select" => preg_replace('~^(?:[^[]|\[[^]]*])*\s+AS\s+~isU', '', $connection->result("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));

adminer/drivers/mysql.inc.php

@@ -578,6 +578,15 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	/** Get foreign keys in table
 	* @param string
 	* @return array array($name => array("db" => , "ns" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => ))

adminer/drivers/oracle.inc.php

@@ -325,6 +325,15 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function view($name) {
 		$view = views_table("view_name, text");
 		$rows = get_rows('SELECT text "select" FROM ' . $view . ' WHERE view_name = ' . q($name));

adminer/drivers/pgsql.inc.php

@@ -393,10 +393,11 @@ function indexes($table, $connection2 = null) {
 		$return = array();
 		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
 		$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
-		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
+		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial, am.amname as method FROM pg_index i, pg_class ci, pg_am am WHERE i.indrelid = $table_oid AND am.oid = ci.relam AND ci.oid = i.indexrelid ORDER BY indisprimary DESC", $connection2) as $row) {
 			$relname = $row["relname"];
 			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
 			$return[$relname]["columns"] = array();
+			$return[$relname]["method"] = $row["method"];
 			foreach (explode(" ", $row["indkey"]) as $indkey) {
 				$return[$relname]["columns"][] = $columns[$indkey];
 			}
@@ -409,6 +410,32 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		static $methods = [];
+		if (!$methods) {
+
+			// default guess for old PG instances
+			$methods = array(
+				"btree",
+				"gin",
+				"gist"
+			);
+			if (min_version(9.6)) {
+				// better aproach is to take that from DB
+				$methods = [];
+				foreach (get_rows("SELECT amname FROM pg_am WHERE amtype = 'i'") as $row) {
+					$methods[] = $row['amname'];
+				}
+			}
+		}
+		return $methods;
+	}
+
 	function foreign_keys($table) {
 		global $on_actions;
 		$return = array();
@@ -562,7 +589,12 @@ function alter_indexes($table, $alter) {
 			} elseif ($val[2] == "DROP") {
 				$drop[] = idf_escape($val[1]);
 			} else {
-				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
+				$usingSqlPart = "";
+				if ($val[3])
+				{
+					$usingSqlPart = "USING ".$val[3];
+				}
+				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $usingSqlPart (" . implode(", ", $val[2]) . ")";
 			}
 		}
 		if ($create) {

adminer/drivers/sqlite.inc.php

@@ -391,6 +391,15 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function foreign_keys($table) {
 		$return = array();
 		foreach (get_rows("PRAGMA foreign_key_list(" . table($table) . ")") as $row) {

adminer/include/adminer.inc.php

@@ -341,7 +341,7 @@ function tableIndexesPrint($indexes) {
 					. ($index["descs"][$key] ? " DESC" : "")
 				;
 			}
-			echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
+			echo "<tr title='" . h($name) . "'><th>$index[type]".(index_methods() ? " (".$index['method'].")" : "")."<td>".implode(", ", $print) . "\n";
 		}
 		echo "</table>\n";
 	}

adminer/indexes.inc.php

@@ -25,6 +25,7 @@
 			$columns = array();
 			$lengths = array();
 			$descs = array();
+			$indexMethod = array_key_exists("method", $index) && in_array($index["method"], index_methods()) ? $index["method"] : "";
 			$set = array();
 			ksort($index["columns"]);
 			foreach ($index["columns"] as $key => $column) {
@@ -48,13 +49,14 @@
 						&& array_values($existing["columns"]) === $columns
 						&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
 						&& array_values($existing["descs"]) === $descs
+						&& (array_key_exists("method", $existing) && $existing["method"] === $indexMethod)
 					) {
 						// skip existing index
 						unset($indexes[$name]);
 						continue;
 					}
 				}
-				$alter[] = array($index["type"], $name, $set);
+				$alter[] = array($index["type"], $name, $set, $indexMethod);
 			}
 		}
 	}
@@ -98,6 +100,10 @@
 <table cellspacing="0" class="nowrap">
 <thead><tr>
 <th id="label-type"><?php echo lang('Index Type'); ?>
+<?php
+if (index_methods())
+    echo "<th id=\"label-method\">".lang('Index method');
+?>
 <th><input type="submit" class="wayoff"><?php echo lang('Column (length)'); ?>
 <th id="label-name"><?php echo lang('Name'); ?>
 <th><noscript><?php echo "<input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?></noscript>
@@ -115,7 +121,9 @@
 foreach ($row["indexes"] as $index) {
 	if (!$_POST["drop_col"] || $j != key($_POST["drop_col"])) {
 		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : 1), "label-type");
-
+        if (index_methods()){
+			echo "<td>".html_select("indexes[$j][method]", array_merge([""], index_methods()), $index['method'], $onchange = true, "label-method");
+        }
 		echo "<td>";
 		ksort($index["columns"]);
 		$i = 1;

plugins/drivers/clickhouse.php

@@ -327,6 +327,15 @@ function indexes($table, $connection2 = null) {
 		return array();
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function foreign_keys($table) {
 		return array();
 	}

plugins/drivers/firebird.php

@@ -274,6 +274,15 @@ function indexes($table, $connection2 = null) {
 		return $return;
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function foreign_keys($table) {
 		return array();
 	}

plugins/drivers/simpledb.php

@@ -333,6 +333,15 @@ function indexes($table, $connection2 = null) {
 		);
 	}
 
+	/**
+	 * return list of supported index methods first one is default
+	 * @return string[]
+	 */
+	function index_methods()
+	{
+		return array();
+	}
+
 	function fields($table) {
 		return fields_from_edit();
 	}