Skip to content

Commit a17af14

Browse files
adminfrisoFriso Modderman
and
Friso Modderman
authored
Fix: ambigious queries when adding other tables to the query builder (#887)
Co-authored-by: Friso Modderman <[email protected]>
1 parent 13cb646 commit a17af14

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Engines/DatabaseEngine.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function paginateUsingDatabase(Builder $builder, $perPage, $pageName, $pa
9292
}
9393
})
9494
->when(! $this->getFullTextColumns($builder), function ($query) use ($builder) {
95-
$query->orderBy($builder->model->getScoutKeyName(), 'desc');
95+
$query->orderBy($builder->model->getTable().'.'.$builder->model->getScoutKeyName(), 'desc');
9696
})
9797
->paginate($perPage, ['*'], $pageName, $page);
9898
}
@@ -127,7 +127,7 @@ public function simplePaginateUsingDatabase(Builder $builder, $perPage, $pageNam
127127
}
128128
})
129129
->when(! $this->getFullTextColumns($builder), function ($query) use ($builder) {
130-
$query->orderBy($builder->model->getScoutKeyName(), 'desc');
130+
$query->orderBy($builder->model->getTable().'.'.$builder->model->getScoutKeyName(), 'desc');
131131
})
132132
->simplePaginate($perPage, ['*'], $pageName, $page);
133133
}
@@ -152,7 +152,7 @@ protected function searchModels(Builder $builder, $page = null, $perPage = null)
152152
}
153153
})
154154
->when(! $this->getFullTextColumns($builder), function ($query) use ($builder) {
155-
$query->orderBy($builder->model->getScoutKeyName(), 'desc');
155+
$query->orderBy($builder->model->getTable().'.'.$builder->model->getScoutKeyName(), 'desc');
156156
})
157157
->get();
158158
}

0 commit comments

Comments
 (0)