Merge pull request #11 from koenhoeijmakers/fix-issue-10

Fixes #10
koenhoeijmakers · Jan 25, 2019 · 279a40a · 279a40a
2 parents 1faa7e9 + de1c6d7
commit 279a40a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Scopes/JoinTranslationScope.php b/src/Scopes/JoinTranslationScope.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace KoenHoeijmakers\LaravelTranslatable\Scopes;
 
@@ -23,6 +25,6 @@ public function apply(Builder $builder, Model $model)
                 $model->getTable() . '.' . $model->getKeyName(),
                 $model->getTranslationTable() . '.' . $model->getForeignKey()
             )->where($model->getLocaleKeyName(), $model->getLocale());
-        })->select($model->getTable() . '.*', ...$model->formatTranslatableColumnsForSelect());
+        })->addSelect($model->getTable() . '.*', ...$model->formatTranslatableColumnsForSelect());
     }
 }
diff --git a/tests/Feature/TranslationTest.php b/tests/Feature/TranslationTest.php
@@ -203,6 +203,18 @@ public function testCanOverrideLocaleKey()
 
         $this->assertEquals('lang', $model->getLocaleKeyName());
     }
+
+    public function testCanAddSelect()
+    {
+        /** @var \KoenHoeijmakers\LaravelTranslatable\Tests\Feature\TestModel $model */
+        $model = TestModel::query()->create([
+            'name' => 'Monkey',
+        ]);
+
+        $result = TestModel::query()->select('test_model_translations.id AS translation_id')->first();
+
+        $this->assertEquals($model->getTranslation('en')->getKey(), $result->translation_id);
+    }
 }
 
 class TestModel extends Model