Merge remote-tracking branch 'origin/main'

manyou-io · Sep 7, 2023 · aee10ed · aee10ed
2 parents a7bfa56 + 938cacd
commit aee10ed
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/mango/Tests/DoctrineTest.php b/packages/mango/Tests/DoctrineTest.php
@@ -115,8 +115,8 @@ public function testBasics()
         ], $q->fetchAllAssociative());
 
         $q = $schema->createQuery();
-        $q->selectFrom(GroupTable::NAME)
-            ->where($q->eq('id', 6), $q->eq('orderString', 'bulk alias bar'));
+        $q->from(GroupTable::NAME)->select()
+            ->where(id: 6, orderString: 'bulk alias bar');
         $this->assertEqualsCanonicalizing([
             [GroupTable::NAME => ['id' => 6, 'orderString' => 'bulk alias bar']],
         ], $q->fetchAllAssociative());
@@ -190,9 +190,11 @@ public function testBasics()
         ], $q->fetchAllAssociative());
 
         $q = $schema->createQuery();
-        $q->selectFrom([PostsTable::NAME, 'p'], 'title')
-            ->joinOn([GroupTable::NAME, 'g'], 'id', 'group_id', null)
-            ->where($q->eq('id', 2));
+        $q->from(PostsTable::NAME, 'p')
+            ->select('title')
+            ->where(title: 'post 2')
+            ->addInnerJoin([GroupTable::NAME, 'g'], ['group_id', 'id'])
+            ->where(id: 2);
         $this->assertEqualsCanonicalizing([
             [
                 'p' => ['title' => 'post 2'],