Merge branch 'master' of github.com:laraplus/translatable

.travis.yml

@@ -0,0 +1,11 @@
+language: php
+
+php:
+  - 5.6
+  - 7.0
+  - hhvm
+
+before_script:
+  composer install --dev --prefer-source --no-interaction
+
+script: vendor/bin/phpunit

README.md

@@ -1,5 +1,7 @@
 # Translatable Eloquent models (Laravel 5.2+)
 
+[![Build Status](https://travis-ci.org/laraplus/translatable.svg)](https://travis-ci.org/laraplus/translatable)
+
 This package provides a powerful and transparent way of managing multilingual models in Eloquent.
 
 It makes use of Laravel's 5.2 enhanced global scopes to join translated attributes to every query rather than utilizing

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">=5.5.0",
-    "illuminate/database": "~5.2@dev"
+    "illuminate/database": "~5.2"
   },
   "require-dev": {
     "phpunit/phpunit": "5.1.*"

src/Builder.php

@@ -140,8 +140,8 @@ protected function updateI18n(array $values)
         }
 
         $updated = $this->i18nQuery()
-            ->where($this->model->getForeignKey(), $this->model->getKey())
-            ->where($this->model->getLocaleKey(), $this->model->getLocale())
+            ->whereOriginal($this->model->getForeignKey(), $this->model->getKey())
+            ->whereOriginal($this->model->getLocaleKey(), $this->model->getLocale())
             ->update($values);
 
         if(!$updated) {

src/QueryBuilder.php

@@ -53,6 +53,22 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         return parent::where($column, $operator, $value, $boolean);
     }
 
+    /**
+     * Add a where clause to the query and don't modify it for i18n.
+     *
+     * @param  string|\Closure  $column
+     * @param  string  $operator
+     * @param  mixed   $value
+     * @param  string  $boolean
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function whereOriginal($column, $operator = null, $value = null, $boolean = 'and')
+    {
+        return parent::where($column, $operator, $value, $boolean);
+    }
+
     /**
      * Add a translation where clause to the query.
      *

tests/TestCase.php

@@ -11,7 +11,7 @@ public function setUp()
 
         $capsule->addConnection([
             'driver' => 'sqlite',
-            'database' => __DIR__.'/stubs/database.sqlite',
+            'database' => ':memory:',
             'prefix' => ''
         ]);