]> git.joonet.de Git - adminer.git/commitdiff
MongoDB: Don't store unset values
authorJakub Vrana <jakub@vrana.cz>
Sun, 12 Jan 2014 01:37:01 +0000 (17:37 -0800)
committerJakub Vrana <jakub@vrana.cz>
Sun, 12 Jan 2014 01:37:01 +0000 (17:37 -0800)
adminer/drivers/mongo.inc.php
adminer/include/driver.inc.php
adminer/include/functions.inc.php

index 9d9fe222c65c4e87571c2bc2056fc76660895aa1..c10aca9be770f614213331a797887902d693d869 100644 (file)
@@ -116,6 +116,10 @@ if (isset($_GET["mongo"])) {
        class Min_Driver extends Min_SQL {
                public $primary = "_id";
                
+               function quote($value) {
+                       return ($value === null ? $value : parent::quote($value));
+               }
+               
                function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
                        $select = ($select == array("*")
                                ? array()
index 0c13b9ea32f12d589e2733ce2fa9fe47a78abc93..7ea563e90ab4f349d77aa3cc3e4588a8d8b454b2 100644 (file)
                $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
        * @param string
        * @param array result of $adminer->selectColumnsProcess()[0]
index 513023948f957aa58561e9060ef9981a4fd22f8e..f31ff82ede3be41e3a1ad4027259c8a1dfaf89df 100644 (file)
@@ -249,13 +249,13 @@ function sid() {
        return $return;
 }
 
-/** Shortcut for $connection->quote($string)
+/** Shortcut for $driver->quote($string)
 * @param string
 * @return string
 */
 function q($string) {
-       global $connection;
-       return $connection->quote($string);
+       global $driver;
+       return $driver->quote($string);
 }
 
 /** 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);
        }
        if ($function == "NULL") {
-               return "NULL";
+               $value = null;
        }
        if ($field["type"] == "set") {
                return array_sum((array) $value);