Test DatabaseV2

dimitriBouteille · Mar 10, 2024 · 9a1984c · 9a1984c
1 parent 5feb96e
commit 9a1984c
Show file tree

Hide file tree

Showing 5 changed files with 489 additions and 4 deletions.
diff --git a/src/Builders/AbstractWithMetaBuilder.php b/src/Builders/AbstractWithMetaBuilder.php
@@ -14,6 +14,7 @@
 use Dbout\WpOrm\MetaMappingConfig;
 use Dbout\WpOrm\Orm\AbstractModel;
 use Dbout\WpOrm\Orm\Database;
+use Dbout\WpOrm\Orm\DatabaseV2;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -129,7 +130,7 @@ public function joinToMeta(string $metaKey, string $joinType = 'inner'): self
             $join->on(
                 sprintf('%s.%s', $metaKey, $this->metaConfig?->columnKey),
                 '=',
-                Database::getInstance()->raw(sprintf("'%s'", $metaKey))
+                DatabaseV2::getInstance()->raw(sprintf("'%s'", $metaKey))
             )->on(
                 sprintf('%s.%s', $metaKey, $this->metaConfig?->foreignKey),
                 '=',

diff --git a/src/Orm/AbstractModel.php b/src/Orm/AbstractModel.php
@@ -46,7 +46,7 @@ protected function newBaseQueryBuilder()
     public function getConnection()
     {
         // @phpstan-ignore-next-line
-        return Database::getInstance();
+        return DatabaseV2::getInstance();
     }
 
     /**

diff --git a/src/Orm/Builder.php b/src/Orm/Builder.php
@@ -36,6 +36,6 @@ public function addWhereExistsQuery(EloquentBuilder $query, $boolean = 'and', $n
      */
     public function getConnection(): ConnectionInterface
     {
-        return Database::getInstance();
+        return DatabaseV2::getInstance();
     }
 }