Skip to content

L
laravel-mongodb
Unverified Commit 78d7cbdd authored by Manan Jadhav's avatar Manan Jadhav Committed by GitHub
Browse files
Options

Merge pull request #1 from jenssegers/master 

merge from upstream
parents 1d2807b4 a8918aca
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1468 additions and 967 deletions
.editorconfig 0 → 100644
View file @ 78d7cbdd
root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
\ No newline at end of file
.github/FUNDING.yml 0 → 100644
View file @ 78d7cbdd
github: jenssegers
open_collective: laravel-mongodb
.gitignore
View file @ 78d7cbdd
...@@ -7,3 +7,4 @@ composer.lock ...@@ -7,3 +7,4 @@ composer.lock
*.sublime-workspace *.sublime-workspace
*.project *.project
.idea/ .idea/
.phpunit.result.cache
.travis.yml
View file @ 78d7cbdd
sudo: required language: minimal
dist: trusty
language: php matrix:
php: include:
- "7.2" - name: "7.1"
- "7.1" env: PHP_VERSION=7.1
- name: "7.2"
env: PHP_VERSION=7.2
- name: "7.3"
env: PHP_VERSION=7.3
services: services:
- docker - docker
cache:
directories:
- $HOME/.composer/cache
install: install:
- docker version - docker version
- sudo pip install docker-compose - sudo pip install docker-compose
- docker-compose version - docker-compose version
- sed -i -e "s/php:cli/php:${TRAVIS_PHP_VERSION}-cli/g" Dockerfile - docker-compose build --build-arg PHP_VERSION=${PHP_VERSION}
- cat Dockerfile - docker-compose run --rm tests composer install --no-interaction
- docker-compose build
script: script:
- docker-compose up --exit-code-from php - docker-compose run --rm tests ./vendor/bin/phpunit --coverage-clover ./clover.xml
Dockerfile
View file @ 78d7cbdd
FROM php:cli ARG PHP_VERSION=7.2
ARG COMPOSER_VERSION=1.8
RUN pecl install xdebug FROM composer:${COMPOSER_VERSION}
FROM php:${PHP_VERSION}-cli
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y autoconf pkg-config libssl-dev git && \ apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev && \
pecl install mongodb git zlib1g-dev && docker-php-ext-enable mongodb && \ pecl install mongodb && docker-php-ext-enable mongodb && \
docker-php-ext-install -j$(nproc) pdo pdo_mysql zip && docker-php-ext-enable xdebug pecl install xdebug && docker-php-ext-enable xdebug && \
docker-php-ext-install -j$(nproc) pdo_mysql zip
RUN curl -sS https://getcomposer.org/installer | php \ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
&& mv composer.phar /usr/local/bin/ \
&& ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" WORKDIR /code
README.md
View file @ 78d7cbdd
...@@ -43,6 +43,9 @@ composer require jenssegers/mongodb ...@@ -43,6 +43,9 @@ composer require jenssegers/mongodb
5.4.x | 3.2.x 5.4.x | 3.2.x
5.5.x | 3.3.x 5.5.x | 3.3.x
5.6.x | 3.4.x 5.6.x | 3.4.x
5.7.x | 3.4.x
5.8.x | 3.5.x
6.0.x | 3.6.x
And add the service provider in `config/app.php`: And add the service provider in `config/app.php`:
...@@ -63,8 +66,10 @@ The service provider will register a mongodb database extension with the origina ...@@ -63,8 +66,10 @@ The service provider will register a mongodb database extension with the origina
For usage outside Laravel, check out the [Capsule manager](https://github.com/illuminate/database/blob/master/README.md) and add: For usage outside Laravel, check out the [Capsule manager](https://github.com/illuminate/database/blob/master/README.md) and add:
```php ```php
$capsule->getDatabaseManager()->extend('mongodb', function($config) $capsule->getDatabaseManager()->extend('mongodb', function($config, $name)
{ {
$config['name'] = $name;
return new Jenssegers\Mongodb\Connection($config); return new Jenssegers\Mongodb\Connection($config);
}); });
``` ```
...@@ -298,7 +303,7 @@ This service provider will slightly modify the internal DatabaseReminderReposito ...@@ -298,7 +303,7 @@ This service provider will slightly modify the internal DatabaseReminderReposito
### Queues ### Queues
If you want to use MongoDB as your database backend, change the the driver in `config/queue.php`: If you want to use MongoDB as your database backend, change the driver in `config/queue.php`:
```php ```php
'connections' => [ 'connections' => [
...@@ -480,7 +485,7 @@ User::where('name', 'Jaques')->decrement('weight', 50); ...@@ -480,7 +485,7 @@ User::where('name', 'Jaques')->decrement('weight', 50);
The number of updated objects is returned: The number of updated objects is returned:
```php ```php
$count = User->increment('age'); $count = User::increment('age');
``` ```
You may also specify additional columns to update: You may also specify additional columns to update:
...@@ -545,13 +550,13 @@ User::where('name', 'regex', new \MongoDB\BSON\Regex("/.*doe/i"))->get(); ...@@ -545,13 +550,13 @@ User::where('name', 'regex', new \MongoDB\BSON\Regex("/.*doe/i"))->get();
**NOTE:** you can also use the Laravel regexp operations. These are a bit more flexible and will automatically convert your regular expression string to a MongoDB\BSON\Regex object. **NOTE:** you can also use the Laravel regexp operations. These are a bit more flexible and will automatically convert your regular expression string to a MongoDB\BSON\Regex object.
```php ```php
User::where('name', 'regexp', '/.*doe/i'))->get(); User::where('name', 'regexp', '/.*doe/i')->get();
``` ```
And the inverse: And the inverse:
```php ```php
User::where('name', 'not regexp', '/.*doe/i'))->get(); User::where('name', 'not regexp', '/.*doe/i')->get();
``` ```
**Type** **Type**
...@@ -689,7 +694,7 @@ For more information about model manipulation, check http://laravel.com/docs/elo ...@@ -689,7 +694,7 @@ For more information about model manipulation, check http://laravel.com/docs/elo
### Dates ### Dates
Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database. If you wish to use this functionality on non-default date fields you will need to manually specify them as described here: http://laravel.com/docs/eloquent#date-mutators Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database. If you wish to use this functionality on non-default date fields, you will need to manually specify them as described here: http://laravel.com/docs/eloquent#date-mutators
Example: Example:
...@@ -787,7 +792,7 @@ class User extends Eloquent { ...@@ -787,7 +792,7 @@ class User extends Eloquent {
} }
``` ```
You access the embedded models through the dynamic property: You can access the embedded models through the dynamic property:
```php ```php
$books = User::first()->books; $books = User::first()->books;
...@@ -849,7 +854,7 @@ Embedded relations will return a Collection of embedded items instead of a query ...@@ -849,7 +854,7 @@ Embedded relations will return a Collection of embedded items instead of a query
### EmbedsOne Relations ### EmbedsOne Relations
The embedsOne relation is similar to the EmbedsMany relation, but only embeds a single model. The embedsOne relation is similar to the embedsMany relation, but only embeds a single model.
```php ```php
use Jenssegers\Mongodb\Eloquent\Model as Eloquent; use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
...@@ -864,7 +869,7 @@ class Book extends Eloquent { ...@@ -864,7 +869,7 @@ class Book extends Eloquent {
} }
``` ```
You access the embedded models through the dynamic property: You can access the embedded models through the dynamic property:
```php ```php
$author = Book::first()->author; $author = Book::first()->author;
...@@ -1014,7 +1019,7 @@ DB::collection('items')->paginate($limit, $projections); ...@@ -1014,7 +1019,7 @@ DB::collection('items')->paginate($limit, $projections);
**Push** **Push**
Add an items to an array. Add items to an array.
```php ```php
DB::collection('users')->where('name', 'John')->push('items', 'boots'); DB::collection('users')->where('name', 'John')->push('items', 'boots');
......
composer.json
View file @ 78d7cbdd
{ {
"name": "jenssegers/mongodb", "name": "jenssegers/mongodb",
"description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)", "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
"keywords": ["laravel","eloquent","mongodb","mongo","database","model","moloquent"], "keywords": [
"homepage": "https://github.com/jenssegers/laravel-mongodb", "laravel",
"authors": [ "eloquent",
{ "mongodb",
"name": "Jens Segers", "mongo",
"homepage": "https://jenssegers.com" "database",
} "model",
], "moloquent"
"license" : "MIT", ],
"require": { "homepage": "https://github.com/jenssegers/laravel-mongodb",
"illuminate/support": "^5.6", "authors": [
"illuminate/container": "^5.6", {
"illuminate/database": "^5.6", "name": "Jens Segers",
"illuminate/events": "^5.6", "homepage": "https://jenssegers.com"
"mongodb/mongodb": "^1.0.0" }
}, ],
"require-dev": { "license": "MIT",
"phpunit/phpunit": "^6.0|^7.0", "require": {
"orchestra/testbench": "^3.1", "illuminate/support": "^5.8|^6.0",
"mockery/mockery": "^1.0", "illuminate/container": "^5.8|^6.0",
"satooshi/php-coveralls": "^2.0", "illuminate/database": "^5.8|^6.0",
"doctrine/dbal": "^2.5" "illuminate/events": "^5.8|^6.0",
}, "mongodb/mongodb": "^1.4"
"autoload": { },
"psr-0": { "require-dev": {
"Jenssegers\\Mongodb": "src/" "phpunit/phpunit": "^6.0|^7.0|^8.0",
} "orchestra/testbench": "^3.1|^4.0",
}, "mockery/mockery": "^1.0",
"autoload-dev": { "satooshi/php-coveralls": "^2.0",
"classmap": [ "doctrine/dbal": "^2.5"
"tests/TestCase.php", },
"tests/models", "autoload": {
"tests/seeds" "psr-0": {
] "Jenssegers\\Mongodb": "src/"
}, }
"suggest": { },
"jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB", "autoload-dev": {
"jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB" "classmap": [
}, "tests/TestCase.php",
"extra": { "tests/models",
"laravel": { "tests/seeds"
"providers": [ ]
"Jenssegers\\Mongodb\\MongodbServiceProvider", },
"Jenssegers\\Mongodb\\MongodbQueueServiceProvider" "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"
]
}
}
}
docker-compose.yml
View file @ 78d7cbdd
version: '3' version: '3'
services: services:
tests:
php: container_name: tests
container_name: php
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
volumes: volumes:
- .:/code - .:/code
working_dir: /code working_dir: /code
command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit"
depends_on: depends_on:
- mysql
- mongodb - mongodb
- mysql
mysql: mysql:
container_name: mysql container_name: mysql
image: mysql image: mysql:5.7
environment: environment:
MYSQL_ROOT_PASSWORD: MYSQL_ROOT_PASSWORD:
MYSQL_DATABASE: unittest MYSQL_DATABASE: unittest
...@@ -28,5 +26,7 @@ services: ...@@ -28,5 +26,7 @@ services:
mongodb: mongodb:
container_name: mongodb container_name: mongodb
image: mongo image: mongo
ports:
- 27017:27017
logging: logging:
driver: none driver: none
phpunit.xml.dist
View file @ 78d7cbdd
...@@ -7,42 +7,46 @@ ...@@ -7,42 +7,46 @@
convertNoticesToExceptions="true" convertNoticesToExceptions="true"
convertWarningsToExceptions="true" convertWarningsToExceptions="true"
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false">
syntaxCheck="false"
verbose="true"
>
<testsuites> <testsuites>
<testsuite name="all"> <testsuite name="all">
<directory>tests/</directory> <directory>tests/</directory>
<exclude>tests/MysqlRelationsTest.php</exclude>
</testsuite> </testsuite>
<testsuite name="schema"> <testsuite name="schema">
<directory>tests/SchemaTest.php</directory> <file>tests/SchemaTest.php</file>
</testsuite> </testsuite>
<testsuite name="seeder"> <testsuite name="seeder">
<directory>tests/SeederTest.php</directory> <file>tests/SeederTest.php</file>
</testsuite> </testsuite>
<testsuite name="cache"> <testsuite name="cache">
<directory>tests/CacheTest.php</directory> <file>tests/CacheTest.php</file>
</testsuite> </testsuite>
<testsuite name="builder"> <testsuite name="builder">
<directory>tests/QueryBuilderTest.php</directory> <file>tests/QueryBuilderTest.php</file>
<directory>tests/QueryTest.php</directory> <file>tests/QueryTest.php</file>
</testsuite> </testsuite>
<testsuite name="model"> <testsuite name="model">
<directory>tests/ModelTest.php</directory> <file>tests/ModelTest.php</file>
<directory>tests/RelationsTest.php</directory> <file>tests/RelationsTest.php</file>
</testsuite> </testsuite>
<testsuite name="relations"> <testsuite name="relations">
<directory>tests/RelationsTest.php</directory> <file>tests/RelationsTest.php</file>
<directory>tests/EmbeddedRelationsTest.php</directory> <file>tests/EmbeddedRelationsTest.php</file>
</testsuite> </testsuite>
<testsuite name="mysqlrelations"> <testsuite name="mysqlrelations">
<directory>tests/RelationsTest.php</directory> <file>tests/RelationsTest.php</file>
<directory>tests/MysqlRelationsTest.php</directory>
</testsuite> </testsuite>
<testsuite name="validation"> <testsuite name="validation">
<directory>tests/ValidationTest.php</directory> <file>tests/ValidationTest.php</file>
</testsuite> </testsuite>
</testsuites> </testsuites>
<php>
<env name="MONGO_HOST" value="mongodb"/>
<env name="MONGO_DATABASE" value="unittest"/>
<env name="MONGO_PORT" value="27017"/>
<env name="MYSQL_HOST" value="mysql"/>
<env name="MYSQL_DATABASE" value="unittest"/>
<env name="MYSQL_USERNAME" value="root"/>
<env name="QUEUE_CONNECTION" value="database"/>
</php>
</phpunit> </phpunit>
src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php
View file @ 78d7cbdd
...@@ -14,7 +14,11 @@ class DatabaseTokenRepository extends BaseDatabaseTokenRepository ...@@ -14,7 +14,11 @@ class DatabaseTokenRepository extends BaseDatabaseTokenRepository
*/ */
protected function getPayload($email, $token) protected function getPayload($email, $token)
{ {
return ['email' => $email, 'token' => $this->hasher->make($token), 'created_at' => new UTCDateTime(time() * 1000)]; return [
'email' => $email,
'token' => $this->hasher->make($token),
'created_at' => new UTCDateTime(time() * 1000),
];
} }
/** /**
...@@ -27,7 +31,7 @@ class DatabaseTokenRepository extends BaseDatabaseTokenRepository ...@@ -27,7 +31,7 @@ class DatabaseTokenRepository extends BaseDatabaseTokenRepository
$date = $createdAt->toDateTime(); $date = $createdAt->toDateTime();
$date->setTimezone(new DateTimeZone(date_default_timezone_get())); $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
$createdAt = $date->format('Y-m-d H:i:s'); $createdAt = $date->format('Y-m-d H:i:s');
} elseif (is_array($createdAt) and isset($createdAt['date'])) { } elseif (is_array($createdAt) && isset($createdAt['date'])) {
$date = new DateTime($createdAt['date'], new DateTimeZone(isset($createdAt['timezone']) ? $createdAt['timezone'] : 'UTC')); $date = new DateTime($createdAt['date'], new DateTimeZone(isset($createdAt['timezone']) ? $createdAt['timezone'] : 'UTC'));
$date->setTimezone(new DateTimeZone(date_default_timezone_get())); $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
$createdAt = $date->format('Y-m-d H:i:s'); $createdAt = $date->format('Y-m-d H:i:s');
......
src/Jenssegers/Mongodb/Auth/PasswordBrokerManager.php
View file @ 78d7cbdd
...@@ -11,14 +11,6 @@ class PasswordBrokerManager extends BasePasswordBrokerManager ...@@ -11,14 +11,6 @@ class PasswordBrokerManager extends BasePasswordBrokerManager
*/ */
protected function createTokenRepository(array $config) protected function createTokenRepository(array $config)
{ {
$key = $this->app['config']['app.key'];
if (\Illuminate\Support\Str::startsWith($key, 'base64:')) {
$key = base64_decode(substr($key, 7));
}
$connection = isset($config['connection']) ? $config['connection'] : null;
return new DatabaseTokenRepository( return new DatabaseTokenRepository(
$this->app['db']->connection(), $this->app['db']->connection(),
$this->app['hash'], $this->app['hash'],
......
src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php
View file @ 78d7cbdd
...@@ -8,7 +8,6 @@ class PasswordResetServiceProvider extends BasePasswordResetServiceProvider ...@@ -8,7 +8,6 @@ class PasswordResetServiceProvider extends BasePasswordResetServiceProvider
{ {
/** /**
* Register the token repository implementation. * Register the token repository implementation.
*
* @return void * @return void
*/ */
protected function registerTokenRepository() protected function registerTokenRepository()
......
src/Jenssegers/Mongodb/Collection.php
View file @ 78d7cbdd
...@@ -10,14 +10,12 @@ class Collection ...@@ -10,14 +10,12 @@ class Collection
{ {
/** /**
* The connection instance. * The connection instance.
*
* @var Connection * @var Connection
*/ */
protected $connection; protected $connection;
/** /**
* The MongoCollection instance.. * The MongoCollection instance..
*
* @var MongoCollection * @var MongoCollection
*/ */
protected $collection; protected $collection;
...@@ -34,9 +32,8 @@ class Collection ...@@ -34,9 +32,8 @@ class Collection
/** /**
* Handle dynamic method calls. * Handle dynamic method calls.
* * @param string $method
* @param string $method * @param array $parameters
* @param array $parameters
* @return mixed * @return mixed
*/ */
public function __call($method, $parameters) public function __call($method, $parameters)
......
src/Jenssegers/Mongodb/Connection.php
View file @ 78d7cbdd
...@@ -10,22 +10,19 @@ class Connection extends BaseConnection ...@@ -10,22 +10,19 @@ class Connection extends BaseConnection
{ {
/** /**
* The MongoDB database handler. * The MongoDB database handler.
*
* @var \MongoDB\Database * @var \MongoDB\Database
*/ */
protected $db; protected $db;
/** /**
* The MongoDB connection handler. * The MongoDB connection handler.
*
* @var \MongoDB\Client * @var \MongoDB\Client
*/ */
protected $connection; protected $connection;
/** /**
* Create a new database connection instance. * Create a new database connection instance.
* * @param array $config
* @param array $config
*/ */
public function __construct(array $config) public function __construct(array $config)
{ {
...@@ -52,8 +49,7 @@ class Connection extends BaseConnection ...@@ -52,8 +49,7 @@ class Connection extends BaseConnection
/** /**
* Begin a fluent query against a database collection. * Begin a fluent query against a database collection.
* * @param string $collection
* @param string $collection
* @return Query\Builder * @return Query\Builder
*/ */
public function collection($collection) public function collection($collection)
...@@ -65,19 +61,18 @@ class Connection extends BaseConnection ...@@ -65,19 +61,18 @@ class Connection extends BaseConnection
/** /**
* Begin a fluent query against a database collection. * Begin a fluent query against a database collection.
* * @param string $table
* @param string $table * @param string|null $as
* @return Query\Builder * @return Query\Builder
*/ */
public function table($table) public function table($table, $as = null)
{ {
return $this->collection($table); return $this->collection($table);
} }
/** /**
* Get a MongoDB collection. * Get a MongoDB collection.
* * @param string $name
* @param string $name
* @return Collection * @return Collection
*/ */
public function getCollection($name) public function getCollection($name)
...@@ -95,7 +90,6 @@ class Connection extends BaseConnection ...@@ -95,7 +90,6 @@ class Connection extends BaseConnection
/** /**
* Get the MongoDB database object. * Get the MongoDB database object.
*
* @return \MongoDB\Database * @return \MongoDB\Database
*/ */
public function getMongoDB() public function getMongoDB()
...@@ -105,7 +99,6 @@ class Connection extends BaseConnection ...@@ -105,7 +99,6 @@ class Connection extends BaseConnection
/** /**
* return MongoDB object. * return MongoDB object.
*
* @return \MongoDB\Client * @return \MongoDB\Client
*/ */
public function getMongoClient() public function getMongoClient()
...@@ -113,12 +106,19 @@ class Connection extends BaseConnection ...@@ -113,12 +106,19 @@ class Connection extends BaseConnection
return $this->connection; return $this->connection;
} }
/**
* {@inheritdoc}
*/
public function getDatabaseName()
{
return $this->getMongoDB()->getDatabaseName();
}
/** /**
* Create a new MongoDB connection. * Create a new MongoDB connection.
* * @param string $dsn
* @param string $dsn * @param array $config
* @param array $config * @param array $options
* @param array $options
* @return \MongoDB\Client * @return \MongoDB\Client
*/ */
protected function createConnection($dsn, array $config, array $options) protected function createConnection($dsn, array $config, array $options)
...@@ -151,19 +151,17 @@ class Connection extends BaseConnection ...@@ -151,19 +151,17 @@ class Connection extends BaseConnection
/** /**
* Determine if the given configuration array has a dsn string. * Determine if the given configuration array has a dsn string.
* * @param array $config
* @param array $config
* @return bool * @return bool
*/ */
protected function hasDsnString(array $config) protected function hasDsnString(array $config)
{ {
return isset($config['dsn']) && ! empty($config['dsn']); return isset($config['dsn']) && !empty($config['dsn']);
} }
/** /**
* Get the DSN string form configuration. * Get the DSN string form configuration.
* * @param array $config
* @param array $config
* @return string * @return string
*/ */
protected function getDsnString(array $config) protected function getDsnString(array $config)
...@@ -173,8 +171,7 @@ class Connection extends BaseConnection ...@@ -173,8 +171,7 @@ class Connection extends BaseConnection
/** /**
* Get the DSN string for a host / port configuration. * Get the DSN string for a host / port configuration.
* * @param array $config
* @param array $config
* @return string * @return string
*/ */
protected function getHostDsn(array $config) protected function getHostDsn(array $config)
...@@ -197,8 +194,7 @@ class Connection extends BaseConnection ...@@ -197,8 +194,7 @@ class Connection extends BaseConnection
/** /**
* Create a DSN string from a configuration. * Create a DSN string from a configuration.
* * @param array $config
* @param array $config
* @return string * @return string
*/ */
protected function getDsn(array $config) protected function getDsn(array $config)
...@@ -250,9 +246,8 @@ class Connection extends BaseConnection ...@@ -250,9 +246,8 @@ class Connection extends BaseConnection
/** /**
* Dynamically pass methods to the connection. * Dynamically pass methods to the connection.
* * @param string $method
* @param string $method * @param array $parameters
* @param array $parameters
* @return mixed * @return mixed
*/ */
public function __call($method, $parameters) public function __call($method, $parameters)
......
src/Jenssegers/Mongodb/Eloquent/Builder.php
View file @ 78d7cbdd
...@@ -13,7 +13,6 @@ class Builder extends EloquentBuilder ...@@ -13,7 +13,6 @@ class Builder extends EloquentBuilder
/** /**
* The methods that should be returned from query builder. * The methods that should be returned from query builder.
*
* @var array * @var array
*/ */
protected $passthru = [ protected $passthru = [
...@@ -44,7 +43,7 @@ class Builder extends EloquentBuilder ...@@ -44,7 +43,7 @@ class Builder extends EloquentBuilder
return 1; return 1;
} }
return $this->query->update($this->addUpdatedAtColumn($values), $options); return $this->toBase()->update($this->addUpdatedAtColumn($values), $options);
} }
/** /**
...@@ -177,6 +176,29 @@ class Builder extends EloquentBuilder ...@@ -177,6 +176,29 @@ class Builder extends EloquentBuilder
return $results; return $results;
} }
/**
* Add the "updated at" column to an array of values.
* TODO Remove if https://github.com/laravel/framework/commit/6484744326531829341e1ff886cc9b628b20d73e
* wiil be reverted
* Issue in laravel frawework https://github.com/laravel/framework/issues/27791
* @param array $values
* @return array
*/
protected function addUpdatedAtColumn(array $values)
{
if (!$this->model->usesTimestamps() || $this->model->getUpdatedAtColumn() === null) {
return $values;
}
$column = $this->model->getUpdatedAtColumn();
$values = array_merge(
[$column => $this->model->freshTimestampString()],
$values
);
return $values;
}
/** /**
* @return \Illuminate\Database\ConnectionInterface * @return \Illuminate\Database\ConnectionInterface
*/ */
......
src/Jenssegers/Mongodb/Eloquent/EmbedsRelations.php
View file @ 78d7cbdd
...@@ -10,11 +10,10 @@ trait EmbedsRelations ...@@ -10,11 +10,10 @@ trait EmbedsRelations
{ {
/** /**
* Define an embedded one-to-many relationship. * Define an embedded one-to-many relationship.
* * @param string $related
* @param string $related * @param string $localKey
* @param string $localKey * @param string $foreignKey
* @param string $foreignKey * @param string $relation
* @param string $relation
* @return \Jenssegers\Mongodb\Relations\EmbedsMany * @return \Jenssegers\Mongodb\Relations\EmbedsMany
*/ */
protected function embedsMany($related, $localKey = null, $foreignKey = null, $relation = null) protected function embedsMany($related, $localKey = null, $foreignKey = null, $relation = null)
...@@ -22,17 +21,17 @@ trait EmbedsRelations ...@@ -22,17 +21,17 @@ trait EmbedsRelations
// If no relation name was given, we will use this debug backtrace to extract // If no relation name was given, we will use this debug backtrace to extract
// the calling method's name and use that as the relationship name as most // the calling method's name and use that as the relationship name as most
// of the time this will be what we desire to use for the relationships. // of the time this will be what we desire to use for the relationships.
if (is_null($relation)) { if ($relation === null) {
list(, $caller) = debug_backtrace(false); list(, $caller) = debug_backtrace(false);
$relation = $caller['function']; $relation = $caller['function'];
} }
if (is_null($localKey)) { if ($localKey === null) {
$localKey = $relation; $localKey = $relation;
} }
if (is_null($foreignKey)) { if ($foreignKey === null) {
$foreignKey = Str::snake(class_basename($this)); $foreignKey = Str::snake(class_basename($this));
} }
...@@ -45,11 +44,10 @@ trait EmbedsRelations ...@@ -45,11 +44,10 @@ trait EmbedsRelations
/** /**
* Define an embedded one-to-many relationship. * Define an embedded one-to-many relationship.
* * @param string $related
* @param string $related * @param string $localKey
* @param string $localKey * @param string $foreignKey
* @param string $foreignKey * @param string $relation
* @param string $relation
* @return \Jenssegers\Mongodb\Relations\EmbedsOne * @return \Jenssegers\Mongodb\Relations\EmbedsOne
*/ */
protected function embedsOne($related, $localKey = null, $foreignKey = null, $relation = null) protected function embedsOne($related, $localKey = null, $foreignKey = null, $relation = null)
...@@ -57,17 +55,17 @@ trait EmbedsRelations ...@@ -57,17 +55,17 @@ trait EmbedsRelations
// If no relation name was given, we will use this debug backtrace to extract // If no relation name was given, we will use this debug backtrace to extract
// the calling method's name and use that as the relationship name as most // the calling method's name and use that as the relationship name as most
// of the time this will be what we desire to use for the relationships. // of the time this will be what we desire to use for the relationships.
if (is_null($relation)) { if ($relation === null) {
list(, $caller) = debug_backtrace(false); list(, $caller) = debug_backtrace(false);
$relation = $caller['function']; $relation = $caller['function'];
} }
if (is_null($localKey)) { if ($localKey === null) {
$localKey = $relation; $localKey = $relation;
} }
if (is_null($foreignKey)) { if ($foreignKey === null) {
$foreignKey = Str::snake(class_basename($this)); $foreignKey = Str::snake(class_basename($this));
} }
......
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
View file @ 78d7cbdd
...@@ -16,10 +16,9 @@ trait HybridRelations ...@@ -16,10 +16,9 @@ trait HybridRelations
{ {
/** /**
* Define a one-to-one relationship. * Define a one-to-one relationship.
* * @param string $related
* @param string $related * @param string $foreignKey
* @param string $foreignKey * @param string $localKey
* @param string $localKey
* @return \Illuminate\Database\Eloquent\Relations\HasOne * @return \Illuminate\Database\Eloquent\Relations\HasOne
*/ */
public function hasOne($related, $foreignKey = null, $localKey = null) public function hasOne($related, $foreignKey = null, $localKey = null)
...@@ -40,12 +39,11 @@ trait HybridRelations ...@@ -40,12 +39,11 @@ trait HybridRelations
/** /**
* Define a polymorphic one-to-one relationship. * Define a polymorphic one-to-one relationship.
* * @param string $related
* @param string $related * @param string $name
* @param string $name * @param string $type
* @param string $type * @param string $id
* @param string $id * @param string $localKey
* @param string $localKey
* @return \Illuminate\Database\Eloquent\Relations\MorphOne * @return \Illuminate\Database\Eloquent\Relations\MorphOne
*/ */
public function morphOne($related, $name, $type = null, $id = null, $localKey = null) public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
...@@ -66,10 +64,9 @@ trait HybridRelations ...@@ -66,10 +64,9 @@ trait HybridRelations
/** /**
* Define a one-to-many relationship. * Define a one-to-many relationship.
* * @param string $related
* @param string $related * @param string $foreignKey
* @param string $foreignKey * @param string $localKey
* @param string $localKey
* @return \Illuminate\Database\Eloquent\Relations\HasMany * @return \Illuminate\Database\Eloquent\Relations\HasMany
*/ */
public function hasMany($related, $foreignKey = null, $localKey = null) public function hasMany($related, $foreignKey = null, $localKey = null)
...@@ -90,12 +87,11 @@ trait HybridRelations ...@@ -90,12 +87,11 @@ trait HybridRelations
/** /**
* Define a polymorphic one-to-many relationship. * Define a polymorphic one-to-many relationship.
* * @param string $related
* @param string $related * @param string $name
* @param string $name * @param string $type
* @param string $type * @param string $id
* @param string $id * @param string $localKey
* @param string $localKey
* @return \Illuminate\Database\Eloquent\Relations\MorphMany * @return \Illuminate\Database\Eloquent\Relations\MorphMany
*/ */
public function morphMany($related, $name, $type = null, $id = null, $localKey = null) public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
...@@ -121,11 +117,10 @@ trait HybridRelations ...@@ -121,11 +117,10 @@ trait HybridRelations
/** /**
* Define an inverse one-to-one or many relationship. * Define an inverse one-to-one or many relationship.
* * @param string $related
* @param string $related * @param string $foreignKey
* @param string $foreignKey * @param string $otherKey
* @param string $otherKey * @param string $relation
* @param string $relation
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/ */
public function belongsTo($related, $foreignKey = null, $otherKey = null, $relation = null) public function belongsTo($related, $foreignKey = null, $otherKey = null, $relation = null)
...@@ -133,7 +128,7 @@ trait HybridRelations ...@@ -133,7 +128,7 @@ trait HybridRelations
// If no relation name was given, we will use this debug backtrace to extract // If no relation name was given, we will use this debug backtrace to extract
// the calling method's name and use that as the relationship name as most // the calling method's name and use that as the relationship name as most
// of the time this will be what we desire to use for the relationships. // of the time this will be what we desire to use for the relationships.
if (is_null($relation)) { if ($relation === null) {
list($current, $caller) = debug_backtrace(false, 2); list($current, $caller) = debug_backtrace(false, 2);
$relation = $caller['function']; $relation = $caller['function'];
...@@ -147,7 +142,7 @@ trait HybridRelations ...@@ -147,7 +142,7 @@ trait HybridRelations
// If no foreign key was supplied, we can use a backtrace to guess the proper // If no foreign key was supplied, we can use a backtrace to guess the proper
// foreign key name by using the name of the relationship function, which // foreign key name by using the name of the relationship function, which
// when combined with an "_id" should conventionally match the columns. // when combined with an "_id" should conventionally match the columns.
if (is_null($foreignKey)) { if ($foreignKey === null) {
$foreignKey = Str::snake($relation) . '_id'; $foreignKey = Str::snake($relation) . '_id';
} }
...@@ -165,11 +160,10 @@ trait HybridRelations ...@@ -165,11 +160,10 @@ trait HybridRelations
/** /**
* Define a polymorphic, inverse one-to-one or many relationship. * Define a polymorphic, inverse one-to-one or many relationship.
* * @param string $name
* @param string $name * @param string $type
* @param string $type * @param string $id
* @param string $id * @param string $ownerKey
* @param string $ownerKey
* @return \Illuminate\Database\Eloquent\Relations\MorphTo * @return \Illuminate\Database\Eloquent\Relations\MorphTo
*/ */
public function morphTo($name = null, $type = null, $id = null, $ownerKey = null) public function morphTo($name = null, $type = null, $id = null, $ownerKey = null)
...@@ -177,7 +171,7 @@ trait HybridRelations ...@@ -177,7 +171,7 @@ trait HybridRelations
// If no name is provided, we will use the backtrace to get the function name // If no name is provided, we will use the backtrace to get the function name
// since that is most likely the name of the polymorphic interface. We can // since that is most likely the name of the polymorphic interface. We can
// use that to get both the class and foreign key that will be utilized. // use that to get both the class and foreign key that will be utilized.
if (is_null($name)) { if ($name === null) {
list($current, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); list($current, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
$name = Str::snake($caller['function']); $name = Str::snake($caller['function']);
...@@ -188,7 +182,7 @@ trait HybridRelations ...@@ -188,7 +182,7 @@ trait HybridRelations
// If the type value is null it is probably safe to assume we're eager loading // If the type value is null it is probably safe to assume we're eager loading
// the relationship. When that is the case we will pass in a dummy query as // the relationship. When that is the case we will pass in a dummy query as
// there are multiple types in the morph and we can't use single queries. // there are multiple types in the morph and we can't use single queries.
if (is_null($class = $this->$type)) { if (($class = $this->$type) === null) {
return new MorphTo( return new MorphTo(
$this->newQuery(), $this, $id, null, $type, $name $this->newQuery(), $this, $id, null, $type, $name
); );
...@@ -197,27 +191,24 @@ trait HybridRelations ...@@ -197,27 +191,24 @@ trait HybridRelations
// If we are not eager loading the relationship we will essentially treat this // If we are not eager loading the relationship we will essentially treat this
// as a belongs-to style relationship since morph-to extends that class and // as a belongs-to style relationship since morph-to extends that class and
// we will pass in the appropriate values so that it behaves as expected. // we will pass in the appropriate values so that it behaves as expected.
else { $class = $this->getActualClassNameForMorph($class);
$class = $this->getActualClassNameForMorph($class);
$instance = new $class; $instance = new $class;
return new MorphTo( return new MorphTo(
$instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
); );
}
} }
/** /**
* Define a many-to-many relationship. * Define a many-to-many relationship.
* * @param string $related
* @param string $related * @param string $collection
* @param string $collection * @param string $foreignKey
* @param string $foreignKey * @param string $otherKey
* @param string $otherKey * @param string $parentKey
* @param string $parentKey * @param string $relatedKey
* @param string $relatedKey * @param string $relation
* @param string $relation
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/ */
public function belongsToMany( public function belongsToMany(
...@@ -232,7 +223,7 @@ trait HybridRelations ...@@ -232,7 +223,7 @@ trait HybridRelations
// If no relationship name was passed, we will pull backtraces to get the // If no relationship name was passed, we will pull backtraces to get the
// name of the calling function. We will use that function name as the // name of the calling function. We will use that function name as the
// title of this relation since that is a great convention to apply. // title of this relation since that is a great convention to apply.
if (is_null($relation)) { if ($relation === null) {
$relation = $this->guessBelongsToManyRelation(); $relation = $this->guessBelongsToManyRelation();
} }
...@@ -261,7 +252,7 @@ trait HybridRelations ...@@ -261,7 +252,7 @@ trait HybridRelations
// If no table name was provided, we can guess it by concatenating the two // If no table name was provided, we can guess it by concatenating the two
// models using underscores in alphabetical order. The two model names // models using underscores in alphabetical order. The two model names
// are transformed to snake case from their default CamelCase also. // are transformed to snake case from their default CamelCase also.
if (is_null($collection)) { if ($collection === null) {
$collection = $instance->getTable(); $collection = $instance->getTable();
} }
...@@ -284,7 +275,6 @@ trait HybridRelations ...@@ -284,7 +275,6 @@ trait HybridRelations
/** /**
* Get the relationship name of the belongs to many. * Get the relationship name of the belongs to many.
*
* @return string * @return string
*/ */
protected function guessBelongsToManyRelation() protected function guessBelongsToManyRelation()
...@@ -303,8 +293,8 @@ trait HybridRelations ...@@ -303,8 +293,8 @@ trait HybridRelations
{ {
if (is_subclass_of($this, \Jenssegers\Mongodb\Eloquent\Model::class)) { if (is_subclass_of($this, \Jenssegers\Mongodb\Eloquent\Model::class)) {
return new Builder($query); return new Builder($query);
} else {
return new EloquentBuilder($query);
} }
return new EloquentBuilder($query);
} }
} }
src/Jenssegers/Mongodb/Eloquent/Model.php
View file @ 78d7cbdd
...@@ -4,15 +4,16 @@ namespace Jenssegers\Mongodb\Eloquent; ...@@ -4,15 +4,16 @@ namespace Jenssegers\Mongodb\Eloquent;
use Carbon\Carbon; use Carbon\Carbon;
use DateTime; use DateTime;
use Illuminate\Contracts\Queue\QueueableCollection;
use Illuminate\Contracts\Queue\QueueableEntity;
use Illuminate\Database\Eloquent\Model as BaseModel; use Illuminate\Database\Eloquent\Model as BaseModel;
use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Jenssegers\Mongodb\Query\Builder as QueryBuilder; use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
use MongoDB\BSON\Binary;
use MongoDB\BSON\ObjectID; use MongoDB\BSON\ObjectID;
use MongoDB\BSON\UTCDateTime; use MongoDB\BSON\UTCDateTime;
use Illuminate\Contracts\Queue\QueueableEntity;
use Illuminate\Contracts\Queue\QueueableCollection;
abstract class Model extends BaseModel abstract class Model extends BaseModel
{ {
...@@ -20,29 +21,31 @@ abstract class Model extends BaseModel ...@@ -20,29 +21,31 @@ abstract class Model extends BaseModel
/** /**
* The collection associated with the model. * The collection associated with the model.
*
* @var string * @var string
*/ */
protected $collection; protected $collection;
/** /**
* The primary key for the model. * The primary key for the model.
*
* @var string * @var string
*/ */
protected $primaryKey = '_id'; protected $primaryKey = '_id';
/**
* The primary key type.
* @var string
*/
protected $keyType = 'string';
/** /**
* The parent relation instance. * The parent relation instance.
*
* @var Relation * @var Relation
*/ */
protected $parentRelation; protected $parentRelation;
/** /**
* Custom accessor for the model's id. * Custom accessor for the model's id.
* * @param mixed $value
* @param mixed $value
* @return mixed * @return mixed
*/ */
public function getIdAttribute($value = null) public function getIdAttribute($value = null)
...@@ -56,6 +59,8 @@ abstract class Model extends BaseModel ...@@ -56,6 +59,8 @@ abstract class Model extends BaseModel
// Convert ObjectID to string. // Convert ObjectID to string.
if ($value instanceof ObjectID) { if ($value instanceof ObjectID) {
return (string) $value; return (string) $value;
} elseif ($value instanceof Binary) {
return (string) $value->getData();
} }
return $value; return $value;
...@@ -197,6 +202,8 @@ abstract class Model extends BaseModel ...@@ -197,6 +202,8 @@ abstract class Model extends BaseModel
foreach ($attributes as $key => &$value) { foreach ($attributes as $key => &$value) {
if ($value instanceof ObjectID) { if ($value instanceof ObjectID) {
$value = (string) $value; $value = (string) $value;
} elseif ($value instanceof Binary) {
$value = (string) $value->getData();
} }
} }
...@@ -221,7 +228,7 @@ abstract class Model extends BaseModel ...@@ -221,7 +228,7 @@ abstract class Model extends BaseModel
/** /**
* @inheritdoc * @inheritdoc
*/ */
protected function originalIsEquivalent($key, $current) public function originalIsEquivalent($key, $current)
{ {
if (!array_key_exists($key, $this->original)) { if (!array_key_exists($key, $this->original)) {
return false; return false;
...@@ -255,8 +262,7 @@ abstract class Model extends BaseModel ...@@ -255,8 +262,7 @@ abstract class Model extends BaseModel
/** /**
* Remove one or more fields. * Remove one or more fields.
* * @param mixed $columns
* @param mixed $columns
* @return int * @return int
*/ */
public function drop($columns) public function drop($columns)
...@@ -301,9 +307,8 @@ abstract class Model extends BaseModel ...@@ -301,9 +307,8 @@ abstract class Model extends BaseModel
/** /**
* Remove one or more values from an array. * Remove one or more values from an array.
* * @param string $column
* @param string $column * @param mixed $values
* @param mixed $values
* @return mixed * @return mixed
*/ */
public function pull($column, $values) public function pull($column, $values)
...@@ -320,10 +325,9 @@ abstract class Model extends BaseModel ...@@ -320,10 +325,9 @@ abstract class Model extends BaseModel
/** /**
* Append one or more values to the underlying attribute value and sync with original. * Append one or more values to the underlying attribute value and sync with original.
* * @param string $column
* @param string $column * @param array $values
* @param array $values * @param bool $unique
* @param bool $unique
*/ */
protected function pushAttributeValues($column, array $values, $unique = false) protected function pushAttributeValues($column, array $values, $unique = false)
{ {
...@@ -345,9 +349,8 @@ abstract class Model extends BaseModel ...@@ -345,9 +349,8 @@ abstract class Model extends BaseModel
/** /**
* Remove one or more values to the underlying attribute value and sync with original. * Remove one or more values to the underlying attribute value and sync with original.
* * @param string $column
* @param string $column * @param array $values
* @param array $values
*/ */
protected function pullAttributeValues($column, array $values) protected function pullAttributeValues($column, array $values)
{ {
...@@ -378,8 +381,7 @@ abstract class Model extends BaseModel ...@@ -378,8 +381,7 @@ abstract class Model extends BaseModel
/** /**
* Set the parent relation. * Set the parent relation.
* * @param \Illuminate\Database\Eloquent\Relations\Relation $relation
* @param \Illuminate\Database\Eloquent\Relations\Relation $relation
*/ */
public function setParentRelation(Relation $relation) public function setParentRelation(Relation $relation)
{ {
...@@ -388,7 +390,6 @@ abstract class Model extends BaseModel ...@@ -388,7 +390,6 @@ abstract class Model extends BaseModel
/** /**
* Get the parent relation. * Get the parent relation.
*
* @return \Illuminate\Database\Eloquent\Relations\Relation * @return \Illuminate\Database\Eloquent\Relations\Relation
*/ */
public function getParentRelation() public function getParentRelation()
...@@ -424,7 +425,6 @@ abstract class Model extends BaseModel ...@@ -424,7 +425,6 @@ abstract class Model extends BaseModel
/** /**
* Get the queueable relationships for the entity. * Get the queueable relationships for the entity.
*
* @return array * @return array
*/ */
public function getQueueableRelations() public function getQueueableRelations()
...@@ -438,13 +438,13 @@ abstract class Model extends BaseModel ...@@ -438,13 +438,13 @@ abstract class Model extends BaseModel
if ($relation instanceof QueueableCollection) { if ($relation instanceof QueueableCollection) {
foreach ($relation->getQueueableRelations() as $collectionValue) { foreach ($relation->getQueueableRelations() as $collectionValue) {
$relations[] = $key.'.'.$collectionValue; $relations[] = $key . '.' . $collectionValue;
} }
} }
if ($relation instanceof QueueableEntity) { if ($relation instanceof QueueableEntity) {
foreach ($relation->getQueueableRelations() as $entityKey => $entityValue) { foreach ($relation->getQueueableRelations() as $entityKey => $entityValue) {
$relations[] = $key.'.'.$entityValue; $relations[] = $key . '.' . $entityValue;
} }
} }
} }
...@@ -454,7 +454,6 @@ abstract class Model extends BaseModel ...@@ -454,7 +454,6 @@ abstract class Model extends BaseModel
/** /**
* Get loaded relations for the instance without parent. * Get loaded relations for the instance without parent.
*
* @return array * @return array
*/ */
protected function getRelationsWithoutParent() protected function getRelationsWithoutParent()
......
src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
View file @ 78d7cbdd
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
namespace Jenssegers\Mongodb\Helpers; namespace Jenssegers\Mongodb\Helpers;
use Closure; use Closure;
use Exception;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasOneOrMany; use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
...@@ -12,13 +14,12 @@ trait QueriesRelationships ...@@ -12,13 +14,12 @@ trait QueriesRelationships
{ {
/** /**
* Add a relationship count / exists condition to the query. * Add a relationship count / exists condition to the query.
* * @param string $relation
* @param string $relation * @param string $operator
* @param string $operator * @param int $count
* @param int $count * @param string $boolean
* @param string $boolean * @param Closure|null $callback
* @param \Closure|null $callback * @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/ */
public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null) public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
{ {
...@@ -74,7 +75,7 @@ trait QueriesRelationships ...@@ -74,7 +75,7 @@ trait QueriesRelationships
* @param string $boolean * @param string $boolean
* @param Closure|null $callback * @param Closure|null $callback
* @return mixed * @return mixed
* @throws \Exception * @throws Exception
*/ */
public function addHybridHas($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null) public function addHybridHas($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
{ {
...@@ -97,29 +98,6 @@ trait QueriesRelationships ...@@ -97,29 +98,6 @@ trait QueriesRelationships
return $this->whereIn($this->getRelatedConstraintKey($relation), $relatedIds, $boolean, $not); return $this->whereIn($this->getRelatedConstraintKey($relation), $relatedIds, $boolean, $not);
} }
/**
* Returns key we are constraining this parent model's query with
* @param $relation
* @return string
* @throws \Exception
*/
protected function getRelatedConstraintKey($relation)
{
if ($relation instanceof HasOneOrMany) {
return $this->model->getKeyName();
}
if ($relation instanceof BelongsTo) {
return $relation->getForeignKey();
}
if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation)) {
return $this->model->getKeyName();
}
throw new \Exception(class_basename($relation) . ' is not supported for hybrid query constraints.');
}
/** /**
* @param $relation * @param $relation
* @return string * @return string
...@@ -130,7 +108,7 @@ trait QueriesRelationships ...@@ -130,7 +108,7 @@ trait QueriesRelationships
return $relation->getHasCompareKey(); return $relation->getHasCompareKey();
} }
return $relation instanceof HasOneOrMany ? $relation->getForeignKeyName() : $relation->getOwnerKey(); return $relation instanceof HasOneOrMany ? $relation->getForeignKeyName() : $relation->getOwnerKeyName();
} }
/** /**
...@@ -166,4 +144,27 @@ trait QueriesRelationships ...@@ -166,4 +144,27 @@ trait QueriesRelationships
// All related ids. // All related ids.
return array_keys($relationCount); return array_keys($relationCount);
} }
/**
* Returns key we are constraining this parent model's query with
* @param $relation
* @return string
* @throws Exception
*/
protected function getRelatedConstraintKey($relation)
{
if ($relation instanceof HasOneOrMany) {
return $this->model->getKeyName();
}
if ($relation instanceof BelongsTo) {
return $relation->getForeignKeyName();
}
if ($relation instanceof BelongsToMany && !$this->isAcrossConnections($relation)) {
return $this->model->getKeyName();
}
throw new Exception(class_basename($relation) . ' is not supported for hybrid query constraints.');
}
} }
src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php
View file @ 78d7cbdd
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace Jenssegers\Mongodb; namespace Jenssegers\Mongodb;
use DB;
use Illuminate\Queue\QueueServiceProvider; use Illuminate\Queue\QueueServiceProvider;
use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider; use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
...@@ -13,7 +14,7 @@ class MongodbQueueServiceProvider extends QueueServiceProvider ...@@ -13,7 +14,7 @@ class MongodbQueueServiceProvider extends QueueServiceProvider
protected function registerFailedJobServices() protected function registerFailedJobServices()
{ {
// Add compatible queue failer if mongodb is configured. // Add compatible queue failer if mongodb is configured.
if (config('queue.failed.database') == 'mongodb') { if (DB::connection(config('queue.failed.database'))->getDriverName() == 'mongodb') {
$this->app->singleton('queue.failer', function ($app) { $this->app->singleton('queue.failer', function ($app) {
return new MongoFailedJobProvider($app['db'], config('queue.failed.database'), config('queue.failed.table')); return new MongoFailedJobProvider($app['db'], config('queue.failed.database'), config('queue.failed.table'));
}); });
......
src/Jenssegers/Mongodb/Query/Builder.php
View file @ 78d7cbdd
This diff is collapsed.
src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php
View file @ 78d7cbdd
...@@ -9,11 +9,9 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider ...@@ -9,11 +9,9 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider
{ {
/** /**
* Log a failed job into storage. * Log a failed job into storage.
* * @param string $connection
* @param string $connection * @param string $queue
* @param string $queue * @param string $payload
* @param string $payload
*
* @return void * @return void
*/ */
public function log($connection, $queue, $payload, $exception) public function log($connection, $queue, $payload, $exception)
...@@ -25,7 +23,6 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider ...@@ -25,7 +23,6 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider
/** /**
* Get a list of all of the failed jobs. * Get a list of all of the failed jobs.
*
* @return object[] * @return object[]
*/ */
public function all() public function all()
...@@ -42,14 +39,17 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider ...@@ -42,14 +39,17 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider
/** /**
* Get a single failed job. * Get a single failed job.
* * @param mixed $id
* @param mixed $id
* @return object * @return object
*/ */
public function find($id) public function find($id)
{ {
$job = $this->getTable()->find($id); $job = $this->getTable()->find($id);
if (!$job) {
return;
}
$job['id'] = (string) $job['_id']; $job['id'] = (string) $job['_id'];
return (object) $job; return (object) $job;
...@@ -57,8 +57,7 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider ...@@ -57,8 +57,7 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider
/** /**
* Delete a single failed job from storage. * Delete a single failed job from storage.
* * @param mixed $id
* @param mixed $id
* @return bool * @return bool
*/ */
public function forget($id) public function forget($id)
......
src/Jenssegers/Mongodb/Queue/MongoConnector.php
View file @ 78d7cbdd
...@@ -10,15 +10,13 @@ class MongoConnector implements ConnectorInterface ...@@ -10,15 +10,13 @@ class MongoConnector implements ConnectorInterface
{ {
/** /**
* Database connections. * Database connections.
*
* @var \Illuminate\Database\ConnectionResolverInterface * @var \Illuminate\Database\ConnectionResolverInterface
*/ */
protected $connections; protected $connections;
/** /**
* Create a new connector instance. * Create a new connector instance.
* * @param \Illuminate\Database\ConnectionResolverInterface $connections
* @param \Illuminate\Database\ConnectionResolverInterface $connections
*/ */
public function __construct(ConnectionResolverInterface $connections) public function __construct(ConnectionResolverInterface $connections)
{ {
...@@ -27,8 +25,7 @@ class MongoConnector implements ConnectorInterface ...@@ -27,8 +25,7 @@ class MongoConnector implements ConnectorInterface
/** /**
* Establish a queue connection. * Establish a queue connection.
* * @param array $config
* @param array $config
* @return \Illuminate\Contracts\Queue\Queue * @return \Illuminate\Contracts\Queue\Queue
*/ */
public function connect(array $config) public function connect(array $config)
......
src/Jenssegers/Mongodb/Queue/MongoJob.php
View file @ 78d7cbdd
...@@ -8,7 +8,6 @@ class MongoJob extends DatabaseJob ...@@ -8,7 +8,6 @@ class MongoJob extends DatabaseJob
{ {
/** /**
* Indicates if the job has been reserved. * Indicates if the job has been reserved.
*
* @return bool * @return bool
*/ */
public function isReserved() public function isReserved()
......
src/Jenssegers/Mongodb/Queue/MongoQueue.php
View file @ 78d7cbdd
...@@ -11,14 +11,12 @@ class MongoQueue extends DatabaseQueue ...@@ -11,14 +11,12 @@ class MongoQueue extends DatabaseQueue
{ {
/** /**
* The expiration time of a job. * The expiration time of a job.
*
* @var int|null * @var int|null
*/ */
protected $retryAfter = 60; protected $retryAfter = 60;
/** /**
* The connection name for the queue. * The connection name for the queue.
*
* @var string * @var string
*/ */
protected $connectionName; protected $connectionName;
...@@ -39,7 +37,7 @@ class MongoQueue extends DatabaseQueue ...@@ -39,7 +37,7 @@ class MongoQueue extends DatabaseQueue
{ {
$queue = $this->getQueue($queue); $queue = $this->getQueue($queue);
if (!is_null($this->retryAfter)) { if ($this->retryAfter !== null) {
$this->releaseJobsThatHaveBeenReservedTooLong($queue); $this->releaseJobsThatHaveBeenReservedTooLong($queue);
} }
...@@ -52,17 +50,13 @@ class MongoQueue extends DatabaseQueue ...@@ -52,17 +50,13 @@ class MongoQueue extends DatabaseQueue
/** /**
* Get the next available job for the queue and mark it as reserved. * Get the next available job for the queue and mark it as reserved.
*
* When using multiple daemon queue listeners to process jobs there * When using multiple daemon queue listeners to process jobs there
* is a possibility that multiple processes can end up reading the * is a possibility that multiple processes can end up reading the
* same record before one has flagged it as reserved. * same record before one has flagged it as reserved.
*
* This race condition can result in random jobs being run more then * This race condition can result in random jobs being run more then
* once. To solve this we use findOneAndUpdate to lock the next jobs * once. To solve this we use findOneAndUpdate to lock the next jobs
* record while flagging it as reserved at the same time. * record while flagging it as reserved at the same time.
* * @param string|null $queue
* @param string|null $queue
*
* @return \StdClass|null * @return \StdClass|null
*/ */
protected function getNextAvailableJobAndReserve($queue) protected function getNextAvailableJobAndReserve($queue)
...@@ -70,7 +64,7 @@ class MongoQueue extends DatabaseQueue ...@@ -70,7 +64,7 @@ class MongoQueue extends DatabaseQueue
$job = $this->database->getCollection($this->table)->findOneAndUpdate( $job = $this->database->getCollection($this->table)->findOneAndUpdate(
[ [
'queue' => $this->getQueue($queue), 'queue' => $this->getQueue($queue),
'reserved' => 0, 'reserved' => ['$ne' => 1],
'available_at' => ['$lte' => Carbon::now()->getTimestamp()], 'available_at' => ['$lte' => Carbon::now()->getTimestamp()],
], ],
[ [
...@@ -78,6 +72,9 @@ class MongoQueue extends DatabaseQueue ...@@ -78,6 +72,9 @@ class MongoQueue extends DatabaseQueue
'reserved' => 1, 'reserved' => 1,
'reserved_at' => Carbon::now()->getTimestamp(), 'reserved_at' => Carbon::now()->getTimestamp(),
], ],
'$inc' => [
'attempts' => 1,
],
], ],
[ [
'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER, 'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER,
...@@ -94,39 +91,28 @@ class MongoQueue extends DatabaseQueue ...@@ -94,39 +91,28 @@ class MongoQueue extends DatabaseQueue
/** /**
* Release the jobs that have been reserved for too long. * Release the jobs that have been reserved for too long.
* * @param string $queue
* @param string $queue
* @return void * @return void
*/ */
protected function releaseJobsThatHaveBeenReservedTooLong($queue) protected function releaseJobsThatHaveBeenReservedTooLong($queue)
{ {
$expiration = Carbon::now()->subSeconds($this->retryAfter)->getTimestamp(); $expiration = Carbon::now()->subSeconds($this->retryAfter)->getTimestamp();
$now = time();
$reserved = $this->database->collection($this->table) $reserved = $this->database->collection($this->table)
->where('queue', $this->getQueue($queue)) ->where('queue', $this->getQueue($queue))
->where(function ($query) use ($expiration, $now) { ->whereNotNull('reserved_at')
// Check for available jobs ->where('reserved_at', '<=', $expiration)
$query->where(function ($query) use ($now) { ->get();
$query->whereNull('reserved_at');
$query->where('available_at', '<=', $now);
});
// Check for jobs that are reserved but have expired
$query->orWhere('reserved_at', '<=', $expiration);
})->get();
foreach ($reserved as $job) { foreach ($reserved as $job) {
$attempts = $job['attempts'] + 1; $this->releaseJob($job['_id'], $job['attempts']);
$this->releaseJob($job['_id'], $attempts);
} }
} }
/** /**
* Release the given job ID from reservation. * Release the given job ID from reservation.
* * @param string $id
* @param string $id * @param int $attempts
* @param int $attempts
* @return void * @return void
*/ */
protected function releaseJob($id, $attempts) protected function releaseJob($id, $attempts)
......
src/Jenssegers/Mongodb/Relations/BelongsTo.php
View file @ 78d7cbdd
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
namespace Jenssegers\Mongodb\Relations; namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model as EloquentModel;
class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo
{ {
/** /**
* Get the key for comparing against the parent key in "has" query. * Get the key for comparing against the parent key in "has" query.
*
* @return string * @return string
*/ */
public function getHasCompareKey() public function getHasCompareKey()
...@@ -52,11 +52,21 @@ class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo ...@@ -52,11 +52,21 @@ class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo
/** /**
* Get the owner key with backwards compatible support. * Get the owner key with backwards compatible support.
*
* @return string * @return string
*/ */
public function getOwnerKey() public function getOwnerKey()
{ {
return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey; return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey;
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/BelongsToMany.php
View file @ 78d7cbdd
...@@ -5,6 +5,7 @@ namespace Jenssegers\Mongodb\Relations; ...@@ -5,6 +5,7 @@ namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Database\Eloquent\Relations\BelongsToMany as EloquentBelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany as EloquentBelongsToMany;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
...@@ -12,7 +13,6 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -12,7 +13,6 @@ class BelongsToMany extends EloquentBelongsToMany
{ {
/** /**
* Get the key for comparing against the parent key in "has" query. * Get the key for comparing against the parent key in "has" query.
*
* @return string * @return string
*/ */
public function getHasCompareKey() public function getHasCompareKey()
...@@ -38,8 +38,7 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -38,8 +38,7 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Set the select clause for the relation query. * Set the select clause for the relation query.
* * @param array $columns
* @param array $columns
* @return array * @return array
*/ */
protected function getSelectColumns(array $columns = ['*']) protected function getSelectColumns(array $columns = ['*'])
...@@ -67,7 +66,6 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -67,7 +66,6 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Set the where clause for the relation query. * Set the where clause for the relation query.
*
* @return $this * @return $this
*/ */
protected function setWhere() protected function setWhere()
...@@ -274,7 +272,6 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -274,7 +272,6 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Create a new query builder for the related model. * Create a new query builder for the related model.
*
* @return \Illuminate\Database\Query\Builder * @return \Illuminate\Database\Query\Builder
*/ */
public function newRelatedQuery() public function newRelatedQuery()
...@@ -284,7 +281,6 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -284,7 +281,6 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Get the fully qualified foreign key for the relation. * Get the fully qualified foreign key for the relation.
*
* @return string * @return string
*/ */
public function getForeignKey() public function getForeignKey()
...@@ -311,10 +307,9 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -311,10 +307,9 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Format the sync list so that it is keyed by ID. (Legacy Support) * Format the sync list so that it is keyed by ID. (Legacy Support)
* The original function has been renamed to formatRecordsList since Laravel 5.3 * The original function has been renamed to formatRecordsList since Laravel 5.3
* * @param array $records
* @deprecated
* @param array $records
* @return array * @return array
* @deprecated
*/ */
protected function formatSyncList(array $records) protected function formatSyncList(array $records)
{ {
...@@ -330,11 +325,21 @@ class BelongsToMany extends EloquentBelongsToMany ...@@ -330,11 +325,21 @@ class BelongsToMany extends EloquentBelongsToMany
/** /**
* Get the related key with backwards compatible support. * Get the related key with backwards compatible support.
*
* @return string * @return string
*/ */
public function getRelatedKey() public function getRelatedKey()
{ {
return property_exists($this, 'relatedPivotKey') ? $this->relatedPivotKey : $this->relatedKey; return property_exists($this, 'relatedPivotKey') ? $this->relatedPivotKey : $this->relatedKey;
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/EmbedsMany.php
View file @ 78d7cbdd
...@@ -4,6 +4,7 @@ namespace Jenssegers\Mongodb\Relations; ...@@ -4,6 +4,7 @@ namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Pagination\Paginator; use Illuminate\Pagination\Paginator;
use MongoDB\BSON\ObjectID; use MongoDB\BSON\ObjectID;
...@@ -32,8 +33,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -32,8 +33,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Save a new model and attach it to the parent model. * Save a new model and attach it to the parent model.
* * @param Model $model
* @param Model $model
* @return Model|bool * @return Model|bool
*/ */
public function performInsert(Model $model) public function performInsert(Model $model)
...@@ -62,8 +62,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -62,8 +62,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Save an existing model and attach it to the parent model. * Save an existing model and attach it to the parent model.
* * @param Model $model
* @param Model $model
* @return Model|bool * @return Model|bool
*/ */
public function performUpdate(Model $model) public function performUpdate(Model $model)
...@@ -94,8 +93,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -94,8 +93,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Delete an existing model and detach it from the parent model. * Delete an existing model and detach it from the parent model.
* * @param Model $model
* @param Model $model
* @return int * @return int
*/ */
public function performDelete(Model $model) public function performDelete(Model $model)
...@@ -121,23 +119,21 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -121,23 +119,21 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Associate the model instance to the given parent, without saving it to the database. * Associate the model instance to the given parent, without saving it to the database.
* * @param Model $model
* @param Model $model
* @return Model * @return Model
*/ */
public function associate(Model $model) public function associate(Model $model)
{ {
if (!$this->contains($model)) { if (!$this->contains($model)) {
return $this->associateNew($model); return $this->associateNew($model);
} else {
return $this->associateExisting($model);
} }
return $this->associateExisting($model);
} }
/** /**
* Dissociate the model instance from the given parent, without saving it to the database. * Dissociate the model instance from the given parent, without saving it to the database.
* * @param mixed $ids
* @param mixed $ids
* @return int * @return int
*/ */
public function dissociate($ids = []) public function dissociate($ids = [])
...@@ -165,8 +161,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -165,8 +161,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Destroy the embedded models for the given IDs. * Destroy the embedded models for the given IDs.
* * @param mixed $ids
* @param mixed $ids
* @return int * @return int
*/ */
public function destroy($ids = []) public function destroy($ids = [])
...@@ -190,7 +185,6 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -190,7 +185,6 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Delete all embedded models. * Delete all embedded models.
*
* @return int * @return int
*/ */
public function delete() public function delete()
...@@ -207,8 +201,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -207,8 +201,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Destroy alias. * Destroy alias.
* * @param mixed $ids
* @param mixed $ids
* @return int * @return int
*/ */
public function detach($ids = []) public function detach($ids = [])
...@@ -218,8 +211,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -218,8 +211,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Save alias. * Save alias.
* * @param Model $model
* @param Model $model
* @return Model * @return Model
*/ */
public function attach(Model $model) public function attach(Model $model)
...@@ -229,14 +221,13 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -229,14 +221,13 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Associate a new model instance to the given parent, without saving it to the database. * Associate a new model instance to the given parent, without saving it to the database.
* * @param Model $model
* @param Model $model
* @return Model * @return Model
*/ */
protected function associateNew($model) protected function associateNew($model)
{ {
// Create a new key if needed. // Create a new key if needed.
if (!$model->getAttribute('_id')) { if ($model->getKeyName() === '_id' && !$model->getAttribute('_id')) {
$model->setAttribute('_id', new ObjectID); $model->setAttribute('_id', new ObjectID);
} }
...@@ -250,8 +241,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -250,8 +241,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Associate an existing model instance to the given parent, without saving it to the database. * Associate an existing model instance to the given parent, without saving it to the database.
* * @param Model $model
* @param Model $model
* @return Model * @return Model
*/ */
protected function associateExisting($model) protected function associateExisting($model)
...@@ -276,8 +266,7 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -276,8 +266,7 @@ class EmbedsMany extends EmbedsOneOrMany
/** /**
* Get a paginator for the "select" statement. * Get a paginator for the "select" statement.
* * @param int $perPage
* @param int $perPage
* @return \Illuminate\Pagination\AbstractPaginator * @return \Illuminate\Pagination\AbstractPaginator
*/ */
public function paginate($perPage = null) public function paginate($perPage = null)
...@@ -328,4 +317,15 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -328,4 +317,15 @@ class EmbedsMany extends EmbedsOneOrMany
return parent::__call($method, $parameters); return parent::__call($method, $parameters);
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/EmbedsOne.php
View file @ 78d7cbdd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace Jenssegers\Mongodb\Relations; namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use MongoDB\BSON\ObjectID; use MongoDB\BSON\ObjectID;
class EmbedsOne extends EmbedsOneOrMany class EmbedsOne extends EmbedsOneOrMany
...@@ -29,8 +30,7 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -29,8 +30,7 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Save a new model and attach it to the parent model. * Save a new model and attach it to the parent model.
* * @param Model $model
* @param Model $model
* @return Model|bool * @return Model|bool
*/ */
public function performInsert(Model $model) public function performInsert(Model $model)
...@@ -58,8 +58,7 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -58,8 +58,7 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Save an existing model and attach it to the parent model. * Save an existing model and attach it to the parent model.
* * @param Model $model
* @param Model $model
* @return Model|bool * @return Model|bool
*/ */
public function performUpdate(Model $model) public function performUpdate(Model $model)
...@@ -84,7 +83,6 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -84,7 +83,6 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Delete an existing model and detach it from the parent model. * Delete an existing model and detach it from the parent model.
*
* @return int * @return int
*/ */
public function performDelete() public function performDelete()
...@@ -108,8 +106,7 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -108,8 +106,7 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Attach the model to its parent. * Attach the model to its parent.
* * @param Model $model
* @param Model $model
* @return Model * @return Model
*/ */
public function associate(Model $model) public function associate(Model $model)
...@@ -119,7 +116,6 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -119,7 +116,6 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Detach the model from its parent. * Detach the model from its parent.
*
* @return Model * @return Model
*/ */
public function dissociate() public function dissociate()
...@@ -129,11 +125,21 @@ class EmbedsOne extends EmbedsOneOrMany ...@@ -129,11 +125,21 @@ class EmbedsOne extends EmbedsOneOrMany
/** /**
* Delete all embedded models. * Delete all embedded models.
*
* @return int * @return int
*/ */
public function delete() public function delete()
{ {
return $this->performDelete(); return $this->performDelete();
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php
View file @ 78d7cbdd
...@@ -4,6 +4,7 @@ namespace Jenssegers\Mongodb\Relations; ...@@ -4,6 +4,7 @@ namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Database\Eloquent\Relations\Relation;
use Jenssegers\Mongodb\Eloquent\Model; use Jenssegers\Mongodb\Eloquent\Model;
...@@ -11,34 +12,30 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -11,34 +12,30 @@ abstract class EmbedsOneOrMany extends Relation
{ {
/** /**
* The local key of the parent model. * The local key of the parent model.
*
* @var string * @var string
*/ */
protected $localKey; protected $localKey;
/** /**
* The foreign key of the parent model. * The foreign key of the parent model.
*
* @var string * @var string
*/ */
protected $foreignKey; protected $foreignKey;
/** /**
* The "name" of the relationship. * The "name" of the relationship.
*
* @var string * @var string
*/ */
protected $relation; protected $relation;
/** /**
* Create a new embeds many relationship instance. * Create a new embeds many relationship instance.
* * @param Builder $query
* @param Builder $query * @param Model $parent
* @param Model $parent * @param Model $related
* @param Model $related * @param string $localKey
* @param string $localKey * @param string $foreignKey
* @param string $foreignKey * @param string $relation
* @param string $relation
*/ */
public function __construct(Builder $query, Model $parent, Model $related, $localKey, $foreignKey, $relation) public function __construct(Builder $query, Model $parent, Model $related, $localKey, $foreignKey, $relation)
{ {
...@@ -93,9 +90,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -93,9 +90,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Shorthand to get the results of the relationship. * Shorthand to get the results of the relationship.
* * @param array $columns
* @param array $columns
*
* @return Collection * @return Collection
*/ */
public function get($columns = ['*']) public function get($columns = ['*'])
...@@ -105,7 +100,6 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -105,7 +100,6 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the number of embedded models. * Get the number of embedded models.
*
* @return int * @return int
*/ */
public function count() public function count()
...@@ -115,8 +109,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -115,8 +109,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Attach a model instance to the parent model. * Attach a model instance to the parent model.
* * @param Model $model
* @param Model $model
* @return Model|bool * @return Model|bool
*/ */
public function save(Model $model) public function save(Model $model)
...@@ -128,8 +121,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -128,8 +121,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Attach a collection of models to the parent instance. * Attach a collection of models to the parent instance.
* * @param Collection|array $models
* @param Collection|array $models
* @return Collection|array * @return Collection|array
*/ */
public function saveMany($models) public function saveMany($models)
...@@ -143,8 +135,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -143,8 +135,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Create a new instance of the related model. * Create a new instance of the related model.
* * @param array $attributes
* @param array $attributes
* @return Model * @return Model
*/ */
public function create(array $attributes = []) public function create(array $attributes = [])
...@@ -163,8 +154,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -163,8 +154,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Create an array of new instances of the related model. * Create an array of new instances of the related model.
* * @param array $records
* @param array $records
* @return array * @return array
*/ */
public function createMany(array $records) public function createMany(array $records)
...@@ -180,8 +170,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -180,8 +170,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Transform single ID, single Model or array of Models into an array of IDs. * Transform single ID, single Model or array of Models into an array of IDs.
* * @param mixed $ids
* @param mixed $ids
* @return array * @return array
*/ */
protected function getIdsArrayFrom($ids) protected function getIdsArrayFrom($ids)
...@@ -235,8 +224,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -235,8 +224,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the foreign key value for the relation. * Get the foreign key value for the relation.
* * @param mixed $id
* @param mixed $id
* @return mixed * @return mixed
*/ */
protected function getForeignKeyValue($id) protected function getForeignKeyValue($id)
...@@ -251,8 +239,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -251,8 +239,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Convert an array of records to a Collection. * Convert an array of records to a Collection.
* * @param array $records
* @param array $records
* @return Collection * @return Collection
*/ */
protected function toCollection(array $records = []) protected function toCollection(array $records = [])
...@@ -272,13 +259,12 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -272,13 +259,12 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Create a related model instanced. * Create a related model instanced.
* * @param array $attributes
* @param array $attributes
* @return Model * @return Model
*/ */
protected function toModel($attributes = []) protected function toModel($attributes = [])
{ {
if (is_null($attributes)) { if ($attributes === null) {
return; return;
} }
...@@ -301,7 +287,6 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -301,7 +287,6 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the relation instance of the parent. * Get the relation instance of the parent.
*
* @return Relation * @return Relation
*/ */
protected function getParentRelation() protected function getParentRelation()
...@@ -331,7 +316,6 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -331,7 +316,6 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Check if this relation is nested in another relation. * Check if this relation is nested in another relation.
*
* @return bool * @return bool
*/ */
protected function isNested() protected function isNested()
...@@ -341,8 +325,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -341,8 +325,7 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the fully qualified local key name. * Get the fully qualified local key name.
* * @param string $glue
* @param string $glue
* @return string * @return string
*/ */
protected function getPathHierarchy($glue = '.') protected function getPathHierarchy($glue = '.')
...@@ -368,7 +351,6 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -368,7 +351,6 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the primary key value of the parent. * Get the primary key value of the parent.
*
* @return string * @return string
*/ */
protected function getParentKey() protected function getParentKey()
...@@ -378,7 +360,6 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -378,7 +360,6 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Return update values * Return update values
*
* @param $array * @param $array
* @param string $prepend * @param string $prepend
* @return array * @return array
...@@ -388,7 +369,7 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -388,7 +369,7 @@ abstract class EmbedsOneOrMany extends Relation
$results = []; $results = [];
foreach ($array as $key => $value) { foreach ($array as $key => $value) {
$results[$prepend.$key] = $value; $results[$prepend . $key] = $value;
} }
return $results; return $results;
...@@ -396,11 +377,21 @@ abstract class EmbedsOneOrMany extends Relation ...@@ -396,11 +377,21 @@ abstract class EmbedsOneOrMany extends Relation
/** /**
* Get the foreign key for the relationship. * Get the foreign key for the relationship.
*
* @return string * @return string
*/ */
public function getQualifiedForeignKeyName() public function getQualifiedForeignKeyName()
{ {
return $this->foreignKey; return $this->foreignKey;
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/HasMany.php
View file @ 78d7cbdd
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
namespace Jenssegers\Mongodb\Relations; namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Database\Eloquent\Relations\HasMany as EloquentHasMany; use Illuminate\Database\Eloquent\Relations\HasMany as EloquentHasMany;
class HasMany extends EloquentHasMany class HasMany extends EloquentHasMany
{ {
/** /**
* Get the plain foreign key. * Get the plain foreign key.
*
* @return string * @return string
*/ */
public function getForeignKeyName() public function getForeignKeyName()
...@@ -19,7 +19,6 @@ class HasMany extends EloquentHasMany ...@@ -19,7 +19,6 @@ class HasMany extends EloquentHasMany
/** /**
* Get the plain foreign key. * Get the plain foreign key.
*
* @return string * @return string
*/ */
public function getPlainForeignKey() public function getPlainForeignKey()
...@@ -29,7 +28,6 @@ class HasMany extends EloquentHasMany ...@@ -29,7 +28,6 @@ class HasMany extends EloquentHasMany
/** /**
* Get the key for comparing against the parent key in "has" query. * Get the key for comparing against the parent key in "has" query.
*
* @return string * @return string
*/ */
public function getHasCompareKey() public function getHasCompareKey()
...@@ -49,9 +47,8 @@ class HasMany extends EloquentHasMany ...@@ -49,9 +47,8 @@ class HasMany extends EloquentHasMany
/** /**
* Add the constraints for a relationship count query. * Add the constraints for a relationship count query.
* * @param Builder $query
* @param Builder $query * @param Builder $parent
* @param Builder $parent
* @return Builder * @return Builder
*/ */
public function getRelationCountQuery(Builder $query, Builder $parent) public function getRelationCountQuery(Builder $query, Builder $parent)
...@@ -63,10 +60,9 @@ class HasMany extends EloquentHasMany ...@@ -63,10 +60,9 @@ class HasMany extends EloquentHasMany
/** /**
* Add the constraints for a relationship query. * Add the constraints for a relationship query.
* * @param Builder $query
* @param Builder $query * @param Builder $parent
* @param Builder $parent * @param array|mixed $columns
* @param array|mixed $columns
* @return Builder * @return Builder
*/ */
public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*']) public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*'])
...@@ -77,4 +73,15 @@ class HasMany extends EloquentHasMany ...@@ -77,4 +73,15 @@ class HasMany extends EloquentHasMany
return $query->where($this->getHasCompareKey(), 'exists', true); return $query->where($this->getHasCompareKey(), 'exists', true);
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/HasOne.php
View file @ 78d7cbdd
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
namespace Jenssegers\Mongodb\Relations; namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Database\Eloquent\Relations\HasOne as EloquentHasOne; use Illuminate\Database\Eloquent\Relations\HasOne as EloquentHasOne;
class HasOne extends EloquentHasOne class HasOne extends EloquentHasOne
{ {
/** /**
* Get the key for comparing against the parent key in "has" query. * Get the key for comparing against the parent key in "has" query.
*
* @return string * @return string
*/ */
public function getForeignKeyName() public function getForeignKeyName()
...@@ -19,7 +19,6 @@ class HasOne extends EloquentHasOne ...@@ -19,7 +19,6 @@ class HasOne extends EloquentHasOne
/** /**
* Get the key for comparing against the parent key in "has" query. * Get the key for comparing against the parent key in "has" query.
*
* @return string * @return string
*/ */
public function getHasCompareKey() public function getHasCompareKey()
...@@ -29,7 +28,6 @@ class HasOne extends EloquentHasOne ...@@ -29,7 +28,6 @@ class HasOne extends EloquentHasOne
/** /**
* Get the plain foreign key. * Get the plain foreign key.
*
* @return string * @return string
*/ */
public function getPlainForeignKey() public function getPlainForeignKey()
...@@ -49,9 +47,8 @@ class HasOne extends EloquentHasOne ...@@ -49,9 +47,8 @@ class HasOne extends EloquentHasOne
/** /**
* Add the constraints for a relationship count query. * Add the constraints for a relationship count query.
* * @param Builder $query
* @param Builder $query * @param Builder $parent
* @param Builder $parent
* @return Builder * @return Builder
*/ */
public function getRelationCountQuery(Builder $query, Builder $parent) public function getRelationCountQuery(Builder $query, Builder $parent)
...@@ -63,10 +60,9 @@ class HasOne extends EloquentHasOne ...@@ -63,10 +60,9 @@ class HasOne extends EloquentHasOne
/** /**
* Add the constraints for a relationship query. * Add the constraints for a relationship query.
* * @param Builder $query
* @param Builder $query * @param Builder $parent
* @param Builder $parent * @param array|mixed $columns
* @param array|mixed $columns
* @return Builder * @return Builder
*/ */
public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*']) public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*'])
...@@ -77,4 +73,15 @@ class HasOne extends EloquentHasOne ...@@ -77,4 +73,15 @@ class HasOne extends EloquentHasOne
return $query->where($this->getForeignKeyName(), 'exists', true); return $query->where($this->getForeignKeyName(), 'exists', true);
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Relations/MorphTo.php
View file @ 78d7cbdd
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace Jenssegers\Mongodb\Relations; namespace Jenssegers\Mongodb\Relations;
use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Database\Eloquent\Relations\MorphTo as EloquentMorphTo; use Illuminate\Database\Eloquent\Relations\MorphTo as EloquentMorphTo;
class MorphTo extends EloquentMorphTo class MorphTo extends EloquentMorphTo
...@@ -35,11 +36,21 @@ class MorphTo extends EloquentMorphTo ...@@ -35,11 +36,21 @@ class MorphTo extends EloquentMorphTo
/** /**
* Get the owner key with backwards compatible support. * Get the owner key with backwards compatible support.
*
* @return string * @return string
*/ */
public function getOwnerKey() public function getOwnerKey()
{ {
return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey; return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey;
} }
/**
* Get the name of the "where in" method for eager loading.
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @return string
*/
protected function whereInMethod(EloquentModel $model, $key)
{
return 'whereIn';
}
} }
src/Jenssegers/Mongodb/Schema/Blueprint.php
View file @ 78d7cbdd
...@@ -8,21 +8,18 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -8,21 +8,18 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
{ {
/** /**
* The MongoConnection object for this blueprint. * The MongoConnection object for this blueprint.
*
* @var \Jenssegers\Mongodb\Connection * @var \Jenssegers\Mongodb\Connection
*/ */
protected $connection; protected $connection;
/** /**
* The MongoCollection object for this blueprint. * The MongoCollection object for this blueprint.
*
* @var \Jenssegers\Mongodb\Collection|\MongoDB\Collection * @var \Jenssegers\Mongodb\Collection|\MongoDB\Collection
*/ */
protected $collection; protected $collection;
/** /**
* Fluent columns. * Fluent columns.
*
* @var array * @var array
*/ */
protected $columns = []; protected $columns = [];
...@@ -77,6 +74,54 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -77,6 +74,54 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
* @inheritdoc * @inheritdoc
*/ */
public function dropIndex($indexOrColumns = null) public function dropIndex($indexOrColumns = null)
{
$indexOrColumns = $this->transformColumns($indexOrColumns);
$this->collection->dropIndex($indexOrColumns);
return $this;
}
/**
* Indicate that the given index should be dropped, but do not fail if it didn't exist.
*
* @param string|array $indexOrColumns
* @return Blueprint
*/
public function dropIndexIfExists($indexOrColumns = null)
{
if ($this->hasIndex($indexOrColumns)) {
$this->dropIndex($indexOrColumns);
}
return $this;
}
/**
* Check whether the given index exists.
*
* @param string|array $indexOrColumns
* @return bool
*/
public function hasIndex($indexOrColumns = null)
{
$indexOrColumns = $this->transformColumns($indexOrColumns);
foreach ($this->collection->listIndexes() as $index) {
if (is_array($indexOrColumns) && in_array($index->getName(), $indexOrColumns)) {
return true;
}
if (is_string($indexOrColumns) && $index->getName() == $indexOrColumns) {
return true;
}
}
return false;
}
/**
* @param string|array $indexOrColumns
* @return string
*/
protected function transformColumns($indexOrColumns)
{ {
if (is_array($indexOrColumns)) { if (is_array($indexOrColumns)) {
$indexOrColumns = $this->fluent($indexOrColumns); $indexOrColumns = $this->fluent($indexOrColumns);
...@@ -88,12 +133,9 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -88,12 +133,9 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
$transform[$column] = $column . '_1'; $transform[$column] = $column . '_1';
} }
$indexOrColumns = join('_', $transform); $indexOrColumns = implode('_', $transform);
} }
return $indexOrColumns;
$this->collection->dropIndex($indexOrColumns);
return $this;
} }
/** /**
...@@ -112,8 +154,7 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -112,8 +154,7 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Specify a non blocking index for the collection. * Specify a non blocking index for the collection.
* * @param string|array $columns
* @param string|array $columns
* @return Blueprint * @return Blueprint
*/ */
public function background($columns = null) public function background($columns = null)
...@@ -127,9 +168,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -127,9 +168,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Specify a sparse index for the collection. * Specify a sparse index for the collection.
* * @param string|array $columns
* @param string|array $columns * @param array $options
* @param array $options
* @return Blueprint * @return Blueprint
*/ */
public function sparse($columns = null, $options = []) public function sparse($columns = null, $options = [])
...@@ -145,10 +185,9 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -145,10 +185,9 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Specify a geospatial index for the collection. * Specify a geospatial index for the collection.
* * @param string|array $columns
* @param string|array $columns * @param string $index
* @param string $index * @param array $options
* @param array $options
* @return Blueprint * @return Blueprint
*/ */
public function geospatial($columns = null, $index = '2d', $options = []) public function geospatial($columns = null, $index = '2d', $options = [])
...@@ -171,9 +210,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -171,9 +210,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Specify the number of seconds after wich a document should be considered expired based, * Specify the number of seconds after wich a document should be considered expired based,
* on the given single-field index containing a date. * on the given single-field index containing a date.
* * @param string|array $columns
* @param string|array $columns * @param int $seconds
* @param int $seconds
* @return Blueprint * @return Blueprint
*/ */
public function expire($columns, $seconds) public function expire($columns, $seconds)
...@@ -218,9 +256,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -218,9 +256,8 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Specify a sparse and unique index for the collection. * Specify a sparse and unique index for the collection.
* * @param string|array $columns
* @param string|array $columns * @param array $options
* @param array $options
* @return Blueprint * @return Blueprint
*/ */
public function sparse_and_unique($columns = null, $options = []) public function sparse_and_unique($columns = null, $options = [])
...@@ -237,13 +274,12 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -237,13 +274,12 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Allow fluent columns. * Allow fluent columns.
* * @param string|array $columns
* @param string|array $columns
* @return string|array * @return string|array
*/ */
protected function fluent($columns = null) protected function fluent($columns = null)
{ {
if (is_null($columns)) { if ($columns === null) {
return $this->columns; return $this->columns;
} elseif (is_string($columns)) { } elseif (is_string($columns)) {
return $this->columns = [$columns]; return $this->columns = [$columns];
...@@ -254,7 +290,6 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint ...@@ -254,7 +290,6 @@ class Blueprint extends \Illuminate\Database\Schema\Blueprint
/** /**
* Allows the use of unsupported schema methods. * Allows the use of unsupported schema methods.
*
* @param $method * @param $method
* @param $args * @param $args
* @return Blueprint * @return Blueprint
......
src/Jenssegers/Mongodb/Schema/Builder.php
View file @ 78d7cbdd
...@@ -33,8 +33,7 @@ class Builder extends \Illuminate\Database\Schema\Builder ...@@ -33,8 +33,7 @@ class Builder extends \Illuminate\Database\Schema\Builder
/** /**
* Determine if the given collection exists. * Determine if the given collection exists.
* * @param string $collection
* @param string $collection
* @return bool * @return bool
*/ */
public function hasCollection($collection) public function hasCollection($collection)
...@@ -60,9 +59,8 @@ class Builder extends \Illuminate\Database\Schema\Builder ...@@ -60,9 +59,8 @@ class Builder extends \Illuminate\Database\Schema\Builder
/** /**
* Modify a collection on the schema. * Modify a collection on the schema.
* * @param string $collection
* @param string $collection * @param Closure $callback
* @param Closure $callback
* @return bool * @return bool
*/ */
public function collection($collection, Closure $callback) public function collection($collection, Closure $callback)
...@@ -85,11 +83,11 @@ class Builder extends \Illuminate\Database\Schema\Builder ...@@ -85,11 +83,11 @@ class Builder extends \Illuminate\Database\Schema\Builder
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function create($collection, Closure $callback = null) public function create($collection, Closure $callback = null, array $options = [])
{ {
$blueprint = $this->createBlueprint($collection); $blueprint = $this->createBlueprint($collection);
$blueprint->create(); $blueprint->create($options);
if ($callback) { if ($callback) {
$callback($blueprint); $callback($blueprint);
...@@ -138,7 +136,6 @@ class Builder extends \Illuminate\Database\Schema\Builder ...@@ -138,7 +136,6 @@ class Builder extends \Illuminate\Database\Schema\Builder
/** /**
* Get all of the collections names for the database. * Get all of the collections names for the database.
*
* @return array * @return array
*/ */
protected function getAllCollections() protected function getAllCollections()
......
src/Jenssegers/Mongodb/Validation/DatabasePresenceVerifier.php
View file @ 78d7cbdd
...@@ -6,20 +6,19 @@ class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVe ...@@ -6,20 +6,19 @@ class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVe
{ {
/** /**
* Count the number of objects in a collection having the given value. * Count the number of objects in a collection having the given value.
* * @param string $collection
* @param string $collection * @param string $column
* @param string $column * @param string $value
* @param string $value * @param int $excludeId
* @param int $excludeId * @param string $idColumn
* @param string $idColumn * @param array $extra
* @param array $extra
* @return int * @return int
*/ */
public function getCount($collection, $column, $value, $excludeId = null, $idColumn = null, array $extra = []) public function getCount($collection, $column, $value, $excludeId = null, $idColumn = null, array $extra = [])
{ {
$query = $this->table($collection)->where($column, 'regex', "/$value/i"); $query = $this->table($collection)->where($column, 'regex', "/$value/i");
if (!is_null($excludeId) && $excludeId != 'NULL') { if ($excludeId !== null && $excludeId != 'NULL') {
$query->where($idColumn ?: 'id', '<>', $excludeId); $query->where($idColumn ?: 'id', '<>', $excludeId);
} }
...@@ -32,11 +31,10 @@ class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVe ...@@ -32,11 +31,10 @@ class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVe
/** /**
* Count the number of objects in a collection with the given values. * Count the number of objects in a collection with the given values.
* * @param string $collection
* @param string $collection * @param string $column
* @param string $column * @param array $values
* @param array $values * @param array $extra
* @param array $extra
* @return int * @return int
*/ */
public function getMultiCount($collection, $column, array $values, array $extra = []) public function getMultiCount($collection, $column, array $values, array $extra = [])
......
tests/AuthTest.php
View file @ 78d7cbdd
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
use Illuminate\Auth\Passwords\PasswordBroker; use Illuminate\Auth\Passwords\PasswordBroker;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use MongoDB\BSON\UTCDateTime;
class AuthTest extends TestCase class AuthTest extends TestCase
{ {
public function tearDown() public function tearDown(): void
{ {
parent::setUp();
User::truncate(); User::truncate();
DB::collection('password_reminders')->truncate(); DB::collection('password_reminders')->truncate();
} }
...@@ -14,8 +16,8 @@ class AuthTest extends TestCase ...@@ -14,8 +16,8 @@ class AuthTest extends TestCase
public function testAuthAttempt() public function testAuthAttempt()
{ {
$user = User::create([ $user = User::create([
'name' => 'John Doe', 'name' => 'John Doe',
'email' => 'john@doe.com', 'email' => 'john@doe.com',
'password' => Hash::make('foobar'), 'password' => Hash::make('foobar'),
]); ]);
...@@ -26,6 +28,7 @@ class AuthTest extends TestCase ...@@ -26,6 +28,7 @@ class AuthTest extends TestCase
public function testRemindOld() public function testRemindOld()
{ {
if (Application::VERSION >= '5.2') { if (Application::VERSION >= '5.2') {
$this->expectNotToPerformAssertions();
return; return;
} }
...@@ -36,8 +39,8 @@ class AuthTest extends TestCase ...@@ -36,8 +39,8 @@ class AuthTest extends TestCase
$broker = new PasswordBroker($tokens, $users, $mailer, ''); $broker = new PasswordBroker($tokens, $users, $mailer, '');
$user = User::create([ $user = User::create([
'name' => 'John Doe', 'name' => 'John Doe',
'email' => 'john@doe.com', 'email' => 'john@doe.com',
'password' => Hash::make('foobar'), 'password' => Hash::make('foobar'),
]); ]);
...@@ -48,13 +51,13 @@ class AuthTest extends TestCase ...@@ -48,13 +51,13 @@ class AuthTest extends TestCase
$reminder = DB::collection('password_resets')->first(); $reminder = DB::collection('password_resets')->first();
$this->assertEquals('john@doe.com', $reminder['email']); $this->assertEquals('john@doe.com', $reminder['email']);
$this->assertNotNull($reminder['token']); $this->assertNotNull($reminder['token']);
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $reminder['created_at']); $this->assertInstanceOf(UTCDateTime::class, $reminder['created_at']);
$credentials = [ $credentials = [
'email' => 'john@doe.com', 'email' => 'john@doe.com',
'password' => 'foobar', 'password' => 'foobar',
'password_confirmation' => 'foobar', 'password_confirmation' => 'foobar',
'token' => $reminder['token'], 'token' => $reminder['token'],
]; ];
$response = $broker->reset($credentials, function ($user, $password) { $response = $broker->reset($credentials, function ($user, $password) {
......
tests/CollectionTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Jenssegers\Mongodb\Connection;
use Jenssegers\Mongodb\Collection; use Jenssegers\Mongodb\Collection;
use MongoDB\Collection as MongoCollection; use Jenssegers\Mongodb\Connection;
use MongoDB\BSON\ObjectID; use MongoDB\BSON\ObjectID;
use MongoDB\Collection as MongoCollection;
class CollectionTest extends TestCase class CollectionTest extends TestCase
{ {
......
tests/ConnectionTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Illuminate\Support\Facades\DB;
class ConnectionTest extends TestCase class ConnectionTest extends TestCase
{ {
public function testConnection() public function testConnection()
{ {
$connection = DB::connection('mongodb'); $connection = DB::connection('mongodb');
$this->assertInstanceOf('Jenssegers\Mongodb\Connection', $connection); $this->assertInstanceOf(\Jenssegers\Mongodb\Connection::class, $connection);
} }
public function testReconnect() public function testReconnect()
...@@ -23,28 +26,28 @@ class ConnectionTest extends TestCase ...@@ -23,28 +26,28 @@ class ConnectionTest extends TestCase
public function testDb() public function testDb()
{ {
$connection = DB::connection('mongodb'); $connection = DB::connection('mongodb');
$this->assertInstanceOf('MongoDB\Database', $connection->getMongoDB()); $this->assertInstanceOf(\MongoDB\Database::class, $connection->getMongoDB());
$connection = DB::connection('mongodb'); $connection = DB::connection('mongodb');
$this->assertInstanceOf('MongoDB\Client', $connection->getMongoClient()); $this->assertInstanceOf(\MongoDB\Client::class, $connection->getMongoClient());
} }
public function testCollection() public function testCollection()
{ {
$collection = DB::connection('mongodb')->getCollection('unittest'); $collection = DB::connection('mongodb')->getCollection('unittest');
$this->assertInstanceOf('Jenssegers\Mongodb\Collection', $collection); $this->assertInstanceOf(Jenssegers\Mongodb\Collection::class, $collection);
$collection = DB::connection('mongodb')->collection('unittests'); $collection = DB::connection('mongodb')->collection('unittests');
$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', $collection); $this->assertInstanceOf(Jenssegers\Mongodb\Query\Builder::class, $collection);
$collection = DB::connection('mongodb')->table('unittests'); $collection = DB::connection('mongodb')->table('unittests');
$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', $collection); $this->assertInstanceOf(Jenssegers\Mongodb\Query\Builder::class, $collection);
} }
// public function testDynamic() // public function testDynamic()
// { // {
// $dbs = DB::connection('mongodb')->listCollections(); // $dbs = DB::connection('mongodb')->listCollections();
// $this->assertInternalType('array', $dbs); // $this->assertIsArray($dbs);
// } // }
// public function testMultipleConnections() // public function testMultipleConnections()
...@@ -87,7 +90,7 @@ class ConnectionTest extends TestCase ...@@ -87,7 +90,7 @@ class ConnectionTest extends TestCase
public function testSchemaBuilder() public function testSchemaBuilder()
{ {
$schema = DB::connection('mongodb')->getSchemaBuilder(); $schema = DB::connection('mongodb')->getSchemaBuilder();
$this->assertInstanceOf('Jenssegers\Mongodb\Schema\Builder', $schema); $this->assertInstanceOf(\Jenssegers\Mongodb\Schema\Builder::class, $schema);
} }
public function testDriverName() public function testDriverName()
......
tests/DsnTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
class DsnTest extends TestCase class DsnTest extends TestCase
{ {
......
tests/EmbeddedRelationsTest.php
View file @ 78d7cbdd
This diff is collapsed.
tests/GeospatialTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
class GeospatialTest extends TestCase class GeospatialTest extends TestCase
{ {
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -43,7 +44,7 @@ class GeospatialTest extends TestCase ...@@ -43,7 +44,7 @@ class GeospatialTest extends TestCase
]); ]);
} }
public function tearDown() public function tearDown(): void
{ {
Schema::drop('locations'); Schema::drop('locations');
} }
...@@ -53,28 +54,30 @@ class GeospatialTest extends TestCase ...@@ -53,28 +54,30 @@ class GeospatialTest extends TestCase
$locations = Location::where('location', 'geoWithin', [ $locations = Location::where('location', 'geoWithin', [
'$geometry' => [ '$geometry' => [
'type' => 'Polygon', 'type' => 'Polygon',
'coordinates' => [[ 'coordinates' => [
[
-0.1450383,
51.5069158,
],
[
-0.1367563,
51.5100913,
],
[
-0.1270247,
51.5013233,
],
[
-0.1460866,
51.4952136,
],
[ [
-0.1450383, [
51.5069158, -0.1450383,
51.5069158,
],
[
-0.1367563,
51.5100913,
],
[
-0.1270247,
51.5013233,
],
[
-0.1460866,
51.4952136,
],
[
-0.1450383,
51.5069158,
],
], ],
]], ],
], ],
]); ]);
...@@ -104,7 +107,7 @@ class GeospatialTest extends TestCase ...@@ -104,7 +107,7 @@ class GeospatialTest extends TestCase
51.5078646, 51.5078646,
], ],
], ],
] ],
]); ]);
$this->assertEquals(1, $locations->count()); $this->assertEquals(1, $locations->count());
......
tests/HybridRelationsTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Illuminate\Database\MySqlConnection;
class HybridRelationsTest extends TestCase class HybridRelationsTest extends TestCase
{ {
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -11,7 +14,7 @@ class HybridRelationsTest extends TestCase ...@@ -11,7 +14,7 @@ class HybridRelationsTest extends TestCase
MysqlRole::executeSchema(); MysqlRole::executeSchema();
} }
public function tearDown() public function tearDown(): void
{ {
MysqlUser::truncate(); MysqlUser::truncate();
MysqlBook::truncate(); MysqlBook::truncate();
...@@ -21,13 +24,13 @@ class HybridRelationsTest extends TestCase ...@@ -21,13 +24,13 @@ class HybridRelationsTest extends TestCase
public function testMysqlRelations() public function testMysqlRelations()
{ {
$user = new MysqlUser; $user = new MysqlUser;
$this->assertInstanceOf('MysqlUser', $user); $this->assertInstanceOf(MysqlUser::class, $user);
$this->assertInstanceOf('Illuminate\Database\MySqlConnection', $user->getConnection()); $this->assertInstanceOf(MySqlConnection::class, $user->getConnection());
// Mysql User // Mysql User
$user->name = "John Doe"; $user->name = "John Doe";
$user->save(); $user->save();
$this->assertInternalType('int', $user->id); $this->assertIsInt($user->id);
// SQL has many // SQL has many
$book = new Book(['title' => 'Game of Thrones']); $book = new Book(['title' => 'Game of Thrones']);
...@@ -79,10 +82,10 @@ class HybridRelationsTest extends TestCase ...@@ -79,10 +82,10 @@ class HybridRelationsTest extends TestCase
{ {
$user = new MysqlUser; $user = new MysqlUser;
$otherUser = new MysqlUser; $otherUser = new MysqlUser;
$this->assertInstanceOf('MysqlUser', $user); $this->assertInstanceOf(MysqlUser::class, $user);
$this->assertInstanceOf('Illuminate\Database\MySqlConnection', $user->getConnection()); $this->assertInstanceOf(MySqlConnection::class, $user->getConnection());
$this->assertInstanceOf('MysqlUser', $otherUser); $this->assertInstanceOf(MysqlUser::class, $otherUser);
$this->assertInstanceOf('Illuminate\Database\MySqlConnection', $otherUser->getConnection()); $this->assertInstanceOf(MySqlConnection::class, $otherUser->getConnection());
//MySql User //MySql User
$user->name = "John Doe"; $user->name = "John Doe";
...@@ -93,8 +96,8 @@ class HybridRelationsTest extends TestCase ...@@ -93,8 +96,8 @@ class HybridRelationsTest extends TestCase
$otherUser->id = 3; $otherUser->id = 3;
$otherUser->save(); $otherUser->save();
// Make sure they are created // Make sure they are created
$this->assertInternalType('int', $user->id); $this->assertIsInt($user->id);
$this->assertInternalType('int', $otherUser->id); $this->assertIsInt($otherUser->id);
// Clear to start // Clear to start
$user->books()->truncate(); $user->books()->truncate();
$otherUser->books()->truncate(); $otherUser->books()->truncate();
...@@ -133,10 +136,10 @@ class HybridRelationsTest extends TestCase ...@@ -133,10 +136,10 @@ class HybridRelationsTest extends TestCase
{ {
$user = new MysqlUser; $user = new MysqlUser;
$otherUser = new MysqlUser; $otherUser = new MysqlUser;
$this->assertInstanceOf('MysqlUser', $user); $this->assertInstanceOf(MysqlUser::class, $user);
$this->assertInstanceOf('Illuminate\Database\MySqlConnection', $user->getConnection()); $this->assertInstanceOf(MySqlConnection::class, $user->getConnection());
$this->assertInstanceOf('MysqlUser', $otherUser); $this->assertInstanceOf(MysqlUser::class, $otherUser);
$this->assertInstanceOf('Illuminate\Database\MySqlConnection', $otherUser->getConnection()); $this->assertInstanceOf(MySqlConnection::class, $otherUser->getConnection());
//MySql User //MySql User
$user->name = "John Doe"; $user->name = "John Doe";
...@@ -147,8 +150,8 @@ class HybridRelationsTest extends TestCase ...@@ -147,8 +150,8 @@ class HybridRelationsTest extends TestCase
$otherUser->id = 3; $otherUser->id = 3;
$otherUser->save(); $otherUser->save();
// Make sure they are created // Make sure they are created
$this->assertInternalType('int', $user->id); $this->assertIsInt($user->id);
$this->assertInternalType('int', $otherUser->id); $this->assertIsInt($otherUser->id);
// Clear to start // Clear to start
Book::truncate(); Book::truncate();
MysqlBook::truncate(); MysqlBook::truncate();
......
tests/ModelTest.php
View file @ 78d7cbdd
This diff is collapsed.
tests/QueryBuilderTest.php
View file @ 78d7cbdd
This diff is collapsed.
tests/QueryTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
class QueryTest extends TestCase class QueryTest extends TestCase
{ {
protected static $started = false; protected static $started = false;
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
User::create(['name' => 'John Doe', 'age' => 35, 'title' => 'admin']); User::create(['name' => 'John Doe', 'age' => 35, 'title' => 'admin']);
...@@ -18,13 +19,14 @@ class QueryTest extends TestCase ...@@ -18,13 +19,14 @@ class QueryTest extends TestCase
User::create(['name' => 'Error', 'age' => null, 'title' => null]); User::create(['name' => 'Error', 'age' => null, 'title' => null]);
} }
public function tearDown() public function tearDown(): void
{ {
User::truncate(); User::truncate();
Scoped::truncate();
parent::tearDown(); parent::tearDown();
} }
public function testWhere() public function testWhere(): void
{ {
$users = User::where('age', 35)->get(); $users = User::where('age', 35)->get();
$this->assertCount(3, $users); $this->assertCount(3, $users);
...@@ -45,7 +47,7 @@ class QueryTest extends TestCase ...@@ -45,7 +47,7 @@ class QueryTest extends TestCase
$this->assertCount(6, $users); $this->assertCount(6, $users);
} }
public function testAndWhere() public function testAndWhere(): void
{ {
$users = User::where('age', 35)->where('title', 'admin')->get(); $users = User::where('age', 35)->where('title', 'admin')->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
...@@ -54,7 +56,7 @@ class QueryTest extends TestCase ...@@ -54,7 +56,7 @@ class QueryTest extends TestCase
$this->assertCount(2, $users); $this->assertCount(2, $users);
} }
public function testLike() public function testLike(): void
{ {
$users = User::where('name', 'like', '%doe')->get(); $users = User::where('name', 'like', '%doe')->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
...@@ -69,7 +71,22 @@ class QueryTest extends TestCase ...@@ -69,7 +71,22 @@ class QueryTest extends TestCase
$this->assertCount(1, $users); $this->assertCount(1, $users);
} }
public function testSelect() public function testNotLike(): void
{
$users = User::where('name', 'not like', '%doe')->get();
$this->assertCount(7, $users);
$users = User::where('name', 'not like', '%y%')->get();
$this->assertCount(6, $users);
$users = User::where('name', 'not LIKE', '%y%')->get();
$this->assertCount(6, $users);
$users = User::where('name', 'not like', 't%')->get();
$this->assertCount(8, $users);
}
public function testSelect(): void
{ {
$user = User::where('name', 'John Doe')->select('name')->first(); $user = User::where('name', 'John Doe')->select('name')->first();
...@@ -95,7 +112,7 @@ class QueryTest extends TestCase ...@@ -95,7 +112,7 @@ class QueryTest extends TestCase
$this->assertNull($user->age); $this->assertNull($user->age);
} }
public function testOrWhere() public function testOrWhere(): void
{ {
$users = User::where('age', 13)->orWhere('title', 'admin')->get(); $users = User::where('age', 13)->orWhere('title', 'admin')->get();
$this->assertCount(4, $users); $this->assertCount(4, $users);
...@@ -104,7 +121,7 @@ class QueryTest extends TestCase ...@@ -104,7 +121,7 @@ class QueryTest extends TestCase
$this->assertCount(2, $users); $this->assertCount(2, $users);
} }
public function testBetween() public function testBetween(): void
{ {
$users = User::whereBetween('age', [0, 25])->get(); $users = User::whereBetween('age', [0, 25])->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
...@@ -117,7 +134,7 @@ class QueryTest extends TestCase ...@@ -117,7 +134,7 @@ class QueryTest extends TestCase
$this->assertCount(6, $users); $this->assertCount(6, $users);
} }
public function testIn() public function testIn(): void
{ {
$users = User::whereIn('age', [13, 23])->get(); $users = User::whereIn('age', [13, 23])->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
...@@ -129,23 +146,23 @@ class QueryTest extends TestCase ...@@ -129,23 +146,23 @@ class QueryTest extends TestCase
$this->assertCount(4, $users); $this->assertCount(4, $users);
$users = User::whereNotNull('age') $users = User::whereNotNull('age')
->whereNotIn('age', [33, 35])->get(); ->whereNotIn('age', [33, 35])->get();
$this->assertCount(3, $users); $this->assertCount(3, $users);
} }
public function testWhereNull() public function testWhereNull(): void
{ {
$users = User::whereNull('age')->get(); $users = User::whereNull('age')->get();
$this->assertCount(1, $users); $this->assertCount(1, $users);
} }
public function testWhereNotNull() public function testWhereNotNull(): void
{ {
$users = User::whereNotNull('age')->get(); $users = User::whereNotNull('age')->get();
$this->assertCount(8, $users); $this->assertCount(8, $users);
} }
public function testOrder() public function testOrder(): void
{ {
$user = User::whereNotNull('age')->orderBy('age', 'asc')->first(); $user = User::whereNotNull('age')->orderBy('age', 'asc')->first();
$this->assertEquals(13, $user->age); $this->assertEquals(13, $user->age);
...@@ -166,7 +183,7 @@ class QueryTest extends TestCase ...@@ -166,7 +183,7 @@ class QueryTest extends TestCase
$this->assertEquals(35, $user->age); $this->assertEquals(35, $user->age);
} }
public function testGroupBy() public function testGroupBy(): void
{ {
$users = User::groupBy('title')->get(); $users = User::groupBy('title')->get();
$this->assertCount(3, $users); $this->assertCount(3, $users);
...@@ -196,7 +213,7 @@ class QueryTest extends TestCase ...@@ -196,7 +213,7 @@ class QueryTest extends TestCase
$this->assertNotNull($users[0]->name); $this->assertNotNull($users[0]->name);
} }
public function testCount() public function testCount(): void
{ {
$count = User::where('age', '<>', 35)->count(); $count = User::where('age', '<>', 35)->count();
$this->assertEquals(6, $count); $this->assertEquals(6, $count);
...@@ -206,17 +223,17 @@ class QueryTest extends TestCase ...@@ -206,17 +223,17 @@ class QueryTest extends TestCase
$this->assertEquals(6, $count); $this->assertEquals(6, $count);
} }
public function testExists() public function testExists(): void
{ {
$this->assertFalse(User::where('age', '>', 37)->exists()); $this->assertFalse(User::where('age', '>', 37)->exists());
$this->assertTrue(User::where('age', '<', 37)->exists()); $this->assertTrue(User::where('age', '<', 37)->exists());
} }
public function testSubquery() public function testSubQuery(): void
{ {
$users = User::where('title', 'admin')->orWhere(function ($query) { $users = User::where('title', 'admin')->orWhere(function ($query) {
$query->where('name', 'Tommy Toe') $query->where('name', 'Tommy Toe')
->orWhere('name', 'Error'); ->orWhere('name', 'Error');
}) })
->get(); ->get();
...@@ -224,7 +241,7 @@ class QueryTest extends TestCase ...@@ -224,7 +241,7 @@ class QueryTest extends TestCase
$users = User::where('title', 'user')->where(function ($query) { $users = User::where('title', 'user')->where(function ($query) {
$query->where('age', 35) $query->where('age', 35)
->orWhere('name', 'like', '%harry%'); ->orWhere('name', 'like', '%harry%');
}) })
->get(); ->get();
...@@ -232,36 +249,36 @@ class QueryTest extends TestCase ...@@ -232,36 +249,36 @@ class QueryTest extends TestCase
$users = User::where('age', 35)->orWhere(function ($query) { $users = User::where('age', 35)->orWhere(function ($query) {
$query->where('title', 'admin') $query->where('title', 'admin')
->orWhere('name', 'Error'); ->orWhere('name', 'Error');
}) })
->get(); ->get();
$this->assertCount(5, $users); $this->assertCount(5, $users);
$users = User::whereNull('deleted_at') $users = User::whereNull('deleted_at')
->where('title', 'admin') ->where('title', 'admin')
->where(function ($query) { ->where(function ($query) {
$query->where('age', '>', 15) $query->where('age', '>', 15)
->orWhere('name', 'Harry Hoe'); ->orWhere('name', 'Harry Hoe');
}) })
->get(); ->get();
$this->assertEquals(3, $users->count()); $this->assertEquals(3, $users->count());
$users = User::whereNull('deleted_at') $users = User::whereNull('deleted_at')
->where(function ($query) { ->where(function ($query) {
$query->where('name', 'Harry Hoe') $query->where('name', 'Harry Hoe')
->orWhere(function ($query) { ->orWhere(function ($query) {
$query->where('age', '>', 15) $query->where('age', '>', 15)
->where('title', '<>', 'admin'); ->where('title', '<>', 'admin');
}); });
}) })
->get(); ->get();
$this->assertEquals(5, $users->count()); $this->assertEquals(5, $users->count());
} }
public function testWhereRaw() public function testWhereRaw(): void
{ {
$where = ['age' => ['$gt' => 30, '$lt' => 40]]; $where = ['age' => ['$gt' => 30, '$lt' => 40]];
$users = User::whereRaw($where)->get(); $users = User::whereRaw($where)->get();
...@@ -269,34 +286,34 @@ class QueryTest extends TestCase ...@@ -269,34 +286,34 @@ class QueryTest extends TestCase
$this->assertCount(6, $users); $this->assertCount(6, $users);
$where1 = ['age' => ['$gt' => 30, '$lte' => 35]]; $where1 = ['age' => ['$gt' => 30, '$lte' => 35]];
$where2 = ['age' => ['$gt' => 35, '$lt' => 40]]; $where2 = ['age' => ['$gt' => 35, '$lt' => 40]];
$users = User::whereRaw($where1)->orWhereRaw($where2)->get(); $users = User::whereRaw($where1)->orWhereRaw($where2)->get();
$this->assertCount(6, $users); $this->assertCount(6, $users);
} }
public function testMultipleOr() public function testMultipleOr(): void
{ {
$users = User::where(function ($query) { $users = User::where(function ($query) {
$query->where('age', 35)->orWhere('age', 33); $query->where('age', 35)->orWhere('age', 33);
}) })
->where(function ($query) { ->where(function ($query) {
$query->where('name', 'John Doe')->orWhere('name', 'Jane Doe'); $query->where('name', 'John Doe')->orWhere('name', 'Jane Doe');
})->get(); })->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
$users = User::where(function ($query) { $users = User::where(function ($query) {
$query->orWhere('age', 35)->orWhere('age', 33); $query->orWhere('age', 35)->orWhere('age', 33);
}) })
->where(function ($query) { ->where(function ($query) {
$query->orWhere('name', 'John Doe')->orWhere('name', 'Jane Doe'); $query->orWhere('name', 'John Doe')->orWhere('name', 'Jane Doe');
})->get(); })->get();
$this->assertCount(2, $users); $this->assertCount(2, $users);
} }
public function testPaginate() public function testPaginate(): void
{ {
$results = User::paginate(2); $results = User::paginate(2);
$this->assertEquals(2, $results->count()); $this->assertEquals(2, $results->count());
...@@ -309,4 +326,21 @@ class QueryTest extends TestCase ...@@ -309,4 +326,21 @@ class QueryTest extends TestCase
$this->assertEquals(9, $results->total()); $this->assertEquals(9, $results->total());
$this->assertEquals(1, $results->currentPage()); $this->assertEquals(1, $results->currentPage());
} }
public function testUpdate(): void
{
$this->assertEquals(1, User::where(['name' => 'John Doe'])->update(['name' => 'Jim Morrison']));
$this->assertEquals(1, User::where(['name' => 'Jim Morrison'])->count());
Scoped::create(['favorite' => true]);
Scoped::create(['favorite' => false]);
$this->assertCount(1, Scoped::get());
$this->assertEquals(1, Scoped::query()->update(['name' => 'Johnny']));
$this->assertCount(1, Scoped::withoutGlobalScopes()->where(['name' => 'Johnny'])->get());
$this->assertCount(2, Scoped::withoutGlobalScopes()->get());
$this->assertEquals(2, Scoped::withoutGlobalScopes()->update(['name' => 'Jimmy']));
$this->assertCount(2, Scoped::withoutGlobalScopes()->where(['name' => 'Jimmy'])->get());
}
} }
tests/QueueTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
class QueueTest extends TestCase class QueueTest extends TestCase
{ {
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -11,7 +14,7 @@ class QueueTest extends TestCase ...@@ -11,7 +14,7 @@ class QueueTest extends TestCase
Queue::getDatabase()->table(Config::get('queue.failed.table'))->truncate(); Queue::getDatabase()->table(Config::get('queue.failed.table'))->truncate();
} }
public function testQueueJobLifeCycle() public function testQueueJobLifeCycle(): void
{ {
$id = Queue::push('test', ['action' => 'QueueJobLifeCycle'], 'test'); $id = Queue::push('test', ['action' => 'QueueJobLifeCycle'], 'test');
$this->assertNotNull($id); $this->assertNotNull($id);
...@@ -24,6 +27,7 @@ class QueueTest extends TestCase ...@@ -24,6 +27,7 @@ class QueueTest extends TestCase
'displayName' => 'test', 'displayName' => 'test',
'job' => 'test', 'job' => 'test',
'maxTries' => null, 'maxTries' => null,
'delay' => null,
'timeout' => null, 'timeout' => null,
'data' => ['action' => 'QueueJobLifeCycle'], 'data' => ['action' => 'QueueJobLifeCycle'],
]), $job->getRawBody()); ]), $job->getRawBody());
...@@ -33,7 +37,7 @@ class QueueTest extends TestCase ...@@ -33,7 +37,7 @@ class QueueTest extends TestCase
$this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count()); $this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count());
} }
public function testQueueJobExpired() public function testQueueJobExpired(): void
{ {
$id = Queue::push('test', ['action' => 'QueueJobExpired'], 'test'); $id = Queue::push('test', ['action' => 'QueueJobExpired'], 'test');
$this->assertNotNull($id); $this->assertNotNull($id);
...@@ -53,4 +57,38 @@ class QueueTest extends TestCase ...@@ -53,4 +57,38 @@ class QueueTest extends TestCase
$job->delete(); $job->delete();
$this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count()); $this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count());
} }
public function testFailQueueJob(): void
{
$provider = app('queue.failer');
$this->assertInstanceOf(MongoFailedJobProvider::class, $provider);
}
public function testFindFailJobNull(): void
{
Config::set('queue.failed.database', 'mongodb');
$provider = app('queue.failer');
$this->assertNull($provider->find(1));
}
public function testIncrementAttempts(): void
{
$job_id = Queue::push('test1', ['action' => 'QueueJobExpired'], 'test');
$this->assertNotNull($job_id);
$job_id = Queue::push('test2', ['action' => 'QueueJobExpired'], 'test');
$this->assertNotNull($job_id);
$job = Queue::pop('test');
$this->assertEquals(1, $job->attempts());
$job->delete();
$others_jobs = Queue::getDatabase()
->table(Config::get('queue.connections.database.table'))
->get();
$this->assertCount(1, $others_jobs);
$this->assertEquals(0, $others_jobs[0]['attempts']);
}
} }
tests/RelationsTest.php
View file @ 78d7cbdd
This diff is collapsed.
tests/SchemaTest.php
View file @ 78d7cbdd
This diff is collapsed.
tests/SeederTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
class SeederTest extends TestCase class SeederTest extends TestCase
{ {
public function tearDown() public function tearDown(): void
{ {
User::truncate(); User::truncate();
} }
public function testSeed() public function testSeed(): void
{ {
$seeder = new UserTableSeeder; $seeder = new UserTableSeeder;
$seeder->run(); $seeder->run();
...@@ -16,7 +17,7 @@ class SeederTest extends TestCase ...@@ -16,7 +17,7 @@ class SeederTest extends TestCase
$this->assertTrue($user->seed); $this->assertTrue($user->seed);
} }
public function testArtisan() public function testArtisan(): void
{ {
Artisan::call('db:seed'); Artisan::call('db:seed');
......
tests/TestCase.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
class TestCase extends Orchestra\Testbench\TestCase class TestCase extends Orchestra\Testbench\TestCase
{ {
/** /**
* Get application providers. * Get application providers.
* * @param \Illuminate\Foundation\Application $app
* @param \Illuminate\Foundation\Application $app
*
* @return array * @return array
*/ */
protected function getApplicationProviders($app) protected function getApplicationProviders($app)
{ {
$providers = parent::getApplicationProviders($app); $providers = parent::getApplicationProviders($app);
unset($providers[array_search('Illuminate\Auth\Passwords\PasswordResetServiceProvider', $providers)]); unset($providers[array_search(PasswordResetServiceProvider::class, $providers)]);
return $providers; return $providers;
} }
/** /**
* Get package providers. * Get package providers.
* * @param \Illuminate\Foundation\Application $app
* @param \Illuminate\Foundation\Application $app
* @return array * @return array
*/ */
protected function getPackageProviders($app) protected function getPackageProviders($app)
{ {
return [ return [
Jenssegers\Mongodb\MongodbServiceProvider::class, Jenssegers\Mongodb\MongodbServiceProvider::class,
Jenssegers\Mongodb\MongodbQueueServiceProvider::class,
Jenssegers\Mongodb\Auth\PasswordResetServiceProvider::class, Jenssegers\Mongodb\Auth\PasswordResetServiceProvider::class,
Jenssegers\Mongodb\Validation\ValidationServiceProvider::class Jenssegers\Mongodb\Validation\ValidationServiceProvider::class,
]; ];
} }
/** /**
* Define environment setup. * Define environment setup.
* * @param Illuminate\Foundation\Application $app
* @param Illuminate\Foundation\Application $app
* @return void * @return void
*/ */
protected function getEnvironmentSetUp($app) protected function getEnvironmentSetUp($app)
...@@ -51,6 +51,7 @@ class TestCase extends Orchestra\Testbench\TestCase ...@@ -51,6 +51,7 @@ class TestCase extends Orchestra\Testbench\TestCase
$app['config']->set('database.default', 'mongodb'); $app['config']->set('database.default', 'mongodb');
$app['config']->set('database.connections.mysql', $config['connections']['mysql']); $app['config']->set('database.connections.mysql', $config['connections']['mysql']);
$app['config']->set('database.connections.mongodb', $config['connections']['mongodb']); $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']);
$app['config']->set('database.connections.mongodb2', $config['connections']['mongodb']);
$app['config']->set('database.connections.dsn_mongodb', $config['connections']['dsn_mongodb']); $app['config']->set('database.connections.dsn_mongodb', $config['connections']['dsn_mongodb']);
$app['config']->set('auth.model', 'User'); $app['config']->set('auth.model', 'User');
...@@ -60,9 +61,10 @@ class TestCase extends Orchestra\Testbench\TestCase ...@@ -60,9 +61,10 @@ class TestCase extends Orchestra\Testbench\TestCase
$app['config']->set('queue.default', 'database'); $app['config']->set('queue.default', 'database');
$app['config']->set('queue.connections.database', [ $app['config']->set('queue.connections.database', [
'driver' => 'mongodb', 'driver' => 'mongodb',
'table' => 'jobs', 'table' => 'jobs',
'queue' => 'default', 'queue' => 'default',
'expire' => 60, 'expire' => 60,
]); ]);
$app['config']->set('queue.failed.database', 'mongodb2');
} }
} }
tests/ValidationTest.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
class ValidationTest extends TestCase class ValidationTest extends TestCase
{ {
public function tearDown() public function tearDown(): void
{ {
User::truncate(); User::truncate();
} }
public function testUnique() public function testUnique(): void
{ {
$validator = Validator::make( $validator = Validator::make(
['name' => 'John Doe'], ['name' => 'John Doe'],
...@@ -42,7 +43,7 @@ class ValidationTest extends TestCase ...@@ -42,7 +43,7 @@ class ValidationTest extends TestCase
$this->assertFalse($validator->fails()); $this->assertFalse($validator->fails());
} }
public function testExists() public function testExists(): void
{ {
$validator = Validator::make( $validator = Validator::make(
['name' => 'John Doe'], ['name' => 'John Doe'],
......
tests/config/database.php
View file @ 78d7cbdd
<?php <?php
$mongoHost = env('MONGO_HOST', 'mongodb');
$mongoPort = env('MONGO_PORT') ? (int) env('MONGO_PORT') : 27017;
return [ return [
'connections' => [ 'connections' => [
'mongodb' => [ 'mongodb' => [
'name' => 'mongodb', 'name' => 'mongodb',
'driver' => 'mongodb', 'driver' => 'mongodb',
'host' => 'mongodb', 'host' => $mongoHost,
'database' => 'unittest', 'database' => env('MONGO_DATABASE', 'unittest'),
], ],
'dsn_mongodb' => [ 'dsn_mongodb' => [
'driver' => 'mongodb', 'driver' => 'mongodb',
'dsn' => 'mongodb://mongodb:27017', 'dsn' => "mongodb://$mongoHost:$mongoPort",
'database' => 'unittest', 'database' => env('MONGO_DATABASE', 'unittest'),
], ],
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => 'mysql', 'host' => env('MYSQL_HOST', 'mysql'),
'database' => 'unittest', 'database' => env('MYSQL_DATABASE', 'unittest'),
'username' => 'root', 'username' => env('MYSQL_USERNAME', 'root'),
'password' => '', 'password' => env('MYSQL_PASSWORD', ''),
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
], ],
], ],
......
tests/config/queue.php
View file @ 78d7cbdd
...@@ -2,22 +2,22 @@ ...@@ -2,22 +2,22 @@
return [ return [
'default' => 'database', 'default' => env('QUEUE_CONNECTION'),
'connections' => [ 'connections' => [
'database' => [ 'database' => [
'driver' => 'mongodb', 'driver' => 'mongodb',
'table' => 'jobs', 'table' => 'jobs',
'queue' => 'default', 'queue' => 'default',
'expire' => 60, 'expire' => 60,
], ],
], ],
'failed' => [ 'failed' => [
'database' => 'mongodb', 'database' => env('MONGO_DATABASE'),
'table' => 'failed_jobs', 'table' => 'failed_jobs',
], ],
]; ];
tests/models/Address.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Book.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Client.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Group.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Item.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Location.php
View file @ 78d7cbdd
<?php <?php
declare(strict_types=1);
use Jenssegers\Mongodb\Eloquent\Model as Eloquent; use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
......
tests/models/MysqlBook.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/MysqlRole.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/MysqlUser.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Photo.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Role.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Scoped.php 0 → 100644
View file @ 78d7cbdd
This diff is collapsed.
tests/models/Soft.php
View file @ 78d7cbdd
This diff is collapsed.
tests/models/User.php
View file @ 78d7cbdd
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment