public/rmphp-storage
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20240406#1

Browse Source
This commit is contained in:
User
2024-04-06 00:32:48 +03:00
parent 2e384e2071
commit c681de9bfb
4 changed files with 121 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -10,12 +10,12 @@ Stable version
composer require rmphp/storage
```
```bash
composer require rmphp/storage:"^2.0"
composer require rmphp/storage:"^3.0"
```
Dev version contains the latest changes
```bash
composer require rmphp/storage:"2.x-dev"
composer require rmphp/storage:"3.x-dev"
```

131
src/Mysql/MysqlStorage.php
View File

@@ -38,82 +38,87 @@ class MysqlStorage implements MysqlStorageInterface {
{
try{
$result = $this->mysqli->query($sql);
// запись в log
($this->mysqli->errno)
? $this->addLog("Err - SQL: ".$sql." | error: ".$this->mysqli->error)
: $this->addLog("OK - ".$sql);
if($this->mysqli->errno) throw new Exception();
$this->addLog("OK - ".$sql);
return $result;
}
/* 8.1.0 Теперь по умолчанию установлено значение MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT и выбрасывается исключение. Ранее оно было MYSQLI_REPORT_OFF. */
catch (Exception $exception){
$this->addLog("Err - SQL: ".$sql." | error: ".$this->mysqli->error);
return false;
}
}
/** @inheritDoc */
public function add(string $tbl, array $arr, bool $update = false) : bool {
foreach ($arr as $key => $value) {
$col[] = "`$key`";
$val[] = ($value !== NULL) ? "'$value'" : "NULL";
$upd[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
}
// Собираем в строки для использования в запросе
$col = implode(", ", $col);
$val = implode(", ", $val);
/** @inheritDoc */
public function insert(string $tbl, array $data, bool $update = false) : bool {
$chunks = $this->getInsertValue($data);
$upd = $this->getUpdateValue($data);
if (!$update) {
$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".$col.") values (" . $val . ")";
$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).")";
} else{
$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".$col.") values (".$val.") on duplicate key update ".implode(", ", $upd);
$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).") on duplicate key update ".implode(",", $upd);
}
return $this->query($sql);
}
/** @inheritDoc */
public function edit(string $tbl, array $arr, string $case, bool $ignore=false) : bool {
foreach ($arr as $key => $value) {
$isql[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
}
$where = (preg_match("'^[0-9]+$'",$case)) ? "id = '".(int) $case."'" : $case;
if(empty($ignore)) {
$sql = "update low_priority " . $this->escapeStr($tbl) . " set " . implode(", ", $isql) . " where " . $where;
} else {
$sql = "update low_priority ignore " . $this->escapeStr($tbl) . " set " . implode(", ", $isql) . " where " . $where;
/**
* @param string $tbl
* @param array $data
* @return bool
*/
public function batchInsert(string $tbl, array $data) : bool {
foreach($data as $insertRow){
$chunks = $this->getInsertValue($insertRow);
$val[] = "(".implode(",", $chunks['values']).")";
}
$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".implode(",", $chunks['columns'] ?? []).") values ".implode(",", $val ?? []);
return $this->query($sql);
}
/** @inheritDoc */
public function replace(string $tbl, array $arr) : bool {
foreach ($arr as $key => $value) {
$col[] = "`$key`";
$val[] = ($value !== NULL) ? "'$value'" : "NULL";
}
// Собираем в строки для использования в запросе
$col = implode(", ", $col);
$val = implode(", ", $val);
$sql = "replace low_priority into ".$this->escapeStr($tbl)." (".$col.") values (".$val.")";
public function updateById(string $tbl, array $data, int $id, array $modifier = []) : bool {
$chunks = $this->getUpdateValue($data);
$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($tbl)." set ".implode(",", $chunks)." where id = '".$id."'";
return $this->query($sql);
}
/** @inheritDoc */
public function del(string $tbl, string $case) : bool {
$where = (preg_match("'^[0-9]+$'",$case)) ? "id = '".(int) $case."'" : $case;
$sql = "delete low_priority from ".$this->escapeStr($tbl)." where ".$where;
public function updateByParam(string $tbl, array $data, string $case, array $modifier = []) : bool {
$chunks = $this->getUpdateValue($data);
$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($tbl)." set ". implode(",", $chunks)." where ".$case;
return $this->query($sql);
}
/** @inheritDoc */
public function replace(string $tbl, array $data) : bool {
$chunks = $this->getInsertValue($data);
$sql = "replace low_priority into ".$this->escapeStr($tbl)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).")";
return $this->query($sql);
}
/** @inheritDoc */
public function deleteById(string $tbl, int $id) : bool {
$sql = "delete low_priority from ".$this->escapeStr($tbl)." where id='.$id.'";
// возвращаем число затронутых строк/false
return $this->query($sql);
}
/** @inheritDoc */
public function read(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlStorageData {
public function deleteByParam(string $tbl, string $case) : bool {
$sql = "delete low_priority from ".$this->escapeStr($tbl)." where ".$case;
// возвращаем число затронутых строк/false
return $this->query($sql);
}
/** @inheritDoc */
public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlStorageData {
if ($ln > 1) {
$cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows;
}
// часть строки запроса с лимит
switch (true){
case ($ln > 1 || $numPage > 1) : $limit = " limit ".(($numPage * $ln) - $ln).", ".$ln; break;
case ($ln == 1): $limit = " limit 0, 1"; break;
@@ -129,18 +134,14 @@ class MysqlStorage implements MysqlStorageInterface {
return $data;
}
/** @inheritDoc */
public function chktbl(string $tbl) : bool {
$result = $this->mysqli->query("SHOW TABLES LIKE '".$this->escapeStr($tbl)."'");
if ($result->num_rows == 0) {
$this->addLog(__METHOD__.":"." Err - Table ".$tbl." doesn't exist"); return false;
}
$this->addLog(__METHOD__.":"." OK - Table ".$tbl." exist");
return true;
public function findOne(string $sql) : array {
$result = $this->query($sql);
$data = new MysqlStorageData($result);
return $data->fetchOne();
}
/** @inheritDoc */
public function escapeReg(string $var) : ?string {
if(!isset($var)) return null;
@@ -153,6 +154,7 @@ class MysqlStorage implements MysqlStorageInterface {
return trim($this->mysqli->real_escape_string($var));
}
/** @inheritDoc */
public function addLog(string $log) : void {
if($this->logsEnabled) $this->log[] = $log;
@@ -168,4 +170,31 @@ class MysqlStorage implements MysqlStorageInterface {
return $this->log[count($this->log)-1];
}
/**
* @param array $array
* @return array[]
*/
private function getInsertValue(array $array) : array {
foreach ($array as $key => $value) {
$col[] = "`$key`";
$val[] = ($value !== NULL) ? "'$value'" : "NULL";
}
return [
"columns" => $col ?? [],
"values" => $val ?? []
];
}
/**
* @param array $array
* @return array
*/
private function getUpdateValue(array $array) : array {
foreach ($array as $key => $value) {
$out[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
}
return $out ?? [];
}
}

4
src/Mysql/MysqlStorageData.php
View File

@@ -35,14 +35,14 @@ class MysqlStorageData {
/**
* @return iterable
*/
public function fatch(): iterable {
public function fetch(): iterable {
if(!empty($this->arrayData)) return $this->arrayData;
if(!$this->result) return [];
return $this->generator();
}
public function fatchOne(int $index = 0) : array {
public function fetchOne(int $index = 0) : array {
if(!$this->result) return [];
$this->result->data_seek($index);
return $this->result->fetch_assoc();

51
src/Mysql/MysqlStorageInterface.php
View File

@@ -19,36 +19,59 @@ interface MysqlStorageInterface {
/**
* Метод добавления записи в текущую БД
* @param string $tbl
* @param array $arr
* @param array $data
* @param array $modifier
* @param bool $update
* @return bool
*/
public function add(string $tbl, array $arr, bool $update = false) : bool;
public function insert(string $tbl, array $data, bool $update = false) : bool;
/**
* @param string $tbl
* @param array $data
* @return bool
*/
public function batchInsert(string $tbl, array $data) : bool;
/**
* Метод редактирования записи в текущей БД по ID
* @param string $tbl
* @param array $arr
* @param string $case
* @param bool $ignore
* @param array $data
* @param int $id
* @param array $modifier
* @return bool
*/
public function edit(string $tbl, array $arr, string $case, bool $ignore=false) : bool;
public function updateById(string $tbl, array $data, int $id, array $modifier = []) : bool;
/**
* Метод добавления записи в текущую БД
* @param string $tbl
* @param array $arr
* @param array $data
* @param string $case
* @param array $modifier
* @return bool
*/
public function replace(string $tbl, array $arr) : bool;
public function updateByParam(string $tbl, array $data, string $case, array $modifier = []) : bool;
/**
* @param string $tbl
* @param array $data
* @return bool
*/
public function replace(string $tbl, array $data) : bool;
/**
* @param string $tbl
* @param int $id
* @return bool
*/
public function deleteById(string $tbl, int $id) : bool;
/**
* @param string $tbl
* @param string $case
* @return bool
*/
public function del(string $tbl, string $case) : bool;
public function deleteByParam(string $tbl, string $case) : bool;
/**
* @param string $sql
@@ -57,13 +80,13 @@ interface MysqlStorageInterface {
* @param int $count
* @return bool|MysqlStorageData
*/
public function read(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlStorageData;
public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlStorageData;
/**
* @param string $tbl
* @return bool
* @param string $sql
* @return array
*/
public function chktbl(string $tbl) : bool;
public function findOne(string $sql) : array;
/**
* Метод экранирования данных с учетом текущего подключения в т.ч для LIKE