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

increase "error output" level and fix various minor bugs

Browse Source 
none of these seem to affect functionality, it's just a matter of clean code
thanks to ++ for pointing this out!
This commit is contained in:
Sergey Tsalkov
2011-02-28 23:57:04 -05:00
parent d01a8be627
commit 78c8192fdd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
db.class.php
View File

@@ -1,4 +1,4 @@
<? <?php
class DB class DB
{ {
public static $debug = false; public static $debug = false;
@@ -68,7 +68,7 @@ class DB
} }
public static function escape($str) { public static function escape($str) {
$db = DB::get($dbName); $db = DB::get(DB::$dbName);
return $db->real_escape_string($str); return $db->real_escape_string($str);
} }
@@ -195,7 +195,7 @@ class DB
$lastPos = 0; $lastPos = 0;
while (($pos = strpos($sql, $type, $lastPos)) !== false) { while (($pos = strpos($sql, $type, $lastPos)) !== false) {
$lastPos = $pos + 1; $lastPos = $pos + 1;
if ($posList[$pos] && strlen($posList[$pos]) > strlen($type)) continue; if (isset($posList[$pos]) && strlen($posList[$pos]) > strlen($type)) continue;
$posList[$pos] = $type; $posList[$pos] = $type;
} }
} }
@@ -310,7 +310,7 @@ class DB
public static function queryAllRows() { public static function queryAllRows() {
$args = func_get_args(); $args = func_get_args();
$query = call_user_func_array('DB::queryUnbuf', &$args); $query = call_user_func_array('DB::queryUnbuf', $args);
$result = DB::fetchAllRows($query); $result = DB::fetchAllRows($query);
DB::freeResult($query); DB::freeResult($query);
DB::$num_rows = count($result); DB::$num_rows = count($result);
@@ -356,7 +356,7 @@ class DB
$row = call_user_func_array('DB::queryOneRow', $args); $row = call_user_func_array('DB::queryOneRow', $args);
if ($row == null) { if ($row == null) {
return null; return null;
} else if ($field === null) { } else if ($column === null) {
$keys = array_keys($row); $keys = array_keys($row);
$column = $keys[0]; $column = $keys[0];
} }

5
simpletest/BasicTest.php
View File

@@ -1,6 +1,7 @@
<? <?
class BasicTest extends SimpleTest { class BasicTest extends SimpleTest {
function __construct() { function __construct() {
error_reporting(E_ALL);
require_once '../db.class.php'; require_once '../db.class.php';
DB::$user = 'libdb_user'; DB::$user = 'libdb_user';
DB::$password = 'sdf235sklj'; DB::$password = 'sdf235sklj';
@@ -80,6 +81,10 @@ class BasicTest extends SimpleTest {
$charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", $charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s",
array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend'); array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
$this->assert($charlie_password === 'goodbye'); $this->assert($charlie_password === 'goodbye');
$charlie_password = DB::queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s",
array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
$this->assert($charlie_password === 'goodbye');
} }
function test_4_query() { function test_4_query() {