diff --git a/composer.json b/composer.json index 142a2c2e0..dc1e5c3d6 100644 --- a/composer.json +++ b/composer.json @@ -1,60 +1,60 @@ -{ - "name": "jenssegers/mongodb", - "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)", - "keywords": [ - "laravel", - "eloquent", - "mongodb", - "mongo", - "database", - "model", - "moloquent" - ], - "homepage": "https://github.com/jenssegers/laravel-mongodb", - "authors": [ - { - "name": "Jens Segers", - "homepage": "https://jenssegers.com/" - } - ], - "license": "MIT", - "require": { - "illuminate/support": "^5.8|^6.0", - "illuminate/container": "^5.8|^6.0", - "illuminate/database": "^5.8|^6.0", - "illuminate/events": "^5.8|^6.0", - "mongodb/mongodb": "^1.4" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0|^8.0", - "orchestra/testbench": "^3.1|^4.0", - "mockery/mockery": "^1.0", - "doctrine/dbal": "^2.5", - "phpunit/phpcov": "^6.0", - "cedx/coveralls": "^11.2" - }, - "autoload": { - "psr-0": { - "Jenssegers\\Mongodb": "src/" - } - }, - "autoload-dev": { - "classmap": [ - "tests/TestCase.php", - "tests/models", - "tests/seeds" - ] - }, - "suggest": { - "jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB", - "jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB" - }, - "extra": { - "laravel": { - "providers": [ - "Jenssegers\\Mongodb\\MongodbServiceProvider", - "Jenssegers\\Mongodb\\MongodbQueueServiceProvider" - ] - } - } -} +{ + "name": "viitech/laravel-mongodb", + "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)", + "keywords": [ + "laravel", + "eloquent", + "mongodb", + "mongo", + "database", + "model", + "moloquent" + ], + "homepage": "https://github.com/jenssegers/laravel-mongodb", + "authors": [ + { + "name": "Jens Segers", + "homepage": "https://jenssegers.com/" + } + ], + "license": "MIT", + "require": { + "illuminate/support": "^5.8|^6.0", + "illuminate/container": "^5.8|^6.0", + "illuminate/database": "^5.8|^6.0", + "illuminate/events": "^5.8|^6.0", + "mongodb/mongodb": "^1.4" + }, + "require-dev": { + "phpunit/phpunit": "^6.0|^7.0|^8.0", + "orchestra/testbench": "^3.1|^4.0", + "mockery/mockery": "^1.0", + "doctrine/dbal": "^2.5", + "phpunit/phpcov": "^6.0", + "cedx/coveralls": "^11.2" + }, + "autoload": { + "psr-0": { + "Jenssegers\\Mongodb": "src/" + } + }, + "autoload-dev": { + "classmap": [ + "tests/TestCase.php", + "tests/models", + "tests/seeds" + ] + }, + "suggest": { + "jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB", + "jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB" + }, + "extra": { + "laravel": { + "providers": [ + "Jenssegers\\Mongodb\\MongodbServiceProvider", + "Jenssegers\\Mongodb\\MongodbQueueServiceProvider" + ] + } + } +} diff --git a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php index 151ead62d..0b6915b8f 100644 --- a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php +++ b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php @@ -167,6 +167,10 @@ protected function getRelatedConstraintKey(Relation $relation) if ($relation instanceof BelongsToMany && !$this->isAcrossConnections($relation)) { return $this->model->getKeyName(); } + + if ($relation instanceof \Jenssegers\Mongodb\Relations\BelongsToMany && ! $this->isAcrossConnections($relation)) { + return $this->model->getKeyName(); + } throw new Exception(class_basename($relation) . ' is not supported for hybrid query constraints.'); }