Nemcio/adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2026-02-01 20:30:13 +01:00
Code Issues Packages Projects Releases Activity

MongoDB: Don't store unset values

Browse Source
This commit is contained in:
Jakub Vrana
2014-01-11 17:37:01 -08:00
parent 9824540ed8
commit ed13006512
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,10 @@ if (isset($_GET["mongo"])) {
class Min_Driver extends Min_SQL { class Min_Driver extends Min_SQL {
public $primary = "_id"; public $primary = "_id";
function quote($value) {
return ($value === null ? $value : parent::quote($value));
}
function select($table, $select, $where, $group, $order, $limit, $page, $print = false) { function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
$select = ($select == array("*") $select = ($select == array("*")
? array() ? array()

8
adminer/include/driver.inc.php
View File

@@ -10,6 +10,14 @@
$this->_conn = $connection; $this->_conn = $connection;
} }
/** Quote a SQL string or null value
* @param string
* @return string
*/
function quote($value) {
return ($value === null ? "NULL" : $this->_conn->quote($value));
}
/** Select data from table /** Select data from table
* @param string * @param string
* @param array result of $adminer->selectColumnsProcess()[0] * @param array result of $adminer->selectColumnsProcess()[0]

8
adminer/include/functions.inc.php
View File

@@ -249,13 +249,13 @@ function sid() {
return $return; return $return;
} }
/** Shortcut for $connection->quote($string) /** Shortcut for $driver->quote($string)
* @param string * @param string
* @return string * @return string
*/ */
function q($string) { function q($string) {
global $connection; global $driver;
return $connection->quote($string); return $driver->quote($string);
} }
/** Get list of values from database /** Get list of values from database
@@ -880,7 +880,7 @@ function process_input($field) {
return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false); return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
} }
if ($function == "NULL") { if ($function == "NULL") {
return "NULL"; $value = null;
} }
if ($field["type"] == "set") { if ($field["type"] == "set") {
return array_sum((array) $value); return array_sum((array) $value);