diff --git a/src/Relations/HasMany.php b/src/Relations/HasMany.php index b10426635..933a87b54 100644 --- a/src/Relations/HasMany.php +++ b/src/Relations/HasMany.php @@ -17,15 +17,6 @@ public function getForeignKeyName() return $this->foreignKey; } - /** - * Get the plain foreign key. - * @return string - */ - public function getPlainForeignKey() - { - return $this->getForeignKeyName(); - } - /** * Get the key for comparing against the parent key in "has" query. * @return string @@ -45,35 +36,6 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery, return $query->select($foreignKey)->where($foreignKey, 'exists', true); } - /** - * Add the constraints for a relationship count query. - * @param Builder $query - * @param Builder $parent - * @return Builder - */ - public function getRelationCountQuery(Builder $query, Builder $parent) - { - $foreignKey = $this->getHasCompareKey(); - - return $query->select($foreignKey)->where($foreignKey, 'exists', true); - } - - /** - * Add the constraints for a relationship query. - * @param Builder $query - * @param Builder $parent - * @param array|mixed $columns - * @return Builder - */ - public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*']) - { - $query->select($columns); - - $key = $this->wrap($this->getQualifiedParentKeyName()); - - return $query->where($this->getHasCompareKey(), 'exists', true); - } - /** * Get the name of the "where in" method for eager loading. * @param \Illuminate\Database\Eloquent\Model $model diff --git a/src/Relations/HasOne.php b/src/Relations/HasOne.php index 91741c297..f2a5a9b33 100644 --- a/src/Relations/HasOne.php +++ b/src/Relations/HasOne.php @@ -26,15 +26,6 @@ public function getHasCompareKey() return $this->getForeignKeyName(); } - /** - * Get the plain foreign key. - * @return string - */ - public function getPlainForeignKey() - { - return $this->getForeignKeyName(); - } - /** * @inheritdoc */ @@ -45,35 +36,6 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery, return $query->select($foreignKey)->where($foreignKey, 'exists', true); } - /** - * Add the constraints for a relationship count query. - * @param Builder $query - * @param Builder $parent - * @return Builder - */ - public function getRelationCountQuery(Builder $query, Builder $parent) - { - $foreignKey = $this->getForeignKeyName(); - - return $query->select($foreignKey)->where($foreignKey, 'exists', true); - } - - /** - * Add the constraints for a relationship query. - * @param Builder $query - * @param Builder $parent - * @param array|mixed $columns - * @return Builder - */ - public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*']) - { - $query->select($columns); - - $key = $this->wrap($this->getQualifiedParentKeyName()); - - return $query->where($this->getForeignKeyName(), 'exists', true); - } - /** * Get the name of the "where in" method for eager loading. * @param \Illuminate\Database\Eloquent\Model $model diff --git a/tests/QueueTest.php b/tests/QueueTest.php index aa01d0791..a0bcbc17d 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -39,6 +39,7 @@ public function testQueueJobLifeCycle(): void 'job' => 'test', 'maxTries' => null, 'maxExceptions' => null, + 'failOnTimeout' => false, 'backoff' => null, 'timeout' => null, 'data' => ['action' => 'QueueJobLifeCycle'],