Merge pull request #90 from xsist10/backward_reference_fix

Fixed a backwards reference to databases.
xsist10 · Jan 3, 2023 · e514120 · e514120
2 parents 29a41f8 + 9b14b06
commit e514120
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Engine/Entity/Database.php b/src/Engine/Entity/Database.php
@@ -114,6 +114,9 @@ public function getAccount(string $username, string $host): ?Account
      */
     public function setAccounts(Account...$accounts): void
     {
+        foreach ($accounts as $account) {
+            $account->setDatabase($this);
+        }
         $this->accounts = $accounts;
     }
 
@@ -125,6 +128,7 @@ public function setAccounts(Account...$accounts): void
      */
     public function addAccount(Account $account): void
     {
+        $account->setDatabase($this);
         $this->accounts[] = $account;
     }
 

diff --git a/tests/Engine/BaseTest.php b/tests/Engine/BaseTest.php
@@ -91,8 +91,12 @@ protected function createVirtualTable(array $override = []): Table
         );
     }
 
-    protected function createAccount(string $user, string $host): Account
+    protected function createAccount(string $user, string $host, Database $database = null): Account
     {
-        return Account::withRaw($user, $host);
+        $account = Account::withRaw($user, $host);
+        if ($database) {
+            $account->setDatabase($database);
+        }
+        return $account;
     }
 }
diff --git a/tests/Engine/Entity/DatabaseTest.php b/tests/Engine/Entity/DatabaseTest.php
@@ -50,7 +50,7 @@ public function test__toString()
     public function test__getAccount()
     {
         $this->assertEquals(
-            $this->createAccount('bob', 'localhost'),
+            $this->createAccount('bob', 'localhost', $this->database),
             $this->database->getAccount('bob', 'localhost'),
             "Verify that we get the expected Account."
         );
@@ -59,7 +59,7 @@ public function test__getAccount()
             "Our fuzzy domain should not match for Bob."
         );
         $this->assertEquals(
-            $this->createAccount('alice', '%'),
+            $this->createAccount('alice', '%', $this->database),
             $this->database->getAccount('alice', 'localhost'),
             "Our fuzzy domain should match for Alice."
         );