beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix saving NULL value

Browse source 
This reverts commit ed130065.

Conflicts:
	adminer/drivers/mongo.inc.php
	adminer/include/functions.inc.php
This commit is contained in:
Jakub Vrana 2014-09-13 10:19:51 -07:00
parent 3e769815bf
commit a3e1cd7bb6
4 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,10 +116,6 @@ 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 = array(), $limit = 1, $page = 0, $print = false) { function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
$select = ($select == array("*") $select = ($select == array("*")
? array() ? array()

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

@ -10,14 +10,6 @@
$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

@ -285,13 +285,13 @@ function get_password() {
return $return; return $return;
} }
/** Shortcut for $driver->quote($string) /** Shortcut for $connection->quote($string)
* @param string * @param string
* @return string * @return string
*/ */
function q($string) { function q($string) {
global $driver; global $connection;
return $driver->quote($string); return $connection->quote($string);
} }
/** Get list of values from database /** Get list of values from database
@ -937,7 +937,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") {
$value = null; return "NULL";
} }
if ($field["type"] == "set") { if ($field["type"] == "set") {
return array_sum((array) $value); return array_sum((array) $value);

1
changes.txt
View file

@ -4,6 +4,7 @@ Unlock session in alter database
Make master key unreadable to others (bug #410) Make master key unreadable to others (bug #410)
Fix edit by long non-utf8 string Fix edit by long non-utf8 string
Specify encoding for PHP 5.6 with invalid default_charset Specify encoding for PHP 5.6 with invalid default_charset
Fix saving NULL value, bug since Adminer 4.0.3
MySQL: Use utf8mb4 if available MySQL: Use utf8mb4 if available
Elasticsearch: Use where in select Elasticsearch: Use where in select
Danish translation Danish translation