diff --git a/adminer/db.inc.php b/adminer/db.inc.php index 6c879fce..4b3974ec 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -61,7 +61,7 @@ if ($adminer->homepage()) { echo " \n"; echo "\n"; if ($_POST["search"] && $_POST["query"] != "") { - $_GET["where"][0]["op"] = "LIKE %%"; + $_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%"); search_tables(); } } diff --git a/adminer/elastic.php b/adminer/elastic.php new file mode 100644 index 00000000..ccfc5975 --- /dev/null +++ b/adminer/elastic.php @@ -0,0 +1,13 @@ +_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array( + 'method' => $method, + 'content' => $content !== null ? json_encode($content) : null, + 'header' => $content !== null ? 'Content-Type: application/json' : [], + 'ignore_errors' => 1, + 'follow_location' => 0, + 'max_redirects' => 0, + )))); + + if ($file === false) { + $this->error = lang('Invalid server or credentials.'); + return false; + } + + $return = json_decode($file, true); + if ($return === null) { + $this->error = lang('Invalid server or credentials.'); + return false; + } + + if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) { + if (isset($return['error']['root_cause'][0]['type'])) { + $this->error = $return['error']['root_cause'][0]['type'] . ": " . $return['error']['root_cause'][0]['reason']; + } elseif (isset($return['status']) && isset($return['error']) && is_string($return['error'])) { + $this->error = $return['error']; + } + + return false; + } + + return $return; + } + + /** Performs query relative to actual selected DB + * @param string $path + * @param array|null $content + * @param string $method + * @return array|false + */ + function query($path, array $content = null, $method = 'GET') { + // Support for global search through all tables + if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) { + global $driver; + + $where = explode(" AND ", $matches[2]); + + return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]); + } + + return $this->rootQuery($path, $content, $method); + } + + /** + * @param string $server + * @param string $username + * @param string $password + * @return bool + */ + function connect($server, $username, $password) { + $this->_url = build_http_url($server, $username, $password, "localhost", 9200); + + $return = $this->query(''); + if (!$return) { + return false; + } + + if (!isset($return['version']['number'])) { + $this->error = lang('Invalid server or credentials.'); + return false; + } + + $this->server_info = $return['version']['number']; + return true; + } + + function select_db($database) { + return true; + } + + function quote($string) { + return $string; + } + } + + class Min_Result { + var $num_rows, $_rows; + + function __construct($rows) { + $this->num_rows = count($rows); + $this->_rows = $rows; + + reset($this->_rows); + } + + function fetch_assoc() { + $return = current($this->_rows); + next($this->_rows); + + return $return; + } + + function fetch_row() { + $row = $this->fetch_assoc(); + + return $row ? array_values($row) : false; + } + } + } + + class Min_Driver extends Min_SQL { + + function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) { + $data = array(); + if ($select != array("*")) { + $data["fields"] = $select; + } + + if ($order) { + $sort = array(); + foreach ($order as $col) { + $col = preg_replace('~ DESC$~', '', $col, 1, $count); + $sort[] = ($count ? array($col => "desc") : $col); + } + $data["sort"] = $sort; + } + + if ($limit) { + $data["size"] = +$limit; + if ($page) { + $data["from"] = ($page * $limit); + } + } + + foreach ($where as $val) { + if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) { + $parts = explode(" OR ", $matches[1]); + $terms = array(); + foreach ($parts as $part) { + list($col, $op, $val) = explode(" ", $part, 3); + $term = array($col => $val); + if ($op == "=") { + $terms[] = array("term" => $term); + } elseif (in_array($op, array("must", "should", "must_not"))) { + $data["query"]["bool"][$op][]["match"] = $term; + } + } + + if (!empty($terms)) { + $data["query"]["bool"]["filter"][]["bool"]["should"] = $terms; + } + } else { + list($col, $op, $val) = explode(" ", $val, 3); + $term = array($col => $val); + if ($op == "=") { + $data["query"]["bool"]["filter"][] = array("term" => $term); + } elseif (in_array($op, array("must", "should", "must_not"))) { + $data["query"]["bool"][$op][]["match"] = $term; + } + } + } + + $query = "$table/_search"; + $start = microtime(true); + $search = $this->_conn->rootQuery($query, $data); + + if ($print) { + echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search); + } + if (empty($search)) { + return false; + } + + $return = array(); + foreach ($search["hits"]["hits"] as $hit) { + $row = array(); + if ($select == array("*")) { + $row["_id"] = $hit["_id"]; + } + + if ($select != array("*")) { + $fields = array(); + foreach ($select as $key) { + $fields[$key] = $key == "_id" ? $hit["_id"] : $hit["_source"][$key]; + } + } else { + $fields = $hit["_source"]; + } + foreach ($fields as $key => $val) { + $row[$key] = (is_array($val) ? json_encode($val) : $val); + } + + $return[] = $row; + } + + return new Min_Result($return); + } + + function update($type, $record, $queryWhere, $limit = 0, $separator = "\n") { + //! use $limit + $parts = preg_split('~ *= *~', $queryWhere); + if (count($parts) == 2) { + $id = trim($parts[1]); + $query = "$type/$id"; + + return $this->_conn->query($query, $record, 'POST'); + } + + return false; + } + + function insert($type, $record) { + $id = ""; //! user should be able to inform _id + $query = "$type/$id"; + $response = $this->_conn->query($query, $record, 'POST'); + $this->_conn->last_id = $response['_id']; + + return $response['created']; + } + + function delete($table, $queryWhere, $limit = 0) { + //! use $limit + $ids = array(); + if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) { + $ids[] = $_GET["where"]["_id"]; + } + if (isset($_POST['check'])) { + foreach ($_POST['check'] as $check) { + $parts = preg_split('~ *= *~', $check); + if (count($parts) == 2) { + $ids[] = trim($parts[1]); + } + } + } + + $this->_conn->affected_rows = 0; + + foreach ($ids as $id) { + $query = "$table/_doc/$id"; + $response = $this->_conn->query($query, null, 'DELETE'); + if (isset($response['result']) && $response['result'] == 'deleted') { + $this->_conn->affected_rows++; + } + } + + return $this->_conn->affected_rows; + } + + function convertOperator($operator) { + return $operator == "LIKE %%" ? "should" : $operator; + } + } + + function connect() { + $connection = new Min_DB; + + list($server, $username, $password) = adminer()->credentials(); + if ($password != "" && $connection->connect($server, $username, "")) { + return lang('Database does not support password.'); + } + + if ($connection->connect($server, $username, $password)) { + return $connection; + } + + return $connection->error; + } + + function support($feature) { + return preg_match("~table|columns~", $feature); + } + + function logged_user() { + $credentials = adminer()->credentials(); + + return $credentials[1]; + } + + function get_databases() { + return array(ELASTIC_DB_NAME); + } + + function limit($query, $where, $limit, $offset = 0, $separator = " ") { + return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : ""); + } + + function collations() { + return array(); + } + + function db_collation($db, $collations) { + // + } + + function engines() { + return array(); + } + + function count_tables($databases) { + $return = connection()->rootQuery('_aliases'); + if (empty($return)) { + return array( + ELASTIC_DB_NAME => 0 + ); + } + + return array( + ELASTIC_DB_NAME => count($return) + ); + } + + function tables_list() { + $aliases = connection()->rootQuery('_aliases'); + if (empty($aliases)) { + return array(); + } + + ksort($aliases); + + $tables = array(); + foreach ($aliases as $name => $index) { + $tables[$name] = "table"; + + ksort($index["aliases"]); + $tables += array_fill_keys(array_keys($index["aliases"]), "view"); + } + + return $tables; + } + + function table_status($name = "", $fast = false) { + $stats = connection()->rootQuery('_stats'); + $aliases = connection()->rootQuery('_aliases'); + + if (empty($stats) || empty($aliases)) { + return array(); + } + + $result = array(); + + if ($name != "") { + if (isset($stats["indices"][$name])) { + return format_index_status($name, $stats["indices"][$name]); + } else foreach ($aliases as $index_name => $index) { + foreach ($index["aliases"] as $alias_name => $alias) { + if ($alias_name == $name) { + return format_alias_status($alias_name, $stats["indices"][$index_name]); + } + } + } + } + + ksort($stats["indices"]); + foreach ($stats["indices"] as $name => $index) { + if ($name[0] == ".") { + continue; + } + + $result[$name] = format_index_status($name, $index); + + if (!empty($aliases[$name]["aliases"])) { + ksort($aliases[$name]["aliases"]); + foreach ($aliases[$name]["aliases"] as $alias_name => $alias) { + $result[$alias_name] = format_alias_status($alias_name, $stats["indices"][$name]); + } + } + } + + return $result; + } + + function format_index_status($name, $index) { + return array( + "Name" => $name, + "Engine" => "Lucene", + "Oid" => $index["uuid"], + "Rows" => $index["total"]["docs"]["count"], + "Auto_increment" => 0, + "Data_length" => $index["total"]["store"]["size_in_bytes"], + "Index_length" => 0, + "Data_free" => $index["total"]["store"]["reserved_in_bytes"], + ); + } + + function format_alias_status($name, $index) { + return array( + "Name" => $name, + "Engine" => "view", + "Rows" => $index["total"]["docs"]["count"], + ); + } + + function is_view($table_status) { + return $table_status["Engine"] == "view"; + } + + function error() { + return h(connection()->error); + } + + function information_schema() { + // + } + + function indexes($table, $connection2 = null) { + return array( + array("type" => "PRIMARY", "columns" => array("_id")), + ); + } + + function fields($table) { + $mappings = array(); + $mapping = connection()->rootQuery("_mapping"); + + if (!isset($mapping[$table])) { + $aliases = connection()->rootQuery('_aliases'); + + foreach ($aliases as $index_name => $index) { + foreach ($index["aliases"] as $alias_name => $alias) { + if ($alias_name == $table) { + $table = $index_name; + break; + } + } + } + } + + if (!empty($mapping)) { + $mappings = $mapping[$table]["mappings"]["properties"]; + } + + $result = array( + "_id" => array( + "field" => "_id", + "full_type" => "text", + "type" => "text", + "privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1), + ) + ); + + foreach ($mappings as $name => $field) { + $has_index = !isset($field["index"]) || $field["index"]; + + // TODO: privileges: where => $has_index + // TODO: privileges: sort => $field["type"] != "text" + + $result[$name] = array( + "field" => $name, + "full_type" => $field["type"], + "type" => $field["type"], + "privileges" => array( + "insert" => 1, + "select" => 1, + "update" => 1, + "where" => !isset($field["index"]) || $field["index"] ?: null, + "order" => $field["type"] != "text" ?: null + ), + ); + } + + return $result; + } + + function foreign_keys($table) { + return array(); + } + + function table($idf) { + return $idf; + } + + function idf_escape($idf) { + return $idf; + } + + function convert_field($field) { + // + } + + function unconvert_field($field, $return) { + return $return; + } + + function fk_support($table_status) { + // + } + + function found_rows($table_status, $where) { + return null; + } + + /** Create index + * @param string + * @return mixed + */ + function create_database($db) { + return connection()->rootQuery(urlencode($db), null, 'PUT'); + } + + /** Remove index + * @param array + * @return mixed + */ + function drop_databases($databases) { + return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE'); + } + + /** Alter type + * @param array + * @return mixed + */ + function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) { + $properties = array(); + foreach ($fields as $f) { + $field_name = trim($f[1][0]); + $field_type = trim($f[1][1] ? $f[1][1] : "text"); + $properties[$field_name] = array( + 'type' => $field_type + ); + } + + if (!empty($properties)) { + $properties = array('properties' => $properties); + } + + return connection()->query("_mapping/{$name}", $properties, 'PUT'); + } + + /** Drop types + * @param array + * @return bool + */ + function drop_tables($tables) { + $return = true; + foreach ($tables as $table) { //! convert to bulk api + $return = $return && connection()->query(urlencode($table), null, 'DELETE'); + } + + return $return; + } + + function last_id() { + return connection()->last_id; + } + + function driver_config() { + $types = array(); + $structured_types = array(); + + foreach (array( + lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21), + lang('Date and time') => array("date" => 10), + lang('Strings') => array("string" => 65535, "text" => 65535), + lang('Binary') => array("binary" => 255), + ) as $key => $val) { + $types += $val; + $structured_types[$key] = array_keys($val); + } + + return array( + 'possible_drivers' => array("json + allow_url_fopen"), + 'jush' => "elastic", + 'operators' => array("=", "must", "should", "must_not"), + 'functions' => array(), + 'grouping' => array(), + 'edit_functions' => array(array("json")), + 'types' => $types, + 'structured_types' => $structured_types, + ); + } +} diff --git a/adminer/drivers/elastic.inc.php b/plugins/drivers/elastic5.php similarity index 68% rename from adminer/drivers/elastic.inc.php rename to plugins/drivers/elastic5.php index a6b2de8a..1fdf79a6 100644 --- a/adminer/drivers/elastic.inc.php +++ b/plugins/drivers/elastic5.php @@ -1,10 +1,10 @@ _url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array( 'method' => $method, 'content' => $content !== null ? json_encode($content) : null, @@ -55,6 +56,15 @@ if (isset($_GET["elastic"])) { * @return array|false */ function query($path, array $content = null, $method = 'GET') { + // Support for global search through all tables + if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) { + global $driver; + + $where = explode(" AND ", $matches[2]); + + return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]); + } + return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method); } @@ -83,13 +93,13 @@ if (isset($_GET["elastic"])) { function select_db($database) { $this->_db = $database; + return true; } function quote($string) { return $string; } - } class Min_Result { @@ -98,34 +108,33 @@ if (isset($_GET["elastic"])) { function __construct($rows) { $this->num_rows = count($rows); $this->_rows = $rows; + reset($this->_rows); } function fetch_assoc() { $return = current($this->_rows); next($this->_rows); + return $return; } function fetch_row() { - return array_values($this->fetch_assoc()); + $row = $this->fetch_assoc(); + + return $row ? array_values($row) : false; } - } - } - - class Min_Driver extends Min_SQL { function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) { - global $adminer; $data = array(); - $query = "$table/_search"; if ($select != array("*")) { $data["fields"] = $select; } + if ($order) { $sort = array(); foreach ($order as $col) { @@ -134,58 +143,78 @@ if (isset($_GET["elastic"])) { } $data["sort"] = $sort; } + if ($limit) { $data["size"] = +$limit; if ($page) { $data["from"] = ($page * $limit); } } + foreach ($where as $val) { - list($col, $op, $val) = explode(" ", $val, 3); - if ($col == "_id") { - $data["query"]["ids"]["values"][] = $val; - } - elseif ($col . $val != "") { - $term = array("term" => array(($col != "" ? $col : "_all") => $val)); + if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) { + $parts = explode(" OR ", $matches[1]); + $terms = array(); + foreach ($parts as $part) { + list($col, $op, $val) = explode(" ", $part, 3); + $term = array($col => $val); + if ($op == "=") { + $terms[] = array("term" => $term); + } elseif (in_array($op, array("must", "should", "must_not"))) { + $data["query"]["bool"][$op][]["match"] = $term; + } + } + + if (!empty($terms)) { + $data["query"]["bool"]["filter"][]["bool"]["should"] = $terms; + } + } else { + list($col, $op, $val) = explode(" ", $val, 3); + $term = array($col => $val); if ($op == "=") { - $data["query"]["filtered"]["filter"]["and"][] = $term; - } else { - $data["query"]["filtered"]["query"]["bool"]["must"][] = $term; + $data["query"]["bool"]["filter"][] = array("term" => $term); + } elseif (in_array($op, array("must", "should", "must_not"))) { + $data["query"]["bool"][$op][]["match"] = $term; } } } - if ($data["query"] && !$data["query"]["filtered"]["query"] && !$data["query"]["ids"]) { - $data["query"]["filtered"]["query"] = array("match_all" => array()); - } + + $query = (min_version(7) ? "" : "$table/") . "_search"; $start = microtime(true); $search = $this->_conn->query($query, $data); + if ($print) { - echo $adminer->selectQuery("$query: " . json_encode($data), $start, !$search); + echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search); } if (!$search) { return false; } + $return = array(); foreach ($search['hits']['hits'] as $hit) { $row = array(); if ($select == array("*")) { $row["_id"] = $hit["_id"]; } + $fields = $hit['_source']; if ($select != array("*")) { $fields = array(); foreach ($select as $key) { - $fields[$key] = $hit['fields'][$key]; + $fields[$key] = $key == "_id" ? [$hit["_id"]] : $hit['fields'][$key]; } } + foreach ($fields as $key => $val) { if ($data["fields"]) { $val = $val[0]; } $row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently } + $return[] = $row; } + return new Min_Result($return); } @@ -195,8 +224,10 @@ if (isset($_GET["elastic"])) { if (count($parts) == 2) { $id = trim($parts[1]); $query = "$type/$id"; + return $this->_conn->query($query, $record, 'POST'); } + return false; } @@ -205,16 +236,17 @@ if (isset($_GET["elastic"])) { $query = "$type/$id"; $response = $this->_conn->query($query, $record, 'POST'); $this->_conn->last_id = $response['_id']; + return $response['created']; } function delete($type, $queryWhere, $limit = 0) { //! use $limit $ids = array(); - if (is_array($_GET["where"]) && $_GET["where"]["_id"]) { + if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) { $ids[] = $_GET["where"]["_id"]; } - if (is_array($_POST['check'])) { + if (isset($_POST['check'])) { foreach ($_POST['check'] as $check) { $parts = preg_split('~ *= *~', $check); if (count($parts) == 2) { @@ -222,30 +254,37 @@ if (isset($_GET["elastic"])) { } } } + $this->_conn->affected_rows = 0; + foreach ($ids as $id) { $query = "{$type}/{$id}"; - $response = $this->_conn->query($query, '{}', 'DELETE'); - if (is_array($response) && $response['found'] == true) { + $response = $this->_conn->query($query, null, 'DELETE'); + if ((isset($response['found']) && $response['found']) || (isset($response['result']) && $response['result'] == 'deleted')) { $this->_conn->affected_rows++; } } + return $this->_conn->affected_rows; } + + function convertOperator($operator) { + return $operator == "LIKE %%" ? "should" : $operator; + } } - - function connect() { - global $adminer; $connection = new Min_DB; - list($server, $username, $password) = $adminer->credentials(); + + list($server, $username, $password) = adminer()->credentials(); if ($password != "" && $connection->connect($server, $username, "")) { return lang('Database does not support password.'); } + if ($connection->connect($server, $username, $password)) { return $connection; } + return $connection->error; } @@ -254,26 +293,31 @@ if (isset($_GET["elastic"])) { } function logged_user() { - global $adminer; - $credentials = $adminer->credentials(); + $credentials = adminer()->credentials(); + return $credentials[1]; } function get_databases() { - global $connection; - $return = $connection->rootQuery('_aliases'); + $return = connection()->rootQuery('_aliases'); if ($return) { $return = array_keys($return); sort($return, SORT_STRING); } + return $return; } + function limit($query, $where, $limit, $offset = 0, $separator = " ") { + return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : ""); + } + function collations() { return array(); } function db_collation($db, $collations) { + // } function engines() { @@ -281,9 +325,9 @@ if (isset($_GET["elastic"])) { } function count_tables($databases) { - global $connection; $return = array(); - $result = $connection->query('_stats'); + + $result = connection()->query('_stats'); if ($result && $result['indices']) { $indices = $result['indices']; foreach ($indices as $indice => $stats) { @@ -291,26 +335,25 @@ if (isset($_GET["elastic"])) { $return[$indice] = $indexing['index_total']; } } + return $return; } function tables_list() { - global $connection; - - if (min_version(6)) { + if (min_version(7)) { return array('_doc' => 'table'); } - $return = $connection->query('_mapping'); + $return = connection()->query('_mapping'); if ($return) { - $return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table'); + $return = array_fill_keys(array_keys($return[connection()->_db]["mappings"]), 'table'); } + return $return; } function table_status($name = "", $fast = false) { - global $connection; - $search = $connection->query("_search", array( + $search = connection()->query("_search", array( "size" => 0, "aggregations" => array( "count_by_type" => array( @@ -320,26 +363,30 @@ if (isset($_GET["elastic"])) { ) ) ), "POST"); + $return = array(); + if ($search) { $tables = $search["aggregations"]["count_by_type"]["buckets"]; + foreach ($tables as $table) { $return[$table["key"]] = array( "Name" => $table["key"], "Engine" => "table", "Rows" => $table["doc_count"], ); + if ($name != "" && $name == $table["key"]) { return $return[$name]; } } } + return $return; } function error() { - global $connection; - return h($connection->error); + return h(connection()->error); } function information_schema() { @@ -355,45 +402,54 @@ if (isset($_GET["elastic"])) { } function fields($table) { - global $connection; - $mappings = array(); - if (min_version(6)) { - $result = $connection->query("_mapping"); + + if (min_version(7)) { + $result = connection()->query("_mapping"); if ($result) { - $mappings = $result[$connection->_db]['mappings']['properties']; + $mappings = $result[connection()->_db]['mappings']['properties']; } } else { - $result = $connection->query("$table/_mapping"); + $result = connection()->query("$table/_mapping"); if ($result) { $mappings = $result[$table]['properties']; if (!$mappings) { - $mappings = $result[$connection->_db]['mappings'][$table]['properties']; + $mappings = $result[connection()->_db]['mappings'][$table]['properties']; } } } - $return = array(); - if ($mappings) { - foreach ($mappings as $name => $field) { - $return[$name] = array( - "field" => $name, - "full_type" => $field["type"], - "type" => $field["type"], - "privileges" => array( - "insert" => 1, - "select" => 1, - "update" => 1, - "where" => !isset($field["index"]) || $field["index"] ?: null, - "order" => $field["type"] != "text" ?: null - ), - ); - if ($field["properties"]) { // only leaf fields can be edited - unset($return[$name]["privileges"]["insert"]); - unset($return[$name]["privileges"]["update"]); - } + $return = array( + "_id" => array( + "field" => "_id", + "full_type" => "text", + "type" => "text", + "privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1), + ) + ); + + foreach ($mappings as $name => $field) { + if (isset($field["index"]) && !$field["index"]) continue; + + $return[$name] = array( + "field" => $name, + "full_type" => $field["type"], + "type" => $field["type"], + "privileges" => array( + "insert" => 1, + "select" => 1, + "update" => 1, + "where" => !isset($field["index"]) || $field["index"] ?: null, + "order" => $field["type"] != "text" ?: null + ), + ); + + if ($field["properties"]) { // only leaf fields can be edited + unset($return[$name]["privileges"]["insert"]); + unset($return[$name]["privileges"]["update"]); } } + return $return; } @@ -410,6 +466,7 @@ if (isset($_GET["elastic"])) { } function convert_field($field) { + // } function unconvert_field($field, $return) { @@ -417,6 +474,7 @@ if (isset($_GET["elastic"])) { } function fk_support($table_status) { + // } function found_rows($table_status, $where) { @@ -424,29 +482,26 @@ if (isset($_GET["elastic"])) { } /** Create index - * @param string - * @return mixed - */ + * @param string + * @return mixed + */ function create_database($db) { - global $connection; - return $connection->rootQuery(urlencode($db), null, 'PUT'); + return connection()->rootQuery(urlencode($db), null, 'PUT'); } /** Remove index - * @param array - * @return mixed - */ + * @param array + * @return mixed + */ function drop_databases($databases) { - global $connection; - return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE'); + return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE'); } /** Alter type - * @param array - * @return mixed - */ + * @param array + * @return mixed + */ function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) { - global $connection; $properties = array(); foreach ($fields as $f) { $field_name = trim($f[1][0]); @@ -455,33 +510,34 @@ if (isset($_GET["elastic"])) { 'type' => $field_type ); } + if (!empty($properties)) { $properties = array('properties' => $properties); } - return $connection->query("_mapping/{$name}", $properties, 'PUT'); + return connection()->query("_mapping/{$name}", $properties, 'PUT'); } /** Drop types - * @param array - * @return bool - */ + * @param array + * @return bool + */ function drop_tables($tables) { - global $connection; $return = true; foreach ($tables as $table) { //! convert to bulk api - $return = $return && $connection->query(urlencode($table), array(), 'DELETE'); + $return = $return && connection()->query(urlencode($table), null, 'DELETE'); } + return $return; } function last_id() { - global $connection; - return $connection->last_id; + return connection()->last_id; } function driver_config() { $types = array(); $structured_types = array(); + foreach (array( lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21), lang('Date and time') => array("date" => 10), @@ -491,10 +547,11 @@ if (isset($_GET["elastic"])) { $types += $val; $structured_types[$key] = array_keys($val); } + return array( 'possible_drivers' => array("json + allow_url_fopen"), 'jush' => "elastic", - 'operators' => array("=", "query"), + 'operators' => array("=", "must", "should", "must_not"), 'functions' => array(), 'grouping' => array(), 'edit_functions' => array(array("json")),