adumitru68 / QueryBuilder

src/Statements/QueryInsertMultiple.php

Indentation +63 added lines, -63 removed lines

@@ -23,67 +23,67 @@
 class QueryInsertMultiple extends QueryStatement implements QueryStatementInterface
 {
 
-    use InsertMultiple, Replacement, Ignore, DefaultPriority, LowPriority, HighPriority, Utilities;
-
-    /**
-     * @var string
-     */
-    protected $statement = self::QUERY_STATEMENT_INSERT;
-
-
-    /**
-     * QueryInsert constructor.
-     * @param QueryBuild $queryBuild
-     * @param string $table
-     */
-    public function __construct(QueryBuild $queryBuild, $table = null)
-    {
-        parent::__construct($queryBuild, $table);
-        $this->queryStructure->setElement(QueryStructure::FIELDS, array());
-    }
-
-    public function getSyntax($replacement = self::REPLACEMENT_NONE)
-    {
-        $syntax = array();
-
-        /**
-         *  Explain
-         */
-        $syntax[] = $this->getExplainSyntax();
-
-        /**
-         * UPDATE statement
-         */
-        $syntax[] = $this->statement;
-
-        /**
-         * PRIORITY
-         */
-        $syntax[] = $this->queryStructure->getElement(QueryStructure::PRIORITY);
-
-        /**
-         * IGNORE clause
-         */
-        $syntax[] = $this->queryStructure->getElement(QueryStructure::IGNORE) ? 'IGNORE' : '';
-
-        /**
-         * INTO table
-         */
-        $syntax[] = 'INTO ' . $this->queryStructure->getElement(QueryStructure::TABLE);
-
-        /**
-         * FIELDS update
-         */
-        $syntax[] = $this->getInsertMultipleRowsSyntax();
-
-        $syntax = implode(' ', $syntax);
-
-        return $this->getSyntaxReplace($syntax, $replacement);
-
-    }
-
-    public function execute()
-    {
-        return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
-    }
+	use InsertMultiple, Replacement, Ignore, DefaultPriority, LowPriority, HighPriority, Utilities;
+
+	/**
+	 * @var string
+	 */
+	protected $statement = self::QUERY_STATEMENT_INSERT;
+
+
+	/**
+	 * QueryInsert constructor.
+	 * @param QueryBuild $queryBuild
+	 * @param string $table
+	 */
+	public function __construct(QueryBuild $queryBuild, $table = null)
+	{
+		parent::__construct($queryBuild, $table);
+		$this->queryStructure->setElement(QueryStructure::FIELDS, array());
+	}
+
+	public function getSyntax($replacement = self::REPLACEMENT_NONE)
+	{
+		$syntax = array();
+
+		/**
+		 *  Explain
+		 */
+		$syntax[] = $this->getExplainSyntax();
+
+		/**
+		 * UPDATE statement
+		 */
+		$syntax[] = $this->statement;
+
+		/**
+		 * PRIORITY
+		 */
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::PRIORITY);
+
+		/**
+		 * IGNORE clause
+		 */
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::IGNORE) ? 'IGNORE' : '';
+
+		/**
+		 * INTO table
+		 */
+		$syntax[] = 'INTO ' . $this->queryStructure->getElement(QueryStructure::TABLE);
+
+		/**
+		 * FIELDS update
+		 */
+		$syntax[] = $this->getInsertMultipleRowsSyntax();
+
+		$syntax = implode(' ', $syntax);
+
+		return $this->getSyntaxReplace($syntax, $replacement);
+
+	}
+
+	public function execute()
+	{
+		return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
+	}
 }
\ No newline at end of file

src/Statements/QueryStatement.php

Indentation +65 added lines, -65 removed lines

