Merge pull request #8 from chriscarpenter12/master

Fix not unique table/alias

Author: markusjwetzel

src/VersioningScope.php

@@ -33,25 +33,6 @@ public function apply(Builder $builder, Model $model)
         $this->extend($builder);
     }
 
-    /**
-     * Remove the scope from the given Eloquent query builder.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return void
-     */
-    public function remove(Builder $builder, Model $model)
-    {
-        $table = $model->getVersionTable();
-
-        $query = $builder->getQuery();
-
-        $query->joins = collect($query->joins)->reject(function($join) use ($table)
-        {
-            return $this->isVersionJoinConstraint($join, $table);
-        })->values()->all();
-    }
-
     /**
      * Extend the query builder with the needed functions.
      *
@@ -77,9 +58,7 @@ protected function addVersion(Builder $builder)
         $builder->macro('version', function(Builder $builder, $version) {
             $model = $builder->getModel();
 
-            $this->remove($builder, $builder->getModel());
-
-            $builder->join($model->getVersionTable(), function($join) use ($model, $version) {
+            $builder->withoutGlobalScope($this)->join($model->getVersionTable(), function($join) use ($model, $version) {
                 $join->on($model->getQualifiedKeyName(), '=', $model->getQualifiedVersionKeyName());
                 $join->where($model->getQualifiedVersionColumn(), '=', $version);
             });
@@ -99,26 +78,12 @@ protected function addAllVersions(Builder $builder)
         $builder->macro('allVersions', function(Builder $builder) {
             $model = $builder->getModel();
 
-            $this->remove($builder, $builder->getModel());
-
-            $builder->join($model->getVersionTable(), function($join) use ($model) {
+            $builder->withoutGlobalScope($this)->join($model->getVersionTable(), function($join) use ($model) {
                 $join->on($model->getQualifiedKeyName(), '=', $model->getQualifiedVersionKeyName());
             });
 
             return $builder;
         });
     }
 
-    /**
-     * Determine if the given join clause is a version constraint.
-     *
-     * @param  \Illuminate\Database\Query\JoinClause   $join
-     * @param  string  $column
-     * @return bool
-     */
-    protected function isVersionJoinConstraint(JoinClause $join, $table)
-    {
-        return $join->type == 'inner' && $join->table == $table;
-    }
-
 }