From ff3ef508f0e3da9f6b1001a0a7db37d72b3842b2 Mon Sep 17 00:00:00 2001 From: Bohan Yang Date: Wed, 6 Sep 2023 04:51:42 +0000 Subject: [PATCH 1/2] Update --- packages/mango/Tests/DoctrineTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mango/Tests/DoctrineTest.php b/packages/mango/Tests/DoctrineTest.php index d0f9a0d..ee04dd1 100644 --- 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()); From 938cacd0e7e1f237cc864a003a2578030593f774 Mon Sep 17 00:00:00 2001 From: Bohan Yang Date: Wed, 6 Sep 2023 04:55:57 +0000 Subject: [PATCH 2/2] Update --- packages/mango/Tests/DoctrineTest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/mango/Tests/DoctrineTest.php b/packages/mango/Tests/DoctrineTest.php index ee04dd1..9b7efbe 100644 --- a/packages/mango/Tests/DoctrineTest.php +++ b/packages/mango/Tests/DoctrineTest.php @@ -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'],