From 0fb15ae253c3a043f2c5cbf9641427a7646ea77a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 29 Oct 2020 13:57:35 -0500 Subject: [PATCH] patch --- src/Illuminate/Database/Eloquent/Builder.php | 4 ++++ src/Illuminate/Foundation/Application.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php index 8d4f5d8648de..66cd2ded455c 100755 --- a/src/Illuminate/Database/Eloquent/Builder.php +++ b/src/Illuminate/Database/Eloquent/Builder.php @@ -1169,6 +1169,10 @@ protected function createSelectWithConstraint($name) { return [explode(':', $name)[0], static function ($query) use ($name) { $query->select(array_map(static function ($column) use ($query) { + if (Str::contains($column, '.')) { + return $column; + } + return $query instanceof BelongsToMany ? $query->getRelated()->getTable().'.'.$column : $column; diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index c9e4f683f00c..ded34a078d06 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig * * @var string */ - const VERSION = '7.29.1'; + const VERSION = '7.29.2'; /** * The base path for the Laravel installation.