Skip to content

Commit

Permalink
Release version 2.1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@hungnguyenhp
hungnguyenhp committed Feb 7, 2023
1 parent 220bc08 commit 59717bb
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/Environment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
interface Environment
{
const PROJECT_NAME = 'My Database by HungNG';
const VERSION = '2.1.9.1';
const VERSION = '2.1.9.2';
const LAST_MODIFIED = '2023-02-07';
const AUTHOR_NAME = 'Hung Nguyen';
const AUTHOR_EMAIL = 'dev@nguyenanhung.com';
Expand Down
139 changes: 128 additions & 11 deletions src/Model/BaseModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ class BaseModel implements Environment
/** @var \Illuminate\Database\Capsule\Manager|null $db Đối tượng khởi tạo dùng gọi đến Class Capsule Manager */
protected $db;

/** @var bool Cấu hình trạng thái Debug, TRUE nếu bật, FALSE nếu tắt */
public $debugStatus = false;

/** @var null|string Cấu hình Level Debug */
public $debugLevel = 'error';

/** @var null|bool|string Cấu hình thư mục lưu trữ Log, VD: /your/to/path */
public $debugLoggerPath = '';

/** @var null|string Cấu hình File Log, VD: Log-2018-10-15.log | Log-date('Y-m-d').log */
public $debugLoggerFilename = '';

/** @var mixed $schema */
protected $schema;

Expand All @@ -68,20 +80,17 @@ class BaseModel implements Environment
/** @var bool|null Cấu hình trạng thái select Raw */
protected $selectRaw;

/** @var bool Cấu hình trạng thái Debug, TRUE nếu bật, FALSE nếu tắt */
public $debugStatus = false;

/** @var null|string Cấu hình Level Debug */
public $debugLevel = 'error';
/** @var string Primary Key Default */
public $primaryKey = 'id';

/** @var null|bool|string Cấu hình thư mục lưu trữ Log, VD: /your/to/path */
public $debugLoggerPath = '';
/** @var null|string Table Prefix */
protected $prefixTbl;

/** @var null|string Cấu hình File Log, VD: Log-2018-10-15.log | Log-date('Y-m-d').log */
public $debugLoggerFilename = '';
/** @var int $chunkCount */
protected $chunkCount;

/** @var string Primary Key Default */
public $primaryKey = 'id';
/** @var string|array|null List Field Order for Query Results */
protected $orderColumn;

/**
* BaseModel constructor.
Expand Down Expand Up @@ -129,18 +138,126 @@ public function __destruct()
{
}

/**
* Function setJoinStatement
*
* @param $joins
*
* @return $this
* @author : 713uk13m <dev@nguyenanhung.com>
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 26:41
*/
public function setJoinStatement($joins = array())
{
$this->joins = $joins;

return $this;
}

/**
* Function getJoinStatement
*
* @return array
* @author : 713uk13m <dev@nguyenanhung.com>
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 26:36
*/
public function getJoinStatement()
{
return $this->joins;
}

/**
* Function setChunkCount
*
* @author: 713uk13m <dev@nguyenanhung.com>
* @time : 2018-12-03 10:59
*
* @param int $chunkCount
*
* @return $this
*/
public function setChunkCount($chunkCount = 100)
{
$this->chunkCount = $chunkCount;

return $this;
}

/**
* Function getChunkCount
*
* @author: 713uk13m <dev@nguyenanhung.com>
* @time : 2018-12-03 10:59
*
* @return int
*/
public function getChunkCount()
{
return $this->chunkCount;
}

/**
* Function setPrefixTbl
*
* @author: 713uk13m <dev@nguyenanhung.com>
* @time : 2018-12-07 15:21
*
* @param string $prefixTbl
*
* @return $this
*/
public function setPrefixTbl($prefixTbl = '')
{
$this->prefixTbl = $prefixTbl;

return $this;
}

/**
* Function getPrefixTbl
*
* @author: 713uk13m <dev@nguyenanhung.com>
* @time : 2018-12-07 15:21
*
* @return string|null
*/
public function getPrefixTbl()
{
return $this->prefixTbl;
}

/**
* Function getOrderColumn
*
* @return array|string|null
* @author : 713uk13m <dev@nguyenanhung.com>
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 14/12/2022 34:06
*/
public function getOrderColumn()
{
return $this->orderColumn;
}

/**
* Function setOrderColumn
*
* @param $orderColumn
*
* @return $this
* @author : 713uk13m <dev@nguyenanhung.com>
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 14/12/2022 34:01
*/
public function setOrderColumn($orderColumn)
{
$this->orderColumn = $orderColumn;

return $this;
}

/**
* Function getPrimaryKey
*
Expand Down
48 changes: 24 additions & 24 deletions src/Model/Helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function preparePaging($pageIndex = 1, $pageSize = 10)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 09/22/2021 22:22
*/
protected function prepareOptionFormat($options = array())
public function prepareOptionFormat($options = array())
{
if (isset($options['format']) && is_string($options['format'])) {
$format = strtolower($options['format']);
Expand All @@ -91,7 +91,7 @@ protected function prepareOptionFormat($options = array())
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 09/21/2021 10:57
*/
protected function formatSelectFieldStringToArray($selectField = '')
public function formatSelectFieldStringToArray($selectField = '')
{
if (is_string($selectField)) {
if ($selectField === '*') {
Expand Down Expand Up @@ -128,7 +128,7 @@ protected function formatSelectFieldStringToArray($selectField = '')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 09/21/2021 12:12
*/
protected function prepareFormatSelectField($selectField = array())
public function prepareFormatSelectField($selectField = array())
{
if ($selectField === null) {
return array('*');
Expand Down Expand Up @@ -166,7 +166,7 @@ protected function prepareFormatSelectField($selectField = array())
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 40:06
*/
protected function prepareQueryStatementOptions(Builder $builder, $options = null)
public function prepareQueryStatementOptions(Builder $builder, $options = null)
{
if ($options !== null) {
// Case có cả Limit và Offset -> active phân trang
Expand Down Expand Up @@ -223,7 +223,7 @@ protected function prepareQueryStatementOptions(Builder $builder, $options = nul
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 09/22/2021 02:38
*/
protected function prepareWhereAndFieldStatement(Builder $builder, $wheres, $fields, $options = null)
public function prepareWhereAndFieldStatement(Builder $builder, $wheres, $fields, $options = null)
{
if (!empty($wheres)) {
if (is_array($wheres)) {
Expand Down Expand Up @@ -265,7 +265,7 @@ protected function prepareWhereAndFieldStatement(Builder $builder, $wheres, $fie
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 43:10
*/
protected function prepareSimpleWheresWithStatement(Builder $builder, $wheres)
public function prepareSimpleWheresWithStatement(Builder $builder, $wheres)
{
if (!empty($wheres) && is_array($wheres) && count($wheres) > 0) {
foreach ($wheres as $field => $value) {
Expand Down Expand Up @@ -300,7 +300,7 @@ protected function prepareSimpleWheresWithStatement(Builder $builder, $wheres)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 43:56
*/
protected function prepareSimpleWheresWithOptionsStatement(Builder $builder, $wheres, $options = null)
public function prepareSimpleWheresWithOptionsStatement(Builder $builder, $wheres, $options = null)
{
$builder = $this->prepareSimpleWheresWithStatement($builder, $wheres);

Expand All @@ -318,7 +318,7 @@ protected function prepareSimpleWheresWithOptionsStatement(Builder $builder, $wh
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 52:43
*/
protected function prepareSimpleWhereEqualToStatement(Builder $builder, $wheres)
public function prepareSimpleWhereEqualToStatement(Builder $builder, $wheres)
{
if (is_array($wheres)) {
foreach ($wheres as $field => $value) {
Expand All @@ -340,7 +340,7 @@ protected function prepareSimpleWhereEqualToStatement(Builder $builder, $wheres)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 37:43
*/
protected function prepareSimpleWhereNotEqualToStatement(Builder $builder, $wheres)
public function prepareSimpleWhereNotEqualToStatement(Builder $builder, $wheres)
{
if (is_array($wheres)) {
foreach ($wheres as $field => $value) {
Expand All @@ -361,7 +361,7 @@ protected function prepareSimpleWhereNotEqualToStatement(Builder $builder, $wher
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 24:41
*/
protected function prepareJoinStatement(Builder $builder)
public function prepareJoinStatement(Builder $builder)
{
if (!empty($this->joins) && is_array($this->joins)) {
foreach ($this->joins as $join) {
Expand Down Expand Up @@ -391,7 +391,7 @@ protected function prepareJoinStatement(Builder $builder)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 55:48
*/
protected function formatReturnResult($result, $format, $loggerStatus = true)
public function formatReturnResult($result, $format, $loggerStatus = true)
{
if ($format === 'json') {
if ($loggerStatus === true) {
Expand Down Expand Up @@ -431,7 +431,7 @@ protected function formatReturnResult($result, $format, $loggerStatus = true)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 55:35
*/
protected function formatReturnRowsResult(Builder $builder, $format)
public function formatReturnRowsResult(Builder $builder, $format)
{
if ($format === 'result') {
$result = $builder->get();
Expand Down Expand Up @@ -472,7 +472,7 @@ protected function formatReturnRowsResult(Builder $builder, $format)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 29:12
*/
protected function bindRecursiveFromCategory(Builder $db, $recursive, $parentId, $field = 'categoryId')
public function bindRecursiveFromCategory(Builder $db, $recursive, $parentId, $field = 'categoryId')
{
if (is_array($recursive) || is_object($recursive)) {
/**
Expand Down Expand Up @@ -511,7 +511,7 @@ protected function bindRecursiveFromCategory(Builder $db, $recursive, $parentId,
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 07:22
*/
protected function filterByPrimaryId(Builder $db, $id, $field = 'id')
public function filterByPrimaryId(Builder $db, $id, $field = 'id')
{
if ($id !== null) {
if (is_array($id)) {
Expand All @@ -536,7 +536,7 @@ protected function filterByPrimaryId(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 18:00
*/
protected function buildOperatorEqualTo(Builder $db, $id, $field = 'id')
public function buildOperatorEqualTo(Builder $db, $id, $field = 'id')
{
if ($id !== null) {
if (is_array($id)) {
Expand All @@ -561,7 +561,7 @@ protected function buildOperatorEqualTo(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 29:17
*/
protected function buildOperatorNotEqualTo(Builder $db, $id, $field = 'id')
public function buildOperatorNotEqualTo(Builder $db, $id, $field = 'id')
{
if ($id !== null) {
if (is_array($id)) {
Expand All @@ -586,7 +586,7 @@ protected function buildOperatorNotEqualTo(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 30:09
*/
protected function buildOperatorLessThanTo(Builder $db, $id, $field = 'id')
public function buildOperatorLessThanTo(Builder $db, $id, $field = 'id')
{
$db->where($this->table . '.' . $field, self::OPERATOR_LESS_THAN, $id);

Expand All @@ -605,7 +605,7 @@ protected function buildOperatorLessThanTo(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 30:05
*/
protected function buildOperatorGreaterThanTo(Builder $db, $id, $field = 'id')
public function buildOperatorGreaterThanTo(Builder $db, $id, $field = 'id')
{
$db->where($this->table . '.' . $field, self::OPERATOR_GREATER_THAN, $id);

Expand All @@ -624,7 +624,7 @@ protected function buildOperatorGreaterThanTo(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 30:01
*/
protected function buildOperatorLessThanOrEqualTo(Builder $db, $id, $field = 'id')
public function buildOperatorLessThanOrEqualTo(Builder $db, $id, $field = 'id')
{
$db->where($this->table . '.' . $field, self::OPERATOR_LESS_THAN_OR_EQUAL_TO, $id);

Expand All @@ -643,7 +643,7 @@ protected function buildOperatorLessThanOrEqualTo(Builder $db, $id, $field = 'id
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 29:57
*/
protected function buildOperatorGreaterThanOrEqualTo(Builder $db, $id, $field = 'id')
public function buildOperatorGreaterThanOrEqualTo(Builder $db, $id, $field = 'id')
{
$db->where($this->table . '.' . $field, self::OPERATOR_GREATER_THAN_OR_EQUAL_TO, $id);

Expand All @@ -662,7 +662,7 @@ protected function buildOperatorGreaterThanOrEqualTo(Builder $db, $id, $field =
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 29:52
*/
protected function buildOperatorSpaceShipTo(Builder $db, $id, $field = 'id')
public function buildOperatorSpaceShipTo(Builder $db, $id, $field = 'id')
{
$db->where($this->table . '.' . $field, self::OPERATOR_IS_SPACESHIP, $id);

Expand All @@ -681,7 +681,7 @@ protected function buildOperatorSpaceShipTo(Builder $db, $id, $field = 'id')
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 28:46
*/
protected function bindOrderBy(Builder $db, $orderByField, $defaultField = 'updated_at')
public function bindOrderBy(Builder $db, $orderByField, $defaultField = 'updated_at')
{
if (isset($orderByField) && is_array($orderByField) && count($orderByField) > 0) {
foreach ($orderByField as $field) {
Expand All @@ -707,7 +707,7 @@ protected function bindOrderBy(Builder $db, $orderByField, $defaultField = 'upda
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 28:41
*/
protected function bindOrderByNoDefault(Builder $db, $orderByField)
public function bindOrderByNoDefault(Builder $db, $orderByField)
{
if (isset($orderByField) && is_array($orderByField) && count($orderByField) > 0) {
foreach ($orderByField as $field) {
Expand All @@ -729,7 +729,7 @@ protected function bindOrderByNoDefault(Builder $db, $orderByField)
* @copyright: 713uk13m <dev@nguyenanhung.com>
* @time : 07/02/2023 33:52
*/
protected function filterRecordIsActive(Builder $db, $field = 'status')
public function filterRecordIsActive(Builder $db, $field = 'status')
{
$db->where($this->table . '.' . $field, self::OPERATOR_EQUAL_TO, self::TABLE_OPERATOR_IS_ACTIVE);

Expand Down

0 comments on commit 59717bb

Please sign in to comment.