Skip to content

Commit 043d179

Browse files
fix database access pagination error
1 parent 570739d commit 043d179

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/Capsule/CommandHelper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ class CommandHelper
3535
*/
3636
public function __construct($conn = null)
3737
{
38-
$instance = "Tamedevelopers\Database\DB";
39-
if(class_exists($instance) && is_null($conn)){
40-
$conn = $instance::connection();
38+
$dbInstance = "\Tamedevelopers\Database\DB";
39+
if(!is_null($conn) && $conn instanceof $dbInstance){
40+
$conn = $dbInstance::connection();
4141
}
4242

4343
$this->conn = $conn;

src/Collections/Traits/CollectionTrait.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
use Traversable;
99
use JsonSerializable;
1010
use Tamedevelopers\Support\Str;
11-
use Tamedevelopers\Database\Schema\Builder;
12-
use Tamedevelopers\Database\Schema\Pagination\Paginator;
1311
use Tamedevelopers\Support\Collections\CollectionMapper;
1412

1513

@@ -85,13 +83,16 @@ protected function isProxies()
8583
*/
8684
protected function isBuilderOrPaginator($expression = null)
8785
{
86+
$paginatorInstance = '\Tamedevelopers\Database\Schema\Pagination\Paginator';
87+
$builderInstance = '\Tamedevelopers\Database\Schema\Builder';
88+
8889
$this->builder = $expression;
89-
if ($expression instanceof \Builder){
90+
if ($expression instanceof $builderInstance){
9091
self::$isBuilder = true;
9192
} else{
9293
self::$isBuilder = false;
9394
}
94-
if ($expression instanceof \Paginator){
95+
if ($expression instanceof $paginatorInstance){
9596
$this->isPaginate = true;
9697
}
9798
}

0 commit comments

Comments
 (0)