From 9cf3728a2c80df136eb1755178a29fca2c9ad925 Mon Sep 17 00:00:00 2001 From: Catfan Date: Sat, 25 Nov 2017 00:05:22 +0800 Subject: [PATCH 1/2] [fix] Fix code bug and style --- src/Medoo.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Medoo.php b/src/Medoo.php index 10998f47..5fdefd1e 100644 --- a/src/Medoo.php +++ b/src/Medoo.php @@ -808,11 +808,11 @@ protected function whereClause($where, &$map) { $stack[] = 'FIELD(' . $this->columnQuote($column) . ', ' . $this->arrayQuote($value) . ')'; } - else if ($value === 'ASC' || $value === 'DESC') + elseif ($value === 'ASC' || $value === 'DESC') { $stack[] = $this->columnQuote($column) . ' ' . $value; } - else if (is_int($column)) + elseif (is_int($column)) { $stack[] = $this->columnQuote($value); } @@ -1032,7 +1032,7 @@ protected function columnMap($columns, &$stack) { preg_match('/([a-zA-Z0-9_]+\.)?(?[a-zA-Z0-9_]+)(?:\s*\((?[a-zA-Z0-9_]+)\))?(?:\s*\[(?(?:String|Bool|Int|Number|Object|JSON))\])?/i', $value, $key_match); - $column_key = !empty($key_match[ 'alias' ]) ? + $column_key = isset($key_match[ 'alias' ]) ? $key_match[ 'alias' ] : $key_match[ 'column' ]; From 23cf97bda0f2166125a16f9adefa75b412fe1a40 Mon Sep 17 00:00:00 2001 From: Catfan Date: Sat, 25 Nov 2017 00:05:59 +0800 Subject: [PATCH 2/2] [release] Medoo v1.5.1 --- src/Medoo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Medoo.php b/src/Medoo.php index 5fdefd1e..2b113fb9 100644 --- a/src/Medoo.php +++ b/src/Medoo.php @@ -2,7 +2,7 @@ /*! * Medoo database framework * https://medoo.in - * Version 1.5 + * Version 1.5.1 * * Copyright 2017, Angel Lai * Released under the MIT license