Skip to content

add collectionName #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reallovelei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add collectionName #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/MongoDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,15 @@ public function setTimestamps(bool $bool)
* @return array
* @throws MongoDBException
*/
public function findOne($filter = [], array $options = [], array $collectionOptions = []): array
public function findOne($filter = [], array $options = [], array $collectionOptions = [], string $collectionName = ''): array
{
try {
/**
* @var $collection MongoDBConnection
*/
$collection = $this->getConnection();
return $collection->findOne($this->collectionName, $filter, $options, $collectionOptions);
$collectionName = empty($this->collectionName) ? $collectionName : $this->collectionName;
return $collection->findOne($collectionName, $filter, $options, $collectionOptions);
} catch (\Exception $e) {
throw new MongoDBException($this->handleErrorMsg($e));
}
Expand All @@ -109,17 +110,19 @@ public function findOne($filter = [], array $options = [], array $collectionOpti
* @param array $filter
* @param array $options
* @param array $collectionOptions
* @param string $collectionName
* @return array
* @throws MongoDBException
*/
public function findAll(array $filter = [], array $options = [], array $collectionOptions = [])
public function findAll(array $filter = [], array $options = [], array $collectionOptions = [], string $collectionName = '')
{
try {
/**
* @var $collection MongoDBConnection
*/
$collection = $this->getConnection();
return $collection->findAll($this->collectionName, $filter, $options, $collectionOptions);
$collectionName = empty($this->collectionName) ? $collectionName : $this->collectionName;
return $collection->findAll($collectionName, $filter, $options, $collectionOptions);
} catch (\Exception $e) {
throw new MongoDBException($this->handleErrorMsg($e));
}
Expand All @@ -129,6 +132,7 @@ public function findAll(array $filter = [], array $options = [], array $collecti
* 返回满足filer的分页数据
*
* @Task(timeout=30)
* @param string $collectionName
* @param int $currentPage
* @param int $limit
* @param array $filter
Expand All @@ -137,14 +141,14 @@ public function findAll(array $filter = [], array $options = [], array $collecti
* @return array
* @throws MongoDBException
*/
public function findPagination(int $currentPage, int $limit, array $filter = [], array $options = [], array $collectionOptions = [])
public function findPagination(string $collectionName, int $currentPage, int $limit, array $filter = [], array $options = [], array $collectionOptions = [])
{
try {
/**
* @var $collection MongoDBConnection
*/
$collection = $this->getConnection();
return $collection->findPagination($this->collectionName, $currentPage, $limit, $filter, $options, $collectionOptions);
return $collection->findPagination($collectionName, $currentPage, $limit, $filter, $options, $collectionOptions);
} catch (\Exception $e) {
throw new MongoDBException($this->handleErrorMsg($e));
}
Expand Down Expand Up @@ -480,17 +484,19 @@ public function distinct(string $fieldName, $filter = [], array $options = [], a
* @param array $pipeline
* @param array $options
* @param array $collectionOptions
* @param string $collectionName
* @return \Traversable
* @throws MongoDBException
*/
public function aggregate(array $pipeline = [], array $options = [], array $collectionOptions = [])
public function aggregate( array $pipeline = [], array $options = [], array $collectionOptions = [], string $collectionName = '')
{
try {
/**
* @var $collection MongoDBConnection
*/
$collection = $this->getConnection();
return $collection->aggregate($this->collectionName, $pipeline, $options, $collectionOptions);
$collectionName = empty($this->collectionName) ? $collectionName : $this->collectionName;
return $collection->aggregate($collectionName, $pipeline, $options, $collectionOptions);
} catch (\Exception $e) {
throw new MongoDBException($this->handleErrorMsg($e));
}
Expand Down