From ae4e5901e2f515b5d3dbfc46a86212e5e9d55e76 Mon Sep 17 00:00:00 2001 From: Catfan Date: Fri, 1 Dec 2017 22:29:26 +0800 Subject: [PATCH 1/2] [fix] Incorrect column alias and type match #678 --- src/Medoo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Medoo.php b/src/Medoo.php index 2b113fb9..4a23d6ac 100644 --- a/src/Medoo.php +++ b/src/Medoo.php @@ -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 = isset($key_match[ 'alias' ]) ? + $column_key = !empty($key_match[ 'alias' ]) ? $key_match[ 'alias' ] : $key_match[ 'column' ]; From aa451b27da07b2e1337dd3d6c0823030876bfd12 Mon Sep 17 00:00:00 2001 From: Catfan Date: Fri, 1 Dec 2017 22:30:14 +0800 Subject: [PATCH 2/2] [release] Medoo 1.5.2 --- src/Medoo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Medoo.php b/src/Medoo.php index 4a23d6ac..8a5322e7 100644 --- a/src/Medoo.php +++ b/src/Medoo.php @@ -2,7 +2,7 @@ /*! * Medoo database framework * https://medoo.in - * Version 1.5.1 + * Version 1.5.2 * * Copyright 2017, Angel Lai * Released under the MIT license