Skip to content

Commit 3cddaf4

Browse files
committed
Support Laravel 6.0
lazychaser#399 (comment)
1 parent 1026307 commit 3cddaf4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
"require": {
1515
"php": ">=7.2",
16-
"illuminate/support": "~5.7.0|~5.8.0|~6.0.0",
17-
"illuminate/database": "~5.7.0|~5.8.0|~6.0.0",
18-
"illuminate/events": "~5.7.0|~5.8.0|~6.0.0"
16+
"illuminate/support": "~5.7.0|~5.8.0|^6.0",
17+
"illuminate/database": "~5.7.0|~5.8.0|^6.0",
18+
"illuminate/events": "~5.7.0|~5.8.0|^6.0"
1919
},
2020

2121
"autoload": {

src/QueryBuilder.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,12 @@ protected function getDuplicatesQuery()
723723

724724
$waFirst = $this->query->getGrammar()->wrapTable($firstAlias);
725725
$waSecond = $this->query->getGrammar()->wrapTable($secondAlias);
726-
$pk = $this->model->getKeyName();
727726

728727
$query = $this->model
729728
->newNestedSetQuery($firstAlias)
730729
->toBase()
731730
->from($this->query->raw("{$table} as {$waFirst}, {$table} {$waSecond}"))
732-
->whereRaw("{$waFirst}.{$keyName} < {$waSecond}.{$keyName}")
731+
->whereRaw("{$waFirst}.id < {$waSecond}.id")
733732
->whereNested(function (BaseQueryBuilder $inner) use ($waFirst, $waSecond) {
734733
list($lft, $rgt) = $this->wrappedColumns();
735734

0 commit comments

Comments
 (0)