From 857cbf03f205f0c73fcaff0f0146dc40256c24c7 Mon Sep 17 00:00:00 2001 From: Peter Knut Date: Sat, 3 Apr 2021 15:19:53 +0200 Subject: [PATCH] Fix version condition for deprecated mapping types Mapping types are still supported in version 6, but only one mapping type can be created. In version 7, mapping types are deprecated and there is only one system '_doc' mapping type. See: https://www.elastic.co/guide/en/elasticsearch/reference/6.0/removal-of-types.html --- adminer/drivers/elastic.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php index 22da0a4b..a069cf85 100644 --- a/adminer/drivers/elastic.inc.php +++ b/adminer/drivers/elastic.inc.php @@ -122,7 +122,7 @@ if (isset($_GET["elastic"])) { function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) { global $adminer; $data = array(); - $query = (min_version(6) ? "" : "$table/") . "_search"; + $query = (min_version(7) ? "" : "$table/") . "_search"; if ($select != array("*")) { $data["fields"] = $select; } @@ -307,7 +307,7 @@ if (isset($_GET["elastic"])) { function tables_list() { global $connection; - if (min_version(6)) { + if (min_version(7)) { return array('_doc' => 'table'); } @@ -368,7 +368,7 @@ if (isset($_GET["elastic"])) { global $connection; $mappings = array(); - if (min_version(6)) { + if (min_version(7)) { $result = $connection->query("_mapping"); if ($result) { $mappings = $result[$connection->_db]['mappings']['properties'];