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

MongoDB: Improve select

Browse Source
This commit is contained in:
Jakub Vrana
2014-01-08 23:14:37 -08:00
parent 39a68b9b14
commit a7d475e3e7
8 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ if (isset($_GET["elastic"])) {
class Min_Driver extends Min_SQL {
function select($table, $select, $where, $group, $order, $limit, $page) {
function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
global $adminer;
$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
$data = array();
@@ -125,7 +125,9 @@ if (isset($_GET["elastic"])) {
$data["query"]["filtered"]["query"] = array("match_all" => array());
}
}
echo $adminer->selectQuery($query);
if ($print) {
echo $adminer->selectQuery("$query: " . print_r($data, true));
}
$search = $this->_conn->query($query, $data);
if (!$search) {
return false;

39
adminer/drivers/mongo.inc.php
View File

@@ -21,7 +21,7 @@ if (isset($_GET["mongo"])) {
$options["db"] = $db;
}
try {
$this->_link = new MongoClient("mongodb://$server", $options);
$this->_link = @new MongoClient("mongodb://$server", $options);
return true;
} catch (Exception $ex) {
$this->error = $ex->getMessage();
@@ -43,6 +43,10 @@ if (isset($_GET["mongo"])) {
}
}
function quote($string) {
return $string;
}
}
class Min_Result {
@@ -110,18 +114,23 @@ if (isset($_GET["mongo"])) {
class Min_Driver extends Min_SQL {
function select($table, $select, $where, $group, $order, $limit, $page) {
function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
global $connection;
if ($select == array("*")) {
$select = array();
} else {
$select = array_fill_keys($select, true);
$select = ($select == array("*")
? array()
: array_fill_keys($select, true)
);
$sort = array();
foreach ($order as $val) {
$val = preg_replace('~ DESC$~', '', $val, 1, $count);
$sort[$val] = ($count ? -1 : 1);
}
$return = array();
foreach ($connection->_db->selectCollection($table)->find(array(), $select) as $val) {
$return[] = $val;
}
return new Min_Result($return);
return new Min_Result(iterator_to_array($connection->_db->selectCollection($table)
->find(array(), $select)
->sort($sort)
->limit(+$limit)
->skip($page * $limit)
));
}
}
@@ -235,6 +244,10 @@ if (isset($_GET["mongo"])) {
function convert_field($field) {
}
function unconvert_field($field, $return) {
return $return;
}
function foreign_keys($table) {
return array();
}
@@ -247,7 +260,9 @@ if (isset($_GET["mongo"])) {
}
function found_rows($table_status, $where) {
return null;
global $connection;
//! don't call count_rows()
return $connection->_db->selectCollection($_GET["select"])->count($where);
}
function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {

4
adminer/drivers/simpledb.inc.php
View File

@@ -149,10 +149,10 @@ if (isset($_GET["simpledb"])) {
return $return;
}
function select($table, $select, $where, $group, $order, $limit, $page) {
function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
global $connection;
$connection->next = $_GET["next"];
$return = parent::select($table, $select, $where, $group, $order, $limit, $page);
$return = parent::select($table, $select, $where, $group, $order, $limit, $page, $print);
$connection->next = 0;
return $return;
}