20240427#1

README.md

@@ -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"
 ```

src/Mysql/MysqlStorage.php

@@ -38,82 +38,85 @@ class MysqlStorage implements MysqlStorageInterface {
 	{
 		try{
 			$result = $this->mysqli->query($sql);
-			// запись в log
+			if($this->mysqli->errno) throw new Exception();
-			($this->mysqli->errno)
+			$this->addLog("OK - $sql");
-				? $this->addLog("Err - SQL: ".$sql." | error: ".$this->mysqli->error)
-				: $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);
+			$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 $table, 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($table)." (".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($table)." (".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 {
+	public function batchInsert(string $table, array $data) : bool {
-		foreach ($arr as $key => $value) {
+		foreach($data as $insertRow){
-			$isql[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
+			$chunks = $this->getInsertValue($insertRow);
-		}
+			$values[] = "(".implode(",", $chunks['values']).")";
-		$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;
 		}
+		$sql = "insert low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns'] ?? []).") values ".implode(",", $values ?? []);
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function replace(string $tbl, array $arr) : bool {
+	public function updateById(string $table, array $data, mixed $id, array $modifier = []) : bool {
-		foreach ($arr as $key => $value) {
+		$chunks = $this->getUpdateValue($data);
-			$col[] = "`$key`";
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
-			$val[] = ($value !== NULL) ? "'$value'" : "NULL";
+		$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($table)." set ".implode(",", $chunks)." where id = '$id'";
-		}
-		// Собираем в строки для использования в запросе
-		$col = implode(", ", $col);
-		$val = implode(", ", $val);
-
-		$sql  = "replace low_priority into ".$this->escapeStr($tbl)." (".$col.") values (".$val.")";
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function del(string $tbl, string $case) : bool {
+	public function updateByParam(string $table, array $data, string $case, array $modifier = []) : bool {
-		$where = (preg_match("'^[0-9]+$'",$case)) ? "id = '".(int) $case."'" : $case;
+		$chunks = $this->getUpdateValue($data);
-		$sql = "delete low_priority from ".$this->escapeStr($tbl)." where ".$where;
+		$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($table)." set ". implode(",", $chunks)." where ".$case;
+		return $this->query($sql);
+	}
+
+	/** @inheritDoc */
+	public function replace(string $table, array $data) : bool {
+		$chunks = $this->getInsertValue($data);
+		$sql  = "replace low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).")";
+		return $this->query($sql);
+	}
+
+
+	/** @inheritDoc */
+	public function deleteById(string $table, mixed $id) : bool {
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
+		$sql = "delete low_priority from ".$this->escapeStr($table)." 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 $table, string $case) : bool {
+		$sql = "delete low_priority from ".$this->escapeStr($table)." 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,30 +132,37 @@ class MysqlStorage implements MysqlStorageInterface {
 		return $data;
 	}
 
-
-
 	/** @inheritDoc */
-	public function chktbl(string $tbl) : bool {
+	public function findOne(string $sql) : bool|array {
-		$result = $this->mysqli->query("SHOW TABLES LIKE '".$this->escapeStr($tbl)."'");
+		$result = $this->query($sql." limit 0, 1");
-		if ($result->num_rows == 0) {
+		if (!$result || $result->num_rows == 0) return false;
-			$this->addLog(__METHOD__.":"." Err - Table ".$tbl." doesn't exist"); return false;
+		$data = new MysqlStorageData($result);
-		}
+		return $data->fetchOne();
-		$this->addLog(__METHOD__.":"." OK - Table ".$tbl." exist");
-		return true;
 	}
 
 	/** @inheritDoc */
-	public function escapeReg(string $var) : ?string {
+	public function findById(string $table, mixed $id, string $name = 'id') : bool|array {
-		if(!isset($var)) return null;
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
-		return trim(addcslashes($this->mysqli->real_escape_string($var), "%_"));
+		$result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1");
+		if (!$result || $result->num_rows == 0) return false;
+		$data = new MysqlStorageData($result);
+		return $data->fetchOne();
+	}
+
+
+	/** @inheritDoc */
+	public function escapeReg(string $string) : ?string {
+		if(!isset($string)) return null;
+		return trim(addcslashes($this->mysqli->real_escape_string($string), "%_"));
 	}
 
 	/** @inheritDoc */
-	public function escapeStr(?string $var) : ?string {
+	public function escapeStr(?string $string) : ?string {
-		if(!isset($var)) return null;
+		if(!isset($string)) return null;
-		return trim($this->mysqli->real_escape_string($var));
+		return trim($this->mysqli->real_escape_string($string));
 	}
 
+
 	/** @inheritDoc */
 	public function addLog(string $log) : void {
 		if($this->logsEnabled) $this->log[] = $log;
@@ -168,4 +178,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) {
+			$colunms[] = "`$key`";
+			$values[] = ($value !== NULL) ? "'$value'" : "NULL";
+		}
+		return [
+			"columns" => $colunms ?? [],
+			"values" => $values ?? []
+		];
+	}
+
+	/**
+	 * @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 ?? [];
+	}
+
 }

src/Mysql/MysqlStorageData.php

@@ -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();

src/Mysql/MysqlStorageInterface.php

@@ -2,53 +2,78 @@
 
 namespace Rmphp\Storage\Mysql;
 
+use Mysqli;
+use mysqli_result;
+
 interface MysqlStorageInterface {
 
 	/**
-	 * @return \Mysqli
+	 * @return Mysqli
 	 */
-	public function mysql() : \Mysqli;
+	public function mysql() : Mysqli;
 
 	/**
 	 * Метод прямого запроса к текущей БД
 	 * @param string $sql
-	 * @return bool|\mysqli_result
+	 * @return bool|mysqli_result
 	 */
-	public function query(string $sql) : bool|\mysqli_result;
+	public function query(string $sql) : bool|mysqli_result;
 
 	/**
 	 * Метод добавления записи в текущую БД
-	 * @param string $tbl
+	 * @param string $table
-	 * @param array $arr
+	 * @param array $data
 	 * @param bool $update
 	 * @return bool
 	 */
-	public function add(string $tbl, array $arr, bool $update = false) : bool;
+	public function insert(string $table, array $data, bool $update = false) : bool;
+
+	/**
+	 * @param string $table
+	 * @param array $data
+	 * @return bool
+	 */
+	public function batchInsert(string $table, array $data) : bool;
 
 	/**
 	 * Метод редактирования записи в текущей БД по ID
-	 * @param string $tbl
+	 * @param string $table
-	 * @param array $arr
+	 * @param array $data
+	 * @param mixed $id
+	 * @param array $modifier
+	 * @return bool
+	 */
+	public function updateById(string $table, array $data, mixed $id, array $modifier = []) : bool;
+
+	/**
+	 * @param string $table
+	 * @param array $data
 	 * @param string $case
-	 * @param bool $ignore
+	 * @param array $modifier
 	 * @return bool
 	 */
-	public function edit(string $tbl, array $arr, string $case, bool $ignore=false) : bool;
+	public function updateByParam(string $table, array $data, string $case, array $modifier = []) : bool;
 
 	/**
-	 * Метод добавления записи в текущую БД
+	 * @param string $table
-	 * @param string $tbl
+	 * @param array $data
-	 * @param array $arr
 	 * @return bool
 	 */
-	public function replace(string $tbl, array $arr) : bool;
+	public function replace(string $table, array $data) : bool;
 
 	/**
-	 * @param string $tbl
+	 * @param string $table
+	 * @param mixed $id
+	 * @return bool
+	 */
+	public function deleteById(string $table, mixed $id) : bool;
+
+	/**
+	 * @param string $table
 	 * @param string $case
 	 * @return bool
 	 */
-	public function del(string $tbl, string $case) : bool;
+	public function deleteByParam(string $table, string $case) : bool;
 
 	/**
 	 * @param string $sql
@@ -57,27 +82,35 @@ 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
+	 * @param string $sql
-	 * @return bool
+	 * @return bool|array
 	 */
-	public function chktbl(string $tbl) : bool;
+	public function findOne(string $sql) : bool|array;
+
+	/**
+	 * @param string $table
+	 * @param mixed $id
+	 * @param string $name
+	 * @return bool|array
+	 */
+	public function findById(string $table, mixed $id, string $name = 'id') : bool|array;
 
 	/**
 	 * Метод экранирования данных с учетом текущего подключения в т.ч для LIKE
-	 * @param string $var
+	 * @param string $string
 	 * @return string|null
 	 */
-	public function escapeReg(string $var) : ?string;
+	public function escapeReg(string $string) : ?string;
 
 	/**
 	 * Метод экранирования данных с учетом текущего подключения
-	 * @param string|null $var
+	 * @param string|null $string
 	 * @return string|null
 	 */
-	public function escapeStr(?string $var) : ?string;
+	public function escapeStr(?string $string) : ?string;
 
 	/**
 	 * Метод наполнения статичного массива с логами