@@ -18,71 +18,71 @@
 abstract class QueryStatement
 {
 
-    use Utilities, TableValidation, ColumnValidation;
-
-
-    /**
-     * Statements
-     */
-    const QUERY_STATEMENT_SELECT = 'SELECT';
-    const QUERY_STATEMENT_UPDATE = 'UPDATE';
-    const QUERY_STATEMENT_DELETE = 'DELETE';
-    const QUERY_STATEMENT_INSERT = 'INSERT';
-    const QUERY_STATEMENT_CUSTOM = 'CUSTOM';
-
-
-    /**
-     * @var string
-     */
-    protected $statement;
-
-    /**
-     * @var QueryBuild
-     */
-    protected $queryBuild;
-
-    /**
-     * @var QueryStructure
-     */
-    protected $queryStructure;
-
-    /**
-     * @var array
-     */
-    protected $usedInstanceIds = [];
-
-    /**
-     * @var string
-     */
-    protected $tablePrefix;
-
-
-    /**
-     * QueryStatement constructor.
-     * @param QueryBuild $queryBuild
-     * @param string|QuerySelect $table
-     * @throws QueryException
-     */
-    public function __construct(QueryBuild $queryBuild, $table = '')
-    {
-
-        $table = $this->validateTable($table);
-
-        $this->queryBuild = $queryBuild;
-        $this->queryStructure = new QueryStructure();
-        $this->queryStructure->setElement(QueryStructure::TABLE, $table);
-        $this->queryStructure->setElement(QueryStructure::STATEMENT, $this->statement);
-        $this->queryStructure->setElement(QueryStructure::QUERY_TYPE, $this->queryBuild->getType());
-
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getBindParams()
-    {
-        return $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
-    }
+	use Utilities, TableValidation, ColumnValidation;
+
+
+	/**
+	 * Statements
+	 */
+	const QUERY_STATEMENT_SELECT = 'SELECT';
+	const QUERY_STATEMENT_UPDATE = 'UPDATE';
+	const QUERY_STATEMENT_DELETE = 'DELETE';
+	const QUERY_STATEMENT_INSERT = 'INSERT';
+	const QUERY_STATEMENT_CUSTOM = 'CUSTOM';
+
+
+	/**
+	 * @var string
+	 */
+	protected $statement;
+
+	/**
+	 * @var QueryBuild
+	 */
+	protected $queryBuild;
+
+	/**
+	 * @var QueryStructure
+	 */
+	protected $queryStructure;
+
+	/**
+	 * @var array
+	 */
+	protected $usedInstanceIds = [];
+
+	/**
+	 * @var string
+	 */
+	protected $tablePrefix;
+
+
+	/**
+	 * QueryStatement constructor.
+	 * @param QueryBuild $queryBuild
+	 * @param string|QuerySelect $table
+	 * @throws QueryException
+	 */
+	public function __construct(QueryBuild $queryBuild, $table = '')
+	{
+
+		$table = $this->validateTable($table);
+
+		$this->queryBuild = $queryBuild;
+		$this->queryStructure = new QueryStructure();
+		$this->queryStructure->setElement(QueryStructure::TABLE, $table);
+		$this->queryStructure->setElement(QueryStructure::STATEMENT, $this->statement);
+		$this->queryStructure->setElement(QueryStructure::QUERY_TYPE, $this->queryBuild->getType());
+
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getBindParams()
+	{
+		return $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
+	}
 
 
 }
\ No newline at end of file

src/Statements/QueryStatementInterface.php

Indentation +9 added lines, -9 removed lines

@@ -11,17 +11,17 @@
 interface QueryStatementInterface
 {
 
-    const REPLACEMENT_NONE = 0;
-    const REPLACEMENT_VALUES = 1;
+	const REPLACEMENT_NONE = 0;
+	const REPLACEMENT_VALUES = 1;
 
-    /**
-     * @param bool $replacement
-     * @return string
-     */
-    public function getSyntax($replacement = self::REPLACEMENT_NONE);
+	/**
+	 * @param bool $replacement
+	 * @return string
+	 */
+	public function getSyntax($replacement = self::REPLACEMENT_NONE);
 
-    public function execute();
+	public function execute();
 
-    public function getBindParams();
+	public function getBindParams();
 
 }
\ No newline at end of file

src/Statements/QueryDelete.php

Indentation +75 added lines, -75 removed lines

@@ -27,81 +27,81 @@
 class QueryDelete extends QueryStatement implements QueryStatementInterface
 {
 
-    use Limit, Where, WhereAndHavingBuilder, Replacement, OrderBy, SetFields, Ignore, DefaultPriority, LowPriority, Utilities;
-
-    /**
-     * @var string
-     */
-    protected $statement = self::QUERY_STATEMENT_DELETE;
-
-
-    /**
-     * QueryDelete constructor.
-     * @param QueryBuild $queryBuild
-     * @param string $table
-     */
-    public function __construct(QueryBuild $queryBuild, $table = null)
-    {
-        parent::__construct($queryBuild, $table);
-    }
-
-    public function getSyntax($replacement = self::REPLACEMENT_NONE)
-    {
-        $syntax = array();
-
-        /**
-         *  Explain
-         */
-        $syntax[] = $this->getExplainSyntax();
-
-        /**
-         * UPDATE statement
-         */
-        $syntax[] = $this->statement;
-
-        /**
-         * PRIORITY
-         */
-        $syntax[] = $this->queryStructure->getElement(QueryStructure::PRIORITY);
-
-        /**
-         * TABLE update
-         */
-        $syntax[] = 'FROM ' . $this->queryStructure->getElement(QueryStructure::TABLE);
-
-        /**
-         * WHERE clause
-         */
-        $syntax[] = $this->getWhereSyntax();
-
-        /**
-         * ORDER BY clause
-         */
-        $syntax[] = $this->getOrderBySyntax();
-
-        /**
-         * LIMIT clause
-         */
-        $syntax[] = $this->getLimitSyntax();
-
-        $syntax = implode(' ', $syntax);
-
-        return $this->getSyntaxReplace($syntax, $replacement);
-    }
-
-    /**
-     * @return array|int|null
-     * @throws QueryException
-     */
-    public function execute()
-    {
-
-        if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE)))
-            throw new QueryException('Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
-
-        return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
-
-    }
+	use Limit, Where, WhereAndHavingBuilder, Replacement, OrderBy, SetFields, Ignore, DefaultPriority, LowPriority, Utilities;
+
+	/**
+	 * @var string
+	 */
+	protected $statement = self::QUERY_STATEMENT_DELETE;
+
+
+	/**
+	 * QueryDelete constructor.
+	 * @param QueryBuild $queryBuild
+	 * @param string $table
+	 */
+	public function __construct(QueryBuild $queryBuild, $table = null)
+	{
+		parent::__construct($queryBuild, $table);
+	}
+
+	public function getSyntax($replacement = self::REPLACEMENT_NONE)
+	{
+		$syntax = array();
+
+		/**
+		 *  Explain
+		 */
+		$syntax[] = $this->getExplainSyntax();
+
+		/**
+		 * UPDATE statement
+		 */
+		$syntax[] = $this->statement;
+
+		/**
+		 * PRIORITY
+		 */
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::PRIORITY);
+
+		/**
+		 * TABLE update
+		 */
+		$syntax[] = 'FROM ' . $this->queryStructure->getElement(QueryStructure::TABLE);
+
+		/**
+		 * WHERE clause
+		 */
+		$syntax[] = $this->getWhereSyntax();
+
+		/**
+		 * ORDER BY clause
+		 */
+		$syntax[] = $this->getOrderBySyntax();
+
+		/**
+		 * LIMIT clause
+		 */
+		$syntax[] = $this->getLimitSyntax();
+
+		$syntax = implode(' ', $syntax);
+
+		return $this->getSyntaxReplace($syntax, $replacement);
+	}
+
+	/**
+	 * @return array|int|null
+	 * @throws QueryException
+	 */
+	public function execute()
+	{
+
+		if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE)))
+			throw new QueryException('Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
+
+		return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
+
+	}
 
 
 }
