fix conflicts

laravel · Oct 29, 2020 · aa81c2e · aa81c2e
2 parents 4b5faf5 + 0fb15ae
commit aa81c2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -1255,6 +1255,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
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.12.1';
+    const VERSION = '8.12.2';
 
     /**
      * The base path for the Laravel installation.