rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DB::$usenull is removed, it makes no sense in a modern PHP context

Browse Source
This commit is contained in:
Sergey Tsalkov
2021-06-15 21:44:14 -07:00
parent dab71efacd
commit 7c1f9bc226
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
db.class.php
View File

@@ -37,14 +37,12 @@ class DB {
public static $pre_sql_handler = false; public static $pre_sql_handler = false;
public static $throw_exception_on_nonsql_error = false; public static $throw_exception_on_nonsql_error = false;
public static $nested_transactions = false; public static $nested_transactions = false;
public static $usenull = true;
public static $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => ''); public static $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public static $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30); public static $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
// internal // internal
protected static $mdb = null; protected static $mdb = null;
public static $variables_to_sync = array('param_char', 'named_param_seperator', 'success_handler', 'error_handler', 'throw_exception_on_error', public static $variables_to_sync = array('param_char', 'named_param_seperator', 'success_handler', 'error_handler', 'throw_exception_on_error', 'nonsql_error_handler', 'pre_sql_handler', 'throw_exception_on_nonsql_error', 'nested_transactions', 'ssl', 'connect_options');
'nonsql_error_handler', 'pre_sql_handler', 'throw_exception_on_nonsql_error', 'nested_transactions', 'usenull', 'ssl', 'connect_options');
public static function getMDB() { public static function getMDB() {
$mdb = DB::$mdb; $mdb = DB::$mdb;
@@ -90,7 +88,6 @@ class MeekroDB {
public $pre_sql_handler = false; public $pre_sql_handler = false;
public $throw_exception_on_nonsql_error = false; public $throw_exception_on_nonsql_error = false;
public $nested_transactions = false; public $nested_transactions = false;
public $usenull = true;
public $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => ''); public $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30); public $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
@@ -501,7 +498,7 @@ class MeekroDB {
else return $this->escape($value); // use __toString() value for objects, when possible else return $this->escape($value); // use __toString() value for objects, when possible
} }
if (is_null($value)) return $this->usenull ? 'NULL' : "''"; if (is_null($value)) return 'NULL';
else if (is_bool($value)) return ($value ? 1 : 0); else if (is_bool($value)) return ($value ? 1 : 0);
else if (is_int($value)) return $value; else if (is_int($value)) return $value;
else if (is_float($value)) return $value; else if (is_float($value)) return $value;

10
simpletest/BasicTest.php
View File

@@ -100,16 +100,6 @@ class BasicTest extends SimpleTest {
$password = DB::queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL"); $password = DB::queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL");
$this->assert($password === 'goodbye'); $this->assert($password === 'goodbye');
DB::$usenull = false;
DB::insertUpdate('accounts', array(
'id' => 3,
'favorite_word' => null,
));
$password = DB::queryFirstField("SELECT password FROM accounts WHERE favorite_word=%s AND favorite_word=%s", null, '');
$this->assert($password === 'goodbye');
DB::$usenull = true;
DB::insertUpdate('accounts', array( DB::insertUpdate('accounts', array(
'id' => 3, 'id' => 3,
'favorite_word' => null, 'favorite_word' => null,