Commit ec1d525

committed

fix: Fixed bug on db::empty when dbObject is given

1 parent cb4377e commit ec1d525Copy full SHA for ec1d525

File tree

1 file changed

-4

lines changed

db.class.php

1 file changed

-4

lines changed

`‎db.class.php`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`* 2021年03月12日 -> Added a lot of comments`
`8`	`8`	`* 2021年06月05日 -> Added transformWith private method for insert and update methods using the $additional array. Added formatMonney public method to work with monetary values. Changed getPageNow to getCurrentPage. Added search method.`
`9`	`9`	`* 2021年08月17日 -> Made a few improvements within base core functions`
	`10`	`+ * 2021年11月16日 -> Fixed Fetch method when same SQL is called more than once`
`10`	`11`	`*/`
`11`	`12`
`12`	`13`	`class db`
`@@ -137,9 +138,9 @@ private static function encapsulate($mixed)`
`137`	`138`	`$instance = new dbObject(self::getInstance()->query($mixed), array("key" => $key));`
`138`	`139`	`self::$object[$key] = $instance;`
`139`	`140`	`}`
`140`		`- if (self::$object[$key]->extra["rows"] === self::$object[$key]->extra["totalEntries"]) {`
	`141`	`+ if (self::$object[$key]->extra["rows"] + 1 == self::$object[$key]->extra["totalEntries"] && self::$object[$key]->extra["totalEntries"] !== 0) {`
`141`	`142`	`unset(self::$object[$key]);`
`142`		`- return false;`
	`143`	`+ return self::encapsulate($mixed);`
`143`	`144`	`}`
`144`	`145`	`return self::$object[$key];`
`145`	`146`	`}`
`@@ -162,7 +163,8 @@ public static function fetch($mixed, $simple = false)`
`162`	`163`	`}`
`163`	`164`	`}`
`164`	`165`	`$mixed = self::encapsulate($mixed);`
`165`		`- return ($mixed ? $mixed->getData() : $mixed);`
	`166`	`+ return $mixed->getData();`
	`167`	`+ //return ($mixed ? $mixed->getData() : $mixed);`
`166`	`168`	`}`
`167`	`169`	`if ($mixed instanceof dbObject) {`
`168`	`170`	`return $mixed->getData();`
`@@ -205,7 +207,7 @@ public static function empty($query)`
`205`	`207`	`return (self::query($query)->getInstance()->rowCount() == 0);`
`206`	`208`	`}`
`207`	`209`	`if ($query instanceof dbObject) {`
`208`		`- return ($query->getInstance()->rowCount() == 1);`
	`210`	`+ return ($query->getInstance()->rowCount() == 0);`
`209`	`211`	`}`
`210`	`212`	`if (is_bool($query)) {`
`211`	`213`	`return !$query;`
`@@ -578,6 +580,8 @@ public static function insert($data, $table, $additional = array())`
`578`	`580`	`unset($stmnt, $instance);`
`579`	`581`	`return true;`
`580`	`582`	`} else {`
	`583`	`+ echo "\nPDO::errorInfo():\n";`
	`584`	`+ print_r($stmnt->errorInfo());`
`581`	`585`	`return false;`
`582`	`586`	`}`
`583`	`587`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ec1d525

File tree

1 file changed

1 file changed

`‎db.class.php`

0 commit comments