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

Fix version condition for deprecated mapping types

Browse Source 
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
This commit is contained in:
Peter Knut
2021-04-03 15:19:53 +02:00
committed by Jakub Vrana
parent 266fda37a1
commit 1270748f74
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adminer/drivers/elastic.inc.php
View File

@@ -111,7 +111,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;
}
@@ -296,7 +296,7 @@ if (isset($_GET["elastic"])) {
function tables_list() {
global $connection;
if (min_version(6)) {
if (min_version(7)) {
return array('_doc' => 'table');
}
@@ -357,7 +357,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'];