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

minor bugfix: don't assume that the query results for queryFirstRow() or queryFirstList() will be an array (can also be a bool)

Browse Source
This commit is contained in:
Sergey Tsalkov
2014-06-14 00:27:38 +00:00
parent 7c5c03c576
commit 37fd169be3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db.class.php
View File

@@ -674,7 +674,7 @@ class MeekroDB {
public function queryFirstRow() { public function queryFirstRow() {
$args = func_get_args(); $args = func_get_args();
$result = call_user_func_array(array($this, 'query'), $args); $result = call_user_func_array(array($this, 'query'), $args);
if (! $result) return null; if (!$result || !is_array($result)) return null;
return reset($result); return reset($result);
} }
@@ -682,7 +682,7 @@ class MeekroDB {
public function queryFirstList() { public function queryFirstList() {
$args = func_get_args(); $args = func_get_args();
$result = call_user_func_array(array($this, 'queryAllLists'), $args); $result = call_user_func_array(array($this, 'queryAllLists'), $args);
if (! $result) return null; if (!$result || !is_array($result)) return null;
return reset($result); return reset($result);
} }

2
simpletest/BasicTest.php
View File

@@ -274,7 +274,7 @@ class BasicTest extends SimpleTest {
DB::insert('storedata', array( DB::insert('storedata', array(
'picture' => $smile, 'picture' => $smile,
)); ));
DB::query("INSERT INTO storedata (picture) VALUES (%s)", $smile); DB::queryOneRow("INSERT INTO storedata (picture) VALUES (%s)", $smile);
$getsmile = DB::queryFirstField("SELECT picture FROM storedata WHERE id=1"); $getsmile = DB::queryFirstField("SELECT picture FROM storedata WHERE id=1");
$getsmile2 = DB::queryFirstField("SELECT picture FROM storedata WHERE id=2"); $getsmile2 = DB::queryFirstField("SELECT picture FROM storedata WHERE id=2");