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

Elastic: Fix text search on boolean fields

Browse Source 
When searching in all fields for a text value, an error was thrown
with ElasticSearch 7.17.23 when the index contains boolean fields:

> query_shard_exception: failed to create query:
> Can't parse boolean value [textvalue], expected [true] or [false]

This patch fixes that problem by skipping boolean fields when the
search word is not the string "true" or "false".
This commit is contained in:
Christian Weiske
2025-02-28 14:32:23 +01:00
committed by Jakub Vrana
parent 4967a40410
commit d5a17835ff
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changes.txt
View File

@@ -18,6 +18,7 @@ MS SQL: Remove support for MSSQL extension
MS SQL: Add support for PDO_SQLSRV extension MS SQL: Add support for PDO_SQLSRV extension
MS SQL: Link help from sys tables MS SQL: Link help from sys tables
MongoDB: Remove support for deprecated extension mongo MongoDB: Remove support for deprecated extension mongo
Elasticsearch: Fix text search on boolean fields
Adminer 4.17.1 (released 2025-02-25): Adminer 4.17.1 (released 2025-02-25):
MySQL: Fix typo in the date type (regression from 4.17.0) MySQL: Fix typo in the date type (regression from 4.17.0)

10
plugins/drivers/elastic.php
View File

@@ -143,13 +143,23 @@ if (isset($_GET["elastic"])) {
} }
} }
$fields = null;
foreach ($where as $val) { foreach ($where as $val) {
if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) { if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) {
$parts = explode(" OR ", $matches[1]); $parts = explode(" OR ", $matches[1]);
$terms = array(); $terms = array();
if ($fields === null) {
$fields = fields($table);
}
foreach ($parts as $part) { foreach ($parts as $part) {
list($col, $op, $val) = explode(" ", $part, 3); list($col, $op, $val) = explode(" ", $part, 3);
$term = array($col => $val); $term = array($col => $val);
if (isset($fields[$col]) && $fields[$col]['full_type'] == 'boolean'
&& $val !== 'true' && $val !== 'false'
) {
continue;
}
if ($op == "=") { if ($op == "=") {
$terms[] = array("term" => $term); $terms[] = array("term" => $term);
} elseif (in_array($op, array("must", "should", "must_not"))) { } elseif (in_array($op, array("must", "should", "must_not"))) {