\ No newline at end of file

src/DB/DbLog.php

Indentation +106 added lines, -106 removed lines

@@ -11,111 +11,111 @@
 class DbLog
 {
 
-    private static $instance;
-
-
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var \DateTimeZone
-     */
-    private $dateTimeZone;
-
-
-    /**
-     * DbLog constructor.
-     */
-    private function __construct()
-    {
-        $this->dateTimeZone = new \DateTimeZone('Europe/Bucharest');
-    }
-
-
-    /**
-     * @param $query
-     * @param $duration
-     */
-    public function writeQueryDuration($query, $duration)
-    {
-        $backtrace = end(debug_backtrace());
-        $location = $backtrace['file'] . " Line: " . $backtrace['line'];
-
-        $this->path = DbConfig::getInstance()->getLogPathQueryDuration(); //my comments
-        $message = "Duration: " . round($duration, 5) . "\r\n";
-        $message .= "Location: $location\r\n";
-        $message .= "Query: $query";
-        $this->write($message);
-    }
-
-    /**
-     * @param $query
-     * @param $duration
-     */
-    public function writeQueryErros($query, $code, $error)
-    {
-        $backtrace = end(debug_backtrace());
-        $location = $backtrace['file'] . " Line: " . $backtrace['line'];
-
-        $this->path = DbConfig::getInstance()->getLogPathErrors(); //my comments
-        $message = "Query: $query" . "\r\n";
-        $message .= "Location: $location\r\n";
-        $message .= "Error code : " . $code . "\r\n";
-        $message .= "" . $error;
-
-        $this->write($message);
-    }
-
-
-    public function write($message)
-    {
-
-        $date = new \DateTime();
-        $date->setTimezone($this->dateTimeZone);
-
-        $log = $this->path . $date->format('Y-m-d') . ".txt";
-        $time = $date->format('H:i:s');
-
-        $messageFormat = "[$time]\r\n$message\r\n\r\n";
-
-        if (is_dir($this->path)) {
-            if (!file_exists($log)) {
-                $fh = fopen($log, 'a+');
-                fwrite($fh, $messageFormat);
-                fclose($fh);
-            } else {
-                $this->edit($log, $messageFormat);
-            }
-        } else {
-            if (mkdir($this->path, 0777) === true) {
-                $this->write($message);
-            }
-        }
-    }
-
-
-    /**
-     * @param string $log
-     * @param  string $message
-     */
-    private function edit($log, $message)
-    {
-        file_put_contents($log, $message, FILE_APPEND);
-    }
-
-
-    /**
-     * @return DbLog
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
+	private static $instance;
+
+
+	/**
+	 * @var string
+	 */
+	private $path;
+
+	/**
+	 * @var \DateTimeZone
+	 */
+	private $dateTimeZone;
+
+
+	/**
+	 * DbLog constructor.
+	 */
+	private function __construct()
+	{
+		$this->dateTimeZone = new \DateTimeZone('Europe/Bucharest');
+	}
+
+
+	/**
+	 * @param $query
+	 * @param $duration
+	 */
+	public function writeQueryDuration($query, $duration)
+	{
+		$backtrace = end(debug_backtrace());
+		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
+
+		$this->path = DbConfig::getInstance()->getLogPathQueryDuration(); //my comments
+		$message = "Duration: " . round($duration, 5) . "\r\n";
+		$message .= "Location: $location\r\n";
+		$message .= "Query: $query";
+		$this->write($message);
+	}
+
+	/**
+	 * @param $query
+	 * @param $duration
+	 */
+	public function writeQueryErros($query, $code, $error)
+	{
+		$backtrace = end(debug_backtrace());
+		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
+
+		$this->path = DbConfig::getInstance()->getLogPathErrors(); //my comments
+		$message = "Query: $query" . "\r\n";
+		$message .= "Location: $location\r\n";
+		$message .= "Error code : " . $code . "\r\n";
+		$message .= "" . $error;
+
+		$this->write($message);
+	}
+
+
+	public function write($message)
+	{
+
+		$date = new \DateTime();
+		$date->setTimezone($this->dateTimeZone);
+
+		$log = $this->path . $date->format('Y-m-d') . ".txt";
+		$time = $date->format('H:i:s');
+
+		$messageFormat = "[$time]\r\n$message\r\n\r\n";
+
+		if (is_dir($this->path)) {
+			if (!file_exists($log)) {
+				$fh = fopen($log, 'a+');
+				fwrite($fh, $messageFormat);
+				fclose($fh);
+			} else {
+				$this->edit($log, $messageFormat);
+			}
+		} else {
+			if (mkdir($this->path, 0777) === true) {
+				$this->write($message);
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $log
+	 * @param  string $message
+	 */
+	private function edit($log, $message)
+	{
+		file_put_contents($log, $message, FILE_APPEND);
+	}
+
+
+	/**
+	 * @return DbLog
+	 */
+	public static function getInstance()
+	{
+		if (null === self::$instance) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
 
 }
\ No newline at end of file

src/DB/DbService.php

Indentation +246 added lines, -246 removed lines

@@ -11,251 +11,251 @@
 class DbService
 {
 
-    const QUERY_TYPE_INSERT = 'INSERT';
-    const QUERY_TYPE_DELETE = 'DELETE';
-    const QUERY_TYPE_UPDATE = 'UPDATE';
-    const QUERY_TYPE_SELECT = 'SELECT';
-    const QUERY_TYPE_REPLACE = 'REPLACE';
-    const QUERY_TYPE_SHOW = 'SHOW';
-    const QUERY_TYPE_DESC = 'DESC';
-    const QUERY_TYPE_EMPTY = 'EMPTY';
-    const QUERY_TYPE_OTHER = 'OTHER';
-    const QUERY_TYPE_EXPLAIN = 'EXPLAIN';
-
-    const ON_ERROR_THROW_EXCEPTION = 1;
-    const ON_ERROR_RETURN_ERROR = 2;
-
-    /**
-     * @var DbService
-     */
-    private static $instance;
-
-    /**
-     * @var \PDO
-     */
-    private $pdo;
-
-    /**
-     * @var \PDOStatement
-     */
-    private $sQuery;
-
-    /**
-     * @var array
-     */
-    private $parameters = [];
-
-    /**
-     * @return DbService
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * @param string $query
-     * @param array $params
-     * @param int $fetchMode
-     * @return array|int|null
-     */
-    public function query($query, $params = null, $fetchMode = \PDO::FETCH_ASSOC)
-    {
-
-        $query = trim(str_replace("\r", " ", $query));
-        $statement = self::getQueryStatement($query);
-
-        $this->queryInit($query, $params);
-
-        if ($statement === self::QUERY_TYPE_SELECT || $statement === self::QUERY_TYPE_SHOW || $statement === self::QUERY_TYPE_DESC || $statement === self::QUERY_TYPE_EXPLAIN) {
-            return $this->sQuery->fetchAll($fetchMode);
-        } elseif ($statement === self::QUERY_TYPE_INSERT || $statement === self::QUERY_TYPE_UPDATE || $statement === self::QUERY_TYPE_DELETE) {
-            return $this->sQuery->rowCount();
-        } else {
-
-            return NULL;
-        }
-    }
-
-    /**
-     * @param $queryString
-     * @return string
-     */
-    public static function getQueryStatement($queryString)
-    {
-        $queryString = trim($queryString);
-
-        if ($queryString === '') {
-            return self::QUERY_TYPE_EMPTY;
-        }
-
-        if (preg_match('/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches)) {
-            switch (strtolower($matches[1])) {
-                case 'select':
-                    return self::QUERY_TYPE_SELECT;
-                case 'insert':
-                    return self::QUERY_TYPE_INSERT;
-                case 'update':
-                    return self::QUERY_TYPE_UPDATE;
-                case 'delete':
-                    return self::QUERY_TYPE_DELETE;
-                case 'replace':
-                    return self::QUERY_TYPE_REPLACE;
-                case 'explain':
-                    return self::QUERY_TYPE_EXPLAIN;
-                default:
-                    return self::QUERY_TYPE_OTHER;
-            }
-        } else {
-            return self::QUERY_TYPE_OTHER;
-        }
-    }
-
-    /**
-     * @param $query
-     * @param array $parameters
-     * @throws DbException
-     */
-    private function queryInit($query, $parameters = [])
-    {
-        $this->pdo = DbConnect::getInstance()->getConnection(self::getQueryStatement($query));
-        $startQueryTime = microtime(true);
-
-        try {
-
-            /**
-             * Prepare query
-             */
-            $this->sQuery = $this->pdo->prepare($query);
-
-            /**
-             * Add parameters to the parameter array
-             */
-            if (self::isArrayAssoc($parameters))
-                $this->bindMore($parameters); else
-                foreach ($parameters as $key => $val)
-                    $this->parameters[] = array($key + 1, $val);
-
-            if (count($this->parameters)) {
-                foreach ($this->parameters as $param => $value) {
-                    if (is_int($value[1])) {
-                        $type = \PDO::PARAM_INT;
-                    } elseif (is_bool($value[1])) {
-                        $type = \PDO::PARAM_BOOL;
-                    } elseif (is_null($value[1])) {
-                        $type = \PDO::PARAM_NULL;
-                    } else {
-                        $type = \PDO::PARAM_STR;
-                    }
-                    $this->sQuery->bindValue($value[0], $value[1], $type);
-                }
-            }
-
-            $this->sQuery->execute();
-
-            if (DbConfig::getInstance()->isEnableLogQueryDuration()) {
-                $duration = microtime(true) - $startQueryTime;
-                DbLog::getInstance()->writeQueryDuration($query, $duration);
-            }
-
-        } catch (\PDOException $e) {
-            if (DbConfig::getInstance()->isEnableLogErrors()) {
-                DbLog::getInstance()->writeQueryErros($query, $e->getCode(), $e->getMessage());
-            }
-            throw new DbException('Database error!', DbException::DB_QUERY_ERROR);
-        }
-
-        /**
-         * Reset the parameters
-         */
-        $this->parameters = array();
-    }
-
-    /**
-     * @param array $arr
-     * @return bool
-     */
-    public static function isArrayAssoc(array $arr)
-    {
-        if (array() === $arr)
-            return false;
-
-        return array_keys($arr) !== range(0, count($arr) - 1);
-    }
-
-    public function bindMore($parray)
-    {
-        if (!count($this->parameters) && is_array($parray)) {
-            $columns = array_keys($parray);
-            foreach ($columns as $i => &$column) {
-                $this->bind($column, $parray[ $column ]);
-            }
-        }
-    }
-
-    public function bind($para, $value)
-    {
-        $this->parameters[ sizeof($this->parameters) ] = [":" . $para, $value];
-    }
-
-    /**
-     * @param $query
-     * @param array $params
-     * @return array|null
-     */
-    public function column($query, $params = null)
-    {
-        $this->queryInit($query, $params);
-
-        $query = trim(str_replace("\r", " ", $query));
-        $statement = self::getQueryStatement($query);
-
-        if ($statement === self::QUERY_TYPE_EXPLAIN)
-            return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
-
-        $Columns = $this->sQuery->fetchAll(\PDO::FETCH_NUM);
-
-        $column = null;
-
-        foreach ($Columns as $cells) {
-            $column[] = $cells[0];
-        }
-
-        return $column;
-    }
-
-    public function row($query, $params = null, $fetchmode = \PDO::FETCH_ASSOC)
-    {
-        $this->queryInit($query, $params);
-
-        $query = trim(str_replace("\r", " ", $query));
-        $statement = self::getQueryStatement($query);
-
-        if ($statement === self::QUERY_TYPE_EXPLAIN)
-            return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
-
-        $result = $this->sQuery->fetch($fetchmode);
-        $this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued,
-
-        return $result;
-    }
-
-    public function single($query, $params = null)
-    {
-        $this->queryInit($query, $params);
-        $result = $this->sQuery->fetchColumn();
-        $this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued
-
-        return $result;
-    }
-
-    public function CloseConnection()
-    {
-        $this->pdo = null;
-    }
+	const QUERY_TYPE_INSERT = 'INSERT';
+	const QUERY_TYPE_DELETE = 'DELETE';
+	const QUERY_TYPE_UPDATE = 'UPDATE';
+	const QUERY_TYPE_SELECT = 'SELECT';
+	const QUERY_TYPE_REPLACE = 'REPLACE';
+	const QUERY_TYPE_SHOW = 'SHOW';
+	const QUERY_TYPE_DESC = 'DESC';
+	const QUERY_TYPE_EMPTY = 'EMPTY';
+	const QUERY_TYPE_OTHER = 'OTHER';
+	const QUERY_TYPE_EXPLAIN = 'EXPLAIN';
+
+	const ON_ERROR_THROW_EXCEPTION = 1;
+	const ON_ERROR_RETURN_ERROR = 2;
+
+	/**
+	 * @var DbService
+	 */
+	private static $instance;
+
+	/**
+	 * @var \PDO
+	 */
+	private $pdo;
+
+	/**
+	 * @var \PDOStatement
+	 */
+	private $sQuery;
+
+	/**
+	 * @var array
+	 */
+	private $parameters = [];
+
+	/**
+	 * @return DbService
+	 */
+	public static function getInstance()
+	{
+		if (null === self::$instance) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * @param string $query
+	 * @param array $params
+	 * @param int $fetchMode
+	 * @return array|int|null
+	 */
+	public function query($query, $params = null, $fetchMode = \PDO::FETCH_ASSOC)
+	{
+
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
+
+		$this->queryInit($query, $params);
+
+		if ($statement === self::QUERY_TYPE_SELECT || $statement === self::QUERY_TYPE_SHOW || $statement === self::QUERY_TYPE_DESC || $statement === self::QUERY_TYPE_EXPLAIN) {
+			return $this->sQuery->fetchAll($fetchMode);
+		} elseif ($statement === self::QUERY_TYPE_INSERT || $statement === self::QUERY_TYPE_UPDATE || $statement === self::QUERY_TYPE_DELETE) {
+			return $this->sQuery->rowCount();
+		} else {
+
+			return NULL;
+		}
+	}
+
+	/**
+	 * @param $queryString
+	 * @return string
+	 */
+	public static function getQueryStatement($queryString)
+	{
+		$queryString = trim($queryString);
+
+		if ($queryString === '') {
+			return self::QUERY_TYPE_EMPTY;
+		}
+
+		if (preg_match('/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches)) {
+			switch (strtolower($matches[1])) {
+				case 'select':
+					return self::QUERY_TYPE_SELECT;
+				case 'insert':
+					return self::QUERY_TYPE_INSERT;
+				case 'update':
+					return self::QUERY_TYPE_UPDATE;
+				case 'delete':
+					return self::QUERY_TYPE_DELETE;
+				case 'replace':
+					return self::QUERY_TYPE_REPLACE;
+				case 'explain':
+					return self::QUERY_TYPE_EXPLAIN;
+				default:
+					return self::QUERY_TYPE_OTHER;
+			}
+		} else {
+			return self::QUERY_TYPE_OTHER;
+		}
+	}
+
+	/**
+	 * @param $query
+	 * @param array $parameters
+	 * @throws DbException
+	 */
+	private function queryInit($query, $parameters = [])
+	{
+		$this->pdo = DbConnect::getInstance()->getConnection(self::getQueryStatement($query));
+		$startQueryTime = microtime(true);
+
+		try {
+
+			/**
+			 * Prepare query
+			 */
+			$this->sQuery = $this->pdo->prepare($query);
+
+			/**
+			 * Add parameters to the parameter array
+			 */
+			if (self::isArrayAssoc($parameters))
+				$this->bindMore($parameters); else
+				foreach ($parameters as $key => $val)
+					$this->parameters[] = array($key + 1, $val);
+
+			if (count($this->parameters)) {
+				foreach ($this->parameters as $param => $value) {
+					if (is_int($value[1])) {
+						$type = \PDO::PARAM_INT;
+					} elseif (is_bool($value[1])) {
+						$type = \PDO::PARAM_BOOL;
+					} elseif (is_null($value[1])) {
+						$type = \PDO::PARAM_NULL;
+					} else {
+						$type = \PDO::PARAM_STR;
+					}
+					$this->sQuery->bindValue($value[0], $value[1], $type);
+				}
+			}
+
+			$this->sQuery->execute();
+
+			if (DbConfig::getInstance()->isEnableLogQueryDuration()) {
+				$duration = microtime(true) - $startQueryTime;
+				DbLog::getInstance()->writeQueryDuration($query, $duration);
+			}
+
+		} catch (\PDOException $e) {
+			if (DbConfig::getInstance()->isEnableLogErrors()) {
+				DbLog::getInstance()->writeQueryErros($query, $e->getCode(), $e->getMessage());
+			}
+			throw new DbException('Database error!', DbException::DB_QUERY_ERROR);
+		}
+
+		/**
+		 * Reset the parameters
+		 */
+		$this->parameters = array();
+	}
+
+	/**
+	 * @param array $arr
+	 * @return bool
+	 */
+	public static function isArrayAssoc(array $arr)
+	{
+		if (array() === $arr)
+			return false;
+
+		return array_keys($arr) !== range(0, count($arr) - 1);
+	}
+
+	public function bindMore($parray)
+	{
+		if (!count($this->parameters) && is_array($parray)) {
+			$columns = array_keys($parray);
+			foreach ($columns as $i => &$column) {
+				$this->bind($column, $parray[ $column ]);
+			}
+		}
+	}
+
+	public function bind($para, $value)
+	{
+		$this->parameters[ sizeof($this->parameters) ] = [":" . $para, $value];
+	}
+
+	/**
+	 * @param $query
+	 * @param array $params
+	 * @return array|null
+	 */
+	public function column($query, $params = null)
+	{
+		$this->queryInit($query, $params);
+
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
+
+		if ($statement === self::QUERY_TYPE_EXPLAIN)
+			return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
+
+		$Columns = $this->sQuery->fetchAll(\PDO::FETCH_NUM);
+
+		$column = null;
+
+		foreach ($Columns as $cells) {
+			$column[] = $cells[0];
+		}
+
+		return $column;
+	}
+
+	public function row($query, $params = null, $fetchmode = \PDO::FETCH_ASSOC)
+	{
+		$this->queryInit($query, $params);
+
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
+
+		if ($statement === self::QUERY_TYPE_EXPLAIN)
+			return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
+
+		$result = $this->sQuery->fetch($fetchmode);
+		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued,
+
+		return $result;
+	}
+
+	public function single($query, $params = null)
+	{
+		$this->queryInit($query, $params);
+		$result = $this->sQuery->fetchColumn();
+		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued
+
+		return $result;
+	}
+
+	public function CloseConnection()
+	{
+		$this->pdo = null;
+	}
 
 }
\ No newline at end of file

src/DB/DbException.php

Indentation +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@
 class DbException extends \Exception
 {
 
-    const DB_CONNECTION_ERROR = 1;
-    const DB_QUERY_ERROR = 2;
-    const DB_ERROR_MASTER_DATA_CONNECTION_MISSING = 3;
+	const DB_CONNECTION_ERROR = 1;
+	const DB_QUERY_ERROR = 2;
+	const DB_ERROR_MASTER_DATA_CONNECTION_MISSING = 3;
 
 
 }
\ No newline at end of file

src/DB/DbConnect.php

Indentation +117 added lines, -117 removed lines

@@ -11,122 +11,122 @@
 class DbConnect
 {
 
-    private static $instance;
-
-    /**
-     * @var \PDO
-     */
-    private $pdoMaster;
-
-    /**
-     * @var \PDO
-     */
-    private $pdoSlave;
-
-    /**
-     * @var DbConfig
-     */
-    private $config;
-
-
-    /**
-     * DbConnect constructor.
-     */
-    private function __construct()
-    {
-        $this->config = DbConfig::getInstance();
-    }
-
-    /**
-     * @return \PDO
-     */
-    public function getMasterConnection()
-    {
-        if (!is_a($this->pdoMaster, \PDO::class))
-            $this->pdoMaster = $this->connect($this->config->getMasterDataConnect());
-
-        return $this->pdoMaster;
-    }
-
-    /**
-     * @return \PDO
-     */
-    public function getSlaveConnection()
-    {
-        if (!$this->config->getReplicationEnable())
-            return $this->getMasterConnection();
-
-        if (!is_a($this->pdoSlave, \PDO::class))
-            $this->pdoSlave = $this->connect($this->config->getSlaveDataConnect());
-
-        return $this->pdoSlave;
-    }
-
-    /**
-     * @param $statement
-     * @return \PDO
-     */
-    public function getConnection($statement)
-    {
-        $statement = trim(strtolower($statement));
-
-        if ($statement === DbService::QUERY_TYPE_SELECT)
-            return $this->getSlaveConnection();
-
-        return $this->getMasterConnection();
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function quote($string)
-    {
-        return $this->getMasterConnection()->quote($string);
-    }
-
-    /**
-     * @return string
-     */
-    public function lastInsertId()
-    {
-        return $this->getMasterConnection()->lastInsertId();
-    }
-
-    /**
-     * @param $dataConnect
-     * @return \PDO
-     */
-    private function connect($dataConnect)
-    {
-        $dsn = 'mysql:dbname=' . $dataConnect["dbname"] . ';host=' . $dataConnect["host"] . '';
-        try {
-
-            $pdo = new \PDO($dsn, $dataConnect["user"], $dataConnect["password"], array(\PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"));
-
-            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-            $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
-        } catch (\PDOException $e) {
-            if (DbConfig::getInstance()->isEnableLogErrors()) {
-                DbLog::getInstance()->writeQueryErros('Connection fail!', $e->getCode(), $e->getMessage());
-            }
-            throw new DbException('Database connection error!', DbException::DB_CONNECTION_ERROR);
-        }
-
-        return $pdo;
-    }
-
-
-    /**
-     * @return DbConnect
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
+	private static $instance;
+
+	/**
+	 * @var \PDO
+	 */
+	private $pdoMaster;
+
+	/**
+	 * @var \PDO
+	 */
+	private $pdoSlave;
+
+	/**
+	 * @var DbConfig
+	 */
+	private $config;
+
+
+	/**
+	 * DbConnect constructor.
+	 */
+	private function __construct()
+	{
+		$this->config = DbConfig::getInstance();
+	}
+
+	/**
+	 * @return \PDO
+	 */
+	public function getMasterConnection()
+	{
+		if (!is_a($this->pdoMaster, \PDO::class))
+			$this->pdoMaster = $this->connect($this->config->getMasterDataConnect());
+
+		return $this->pdoMaster;
+	}
+
+	/**
+	 * @return \PDO
+	 */
+	public function getSlaveConnection()
+	{
+		if (!$this->config->getReplicationEnable())
+			return $this->getMasterConnection();
+
+		if (!is_a($this->pdoSlave, \PDO::class))
+			$this->pdoSlave = $this->connect($this->config->getSlaveDataConnect());
+
+		return $this->pdoSlave;
+	}
+
+	/**
+	 * @param $statement
+	 * @return \PDO
+	 */
+	public function getConnection($statement)
+	{
+		$statement = trim(strtolower($statement));
+
+		if ($statement === DbService::QUERY_TYPE_SELECT)
+			return $this->getSlaveConnection();
+
+		return $this->getMasterConnection();
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function quote($string)
+	{
+		return $this->getMasterConnection()->quote($string);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function lastInsertId()
+	{
+		return $this->getMasterConnection()->lastInsertId();
+	}
+
+	/**
+	 * @param $dataConnect
+	 * @return \PDO
+	 */
+	private function connect($dataConnect)
+	{
+		$dsn = 'mysql:dbname=' . $dataConnect["dbname"] . ';host=' . $dataConnect["host"] . '';
+		try {
+
+			$pdo = new \PDO($dsn, $dataConnect["user"], $dataConnect["password"], array(\PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"));
+
+			$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+			$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+		} catch (\PDOException $e) {
+			if (DbConfig::getInstance()->isEnableLogErrors()) {
+				DbLog::getInstance()->writeQueryErros('Connection fail!', $e->getCode(), $e->getMessage());
+			}
+			throw new DbException('Database connection error!', DbException::DB_CONNECTION_ERROR);
+		}
+
+		return $pdo;
+	}
+
+
+	/**
+	 * @return DbConnect
+	 */
+	public static function getInstance()
+	{
+		if (null === self::$instance) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
 
 }
\ No newline at end of file

src/DB/DbConfig.php

Indentation +219 added lines, -219 removed lines

@@ -11,225 +11,225 @@
 class DbConfig
 {
 
-    private static $instance;
-
-    /**
-     * @var array
-     */
-    private $dbConfig;
-
-    /**
-     * @var bool
-     */
-    private $replicationEnable;
-
-    /**
-     * @var array
-     */
-    private $masterDataConnect;
-
-    /**
-     * @var array
-     */
-    private $slaveDataConnect;
-
-    /**
-     * @var bool
-     */
-    private $enableLogErrors = false;
-
-    /**
-     * @var bool
-     */
-    private $enableLogQueryDuration = false;
-
-    /**
-     * @var string
-     */
-    private $logPathErrors;
-
-    /**
-     * @var string
-     */
-    private $logPathQueryDuration;
-
-
-    /**
-     * DbConfig constructor.
-     */
-    private function __construct()
-    {
-        $vendorCfg = __DIR__ . '/../../../../../vendor-cfg/qpdb_db_config.php';
-        if (file_exists($vendorCfg))
-            $this->dbConfig = require $vendorCfg; else
-            $this->dbConfig = require __DIR__ . '/../../config/qpdb_db_config.php';
-
-        $this->buildConfig();
-    }
-
-    /**
-     * @param string $fileConfig
-     * @return $this
-     */
-    public function withFileConfig($fileConfig)
-    {
-        $this->dbConfig = require $fileConfig;
-        $this->buildConfig();
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getReplicationEnable()
-    {
-        return $this->replicationEnable;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMasterDataConnect()
-    {
-        return $this->masterDataConnect;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSlaveDataConnect()
-    {
-        return $this->slaveDataConnect;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLogConfig()
-    {
-        return $this->dbConfig['db_log'];
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnableLogErrors()
-    {
-        return $this->enableLogErrors;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnableLogQueryDuration()
-    {
-        return $this->enableLogQueryDuration;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogPathErrors()
-    {
-        return $this->logPathErrors;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogPathQueryDuration()
-    {
-        return $this->logPathQueryDuration;
-    }
-
-    public function useTablePrefix()
-    {
-        if (!empty($this->dbConfig['use_table_prefix']))
-            return $this->dbConfig['use_table_prefix'];
-
-        return false;
-    }
-
-    public function getTablePrefix()
-    {
-        return $this->dbConfig['table_prefix'];
-    }
-
-
-    private function buildConfig()
-    {
-        $this->replicationEnable = $this->dbConfig['replicationEnable'];
-        $this->readMasterDataConnect();
-        $this->readSlaveDataConnect();
-        $this->configLogger();
-    }
-
-    private function configLogger()
-    {
-        $this->enableLogErrors = $this->dbConfig['db_log']['enable_log_errors'];
-        $this->enableLogQueryDuration = $this->dbConfig['db_log']['enable_log_query_duration'];
-        $this->logPathErrors = $this->dbConfig['db_log']['log_path_errors'];
-        $this->logPathQueryDuration = $this->dbConfig['db_log']['log_path_query_duration'];
-
-    }
-
-    /**
-     * @return bool
-     * @throws DbException
-     */
-    private function readMasterDataConnect()
-    {
-
-        if (!isset($this->dbConfig['master_data_connect'][0]))
-            throw new DbException('Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING);
-
-        $dataConnection = $this->dbConfig['master_data_connect'];
-
-        if (!$this->replicationEnable || count($dataConnection) == 1) {
-            $this->masterDataConnect = $dataConnection[0];
-
-            return true;
-        }
-
-        shuffle($dataConnection);
-        $this->masterDataConnect = $dataConnection[0];
-
-        return true;
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function readSlaveDataConnect()
-    {
-
-        if (!isset($this->dbConfig['slave_data_connect'][0])) {
-            $this->slaveDataConnect = $this->masterDataConnect;
-
-            return true;
-        }
-
-        $dataConnection = $this->dbConfig['slave_data_connect'];
-
-        shuffle($dataConnection);
-        $this->slaveDataConnect = $dataConnection[0];
-
-        return true;
-    }
-
-    /**
-     * @return DbConfig
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
+	private static $instance;
+
+	/**
+	 * @var array
+	 */
+	private $dbConfig;
+
+	/**
+	 * @var bool
+	 */
+	private $replicationEnable;
+
+	/**
+	 * @var array
+	 */
+	private $masterDataConnect;
+
+	/**
+	 * @var array
+	 */
+	private $slaveDataConnect;
+
+	/**
+	 * @var bool
+	 */
+	private $enableLogErrors = false;
+
+	/**
+	 * @var bool
+	 */
+	private $enableLogQueryDuration = false;
+
+	/**
+	 * @var string
+	 */
+	private $logPathErrors;
+
+	/**
+	 * @var string
+	 */
+	private $logPathQueryDuration;
+
+
+	/**
+	 * DbConfig constructor.
+	 */
+	private function __construct()
+	{
+		$vendorCfg = __DIR__ . '/../../../../../vendor-cfg/qpdb_db_config.php';
+		if (file_exists($vendorCfg))
+			$this->dbConfig = require $vendorCfg; else
+			$this->dbConfig = require __DIR__ . '/../../config/qpdb_db_config.php';
+
+		$this->buildConfig();
+	}
+
+	/**
+	 * @param string $fileConfig
+	 * @return $this
+	 */
+	public function withFileConfig($fileConfig)
+	{
+		$this->dbConfig = require $fileConfig;
+		$this->buildConfig();
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getReplicationEnable()
+	{
+		return $this->replicationEnable;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getMasterDataConnect()
+	{
+		return $this->masterDataConnect;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSlaveDataConnect()
+	{
+		return $this->slaveDataConnect;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLogConfig()
+	{
+		return $this->dbConfig['db_log'];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isEnableLogErrors()
+	{
+		return $this->enableLogErrors;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isEnableLogQueryDuration()
+	{
+		return $this->enableLogQueryDuration;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogPathErrors()
+	{
+		return $this->logPathErrors;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogPathQueryDuration()
+	{
+		return $this->logPathQueryDuration;
+	}
+
+	public function useTablePrefix()
+	{
+		if (!empty($this->dbConfig['use_table_prefix']))
+			return $this->dbConfig['use_table_prefix'];
+
+		return false;
+	}
+
+	public function getTablePrefix()
+	{
+		return $this->dbConfig['table_prefix'];
+	}
+
+
+	private function buildConfig()
+	{
+		$this->replicationEnable = $this->dbConfig['replicationEnable'];
+		$this->readMasterDataConnect();
+		$this->readSlaveDataConnect();
+		$this->configLogger();
+	}
+
+	private function configLogger()
+	{
+		$this->enableLogErrors = $this->dbConfig['db_log']['enable_log_errors'];
+		$this->enableLogQueryDuration = $this->dbConfig['db_log']['enable_log_query_duration'];
+		$this->logPathErrors = $this->dbConfig['db_log']['log_path_errors'];
+		$this->logPathQueryDuration = $this->dbConfig['db_log']['log_path_query_duration'];
+
+	}
+
+	/**
+	 * @return bool
+	 * @throws DbException
+	 */
+	private function readMasterDataConnect()
+	{
+
+		if (!isset($this->dbConfig['master_data_connect'][0]))
+			throw new DbException('Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING);
+
+		$dataConnection = $this->dbConfig['master_data_connect'];
+
+		if (!$this->replicationEnable || count($dataConnection) == 1) {
+			$this->masterDataConnect = $dataConnection[0];
+
+			return true;
+		}
+
+		shuffle($dataConnection);
+		$this->masterDataConnect = $dataConnection[0];
+
+		return true;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function readSlaveDataConnect()
+	{
+
+		if (!isset($this->dbConfig['slave_data_connect'][0])) {
+			$this->slaveDataConnect = $this->masterDataConnect;
+
+			return true;
+		}
+
+		$dataConnection = $this->dbConfig['slave_data_connect'];
+
+		shuffle($dataConnection);
+		$this->slaveDataConnect = $dataConnection[0];
+
+		return true;
+	}
+
+	/**
+	 * @return DbConfig
+	 */
+	public static function getInstance()
+	{
+		if (null === self::$instance) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
 
 
 }
\ No newline at end of file