20250509#1

This commit is contained in:
User
2025-05-09 23:00:16 +03:00
parent 335c4d240c
commit e16700fe8d
2 changed files with 9 additions and 9 deletions

View File

@@ -115,7 +115,7 @@ class MysqlStorage implements MysqlStorageInterface {
/** @inheritDoc */ /** @inheritDoc */
public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlResultData { public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): ?MysqlResultData {
if ($ln > 1) { if ($ln > 1) {
$cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows; $cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows;
@@ -128,7 +128,7 @@ class MysqlStorage implements MysqlStorageInterface {
} }
$result = $this->query($sql.$limit); $result = $this->query($sql.$limit);
if (!$result || $result->num_rows == 0) return false; if (!$result || $result->num_rows == 0) return null;
$data = new MysqlResultData($result); $data = new MysqlResultData($result);
$data->count = $cnts ?? 0; $data->count = $cnts ?? 0;
@@ -137,17 +137,17 @@ class MysqlStorage implements MysqlStorageInterface {
} }
/** @inheritDoc */ /** @inheritDoc */
public function findOne(string $sql) : bool|MysqlResultData { public function findOne(string $sql) : ?MysqlResultData {
$result = $this->query($sql." limit 0, 1"); $result = $this->query($sql." limit 0, 1");
if (!$result || $result->num_rows == 0) return false; if (!$result || $result->num_rows == 0) return null;
return new MysqlResultData($result); return new MysqlResultData($result);
} }
/** @inheritDoc */ /** @inheritDoc */
public function findById(string $table, mixed $id, string $name = 'id') : bool|array { public function findById(string $table, mixed $id, string $name = 'id') : ?array {
$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id); $id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
$result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1"); $result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1");
if (!$result || $result->num_rows == 0) return false; if (!$result || $result->num_rows == 0) return null;
$data = new MysqlResultData($result); $data = new MysqlResultData($result);
return $data->fetchOne(); return $data->fetchOne();
} }

View File

@@ -82,13 +82,13 @@ interface MysqlStorageInterface {
* @param int $count * @param int $count
* @return bool|MysqlResultData * @return bool|MysqlResultData
*/ */
public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlResultData; public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : ?MysqlResultData;
/** /**
* @param string $sql * @param string $sql
* @return bool|array * @return bool|array
*/ */
public function findOne(string $sql) : bool|MysqlResultData; public function findOne(string $sql) : ?MysqlResultData;
/** /**
* @param string $table * @param string $table
@@ -96,7 +96,7 @@ interface MysqlStorageInterface {
* @param string $name * @param string $name
* @return bool|array * @return bool|array
*/ */
public function findById(string $table, mixed $id, string $name = 'id') : bool|array; public function findById(string $table, mixed $id, string $name = 'id') : ?array;
/** /**
* Метод экранирования данных с учетом текущего подключения в т.ч для LIKE * Метод экранирования данных с учетом текущего подключения в т.ч для LIKE