fix database API compatibility

app/Client/Resources/DatabaseRestores/CreateDatabaseRestoreRequest.php

@@ -24,7 +24,7 @@ public function __construct(
 
     public function resolveEndpoint(): string
     {
-        return "/databases/clusters/{$this->data->clusterId}/restores";
+        return "/databases/clusters/{$this->data->clusterId}/restore";
     }
 
     protected function defaultBody(): array

app/Commands/DatabaseClusterDelete.php

@@ -26,7 +26,7 @@ public function handle()
 
         $database = $this->resolvers()->databaseCluster()->from($this->argument('database'));
         $schemas = spin(
-            fn () => $this->client->databaseClusters()->include('schemas')->get($database->id)->schemas,
+            fn () => $this->client->databaseClusters()->include('databases')->get($database->id)->schemas,
             'Fetching database cluster schemas...',
         );
 

app/Commands/DatabaseClusterList.php

@@ -28,7 +28,7 @@ public function handle()
         intro('Database Clusters');
 
         $databases = spin(
-            fn () => $this->client->databaseClusters()->include('schemas')->list(),
+            fn () => $this->client->databaseClusters()->include('databases')->list(),
             'Fetching databases...',
         );
 

app/Commands/EnvironmentUpdate.php

@@ -145,7 +145,7 @@ protected function defineFields(Environment $environment): void
     protected function selectDatabase(?string $value, ?string $currentId): string
     {
         $clusters = spin(
-            fn () => $this->client->databaseClusters()->include('schemas')->list()->collect(),
+            fn () => $this->client->databaseClusters()->include('databases')->list()->collect(),
             'Fetching databases...',
         );
 

app/Commands/Ship.php

@@ -373,7 +373,7 @@ protected function collectOptionsToEnable(Environment $environment): void
             $cluster = $this->getDatabaseCluster();
 
             if ($cluster) {
-                $cluster = $this->client->databaseClusters()->include('schemas')->get($cluster->id);
+                $cluster = $this->client->databaseClusters()->include('databases')->get($cluster->id);
                 $database = $this->getDatabase($cluster);
                 $environmentParams['database_schema_id'] = $database->id;
             }
@@ -587,7 +587,7 @@ protected function provisionDatabaseOpinionated(): ?string
 
         if (! $cluster) {
             $cluster = $this->createDatabaseClusterWithOptions($type->type, $preset, $name, $region);
-            $cluster = $this->client->databaseClusters()->include('schemas')->get($cluster->id);
+            $cluster = $this->client->databaseClusters()->include('databases')->get($cluster->id);
         }
 
         return $this->loopUntilValid(
@@ -721,7 +721,7 @@ protected function getDatabase(DatabaseCluster $database): ?Database
 
     protected function getDatabaseCluster(): ?DatabaseCluster
     {
-        $databasesPaginator = $this->client->databaseClusters()->include('schemas')->list();
+        $databasesPaginator = $this->client->databaseClusters()->include('databases')->list();
         $databases = $databasesPaginator->collect();
 
         if ($databases->isEmpty()) {

app/Resolvers/DatabaseClusterResolver.php

@@ -34,7 +34,7 @@ public function fromIdentifier(string $identifier): ?DatabaseCluster
         return $this->resolveFromIdentifier(
             $identifier,
             fn () => spin(
-                fn () => $this->client->databaseClusters()->include('schemas')->get($identifier),
+                fn () => $this->client->databaseClusters()->include('databases')->get($identifier),
                 'Fetching database...',
             ),
             fn () => $this->fetchAndFind($identifier),
@@ -82,7 +82,7 @@ public function fetchAndFind(string $identifier): ?DatabaseCluster
     protected function fetchAll(): Collection
     {
         return collect(spin(
-            fn () => $this->client->databaseClusters()->include('schemas')->list()->items(),
+            fn () => $this->client->databaseClusters()->include('databases')->list()->items(),
             'Fetching databases...',
         ));
     }

tests/Feature/DatabaseClusterDeleteTest.php

@@ -0,0 +1,45 @@
+<?php
+
+use App\Client\Resources\DatabaseClusters\DeleteDatabaseClusterRequest;
+use App\Client\Resources\DatabaseClusters\GetDatabaseClusterRequest;
+use App\Client\Resources\Meta\GetOrganizationRequest;
+use App\ConfigRepository;
+use Illuminate\Support\Sleep;
+use Saloon\Http\Faking\MockClient;
+use Saloon\Http\Faking\MockResponse;
+
+beforeEach(function () {
+    Sleep::fake();
+
+    $config = Mockery::mock(ConfigRepository::class);
+    $config->shouldReceive('apiTokens')->andReturn(collect(['test-api-token']));
+    $this->app->instance(ConfigRepository::class, $config);
+});
+
+afterEach(function () {
+    MockClient::destroyGlobal();
+});
+
+it('requests databases before deleting a cluster', function () {
+    MockClient::global([
+        GetOrganizationRequest::class => MockResponse::make(organizationResponse(), 200),
+        GetDatabaseClusterRequest::class => MockResponse::make(databaseClusterResponse(), 200),
+        DeleteDatabaseClusterRequest::class => MockResponse::make([], 204),
+    ]);
+
+    $this->artisan('database-cluster:delete', [
+        'database' => 'db-123',
+        '--force' => true,
+        '--no-interaction' => true,
+    ])->assertSuccessful();
+
+    $clusterRequests = collect(MockClient::global()->getRecordedResponses())
+        ->map(fn ($response) => $response->getRequest())
+        ->filter(fn ($request) => $request instanceof GetDatabaseClusterRequest);
+
+    expect($clusterRequests)->toHaveCount(2);
+
+    $clusterRequests->each(
+        fn ($request) => expect($request->query()->get('include'))->toBe('databases'),
+    );
+});

tests/Feature/DatabaseClusterListTest.php

@@ -0,0 +1,38 @@
+<?php
+
+use App\Client\Resources\DatabaseClusters\ListDatabaseClustersRequest;
+use App\Client\Resources\Meta\GetOrganizationRequest;
+use App\ConfigRepository;
+use Saloon\Http\Faking\MockClient;
+use Saloon\Http\Faking\MockResponse;
+
+beforeEach(function () {
+    $config = Mockery::mock(ConfigRepository::class);
+    $config->shouldReceive('apiTokens')->andReturn(collect(['test-api-token']));
+    $this->app->instance(ConfigRepository::class, $config);
+});
+
+afterEach(function () {
+    MockClient::destroyGlobal();
+});
+
+it('requests databases when listing database clusters', function () {
+    MockClient::global([
+        GetOrganizationRequest::class => MockResponse::make(organizationResponse(), 200),
+        ListDatabaseClustersRequest::class => MockResponse::make([
+            'data' => [],
+            'included' => [],
+            'links' => ['next' => null],
+        ], 200),
+    ]);
+
+    $this->artisan('database-cluster:list', [
+        '--json' => true,
+        '--no-interaction' => true,
+    ])->assertSuccessful();
+
+    MockClient::global()->assertSent(function ($request) {
+        return $request instanceof ListDatabaseClustersRequest
+            && $request->query()->get('include') === 'databases';
+    });
+});

tests/Feature/DatabaseRestoreCreateTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Client\Resources\DatabaseClusters\GetDatabaseClusterRequest;
+use App\Client\Resources\DatabaseClusters\ListDatabaseClustersRequest;
 use App\Client\Resources\DatabaseRestores\CreateDatabaseRestoreRequest;
 use App\Client\Resources\Meta\GetOrganizationRequest;
 use App\ConfigRepository;
@@ -44,6 +45,11 @@ function setupDatabaseRestoreMocks(int $createStatus = 200, ?array $createBody =
         '--snapshot' => 'snap-1',
         '--no-interaction' => true,
     ])->assertSuccessful();
+
+    MockClient::global()->assertSent(function ($request) {
+        return $request instanceof GetDatabaseClusterRequest
+            && $request->query()->get('include') === 'databases';
+    });
 });
 
 it('creates a restore from a point-in-time non-interactively', function () {
@@ -53,8 +59,43 @@ function setupDatabaseRestoreMocks(int $createStatus = 200, ?array $createBody =
         'cluster' => 'db-123',
         'name' => 'my-restore',
         '--point-in-time' => '2024-01-15T12:00:00Z',
+        '--json' => true,
+        '--fields' => 'id,name,status',
+        '--no-interaction' => true,
+    ])->assertSuccessful();
+
+    MockClient::global()->assertSent(function ($request) {
+        return $request instanceof CreateDatabaseRestoreRequest
+            && $request->resolveEndpoint() === '/databases/clusters/db-123/restore';
+    });
+});
+
+it('requests databases when resolving an omitted cluster', function () {
+    $cluster = databaseClusterResponse();
+
+    MockClient::global([
+        GetOrganizationRequest::class => MockResponse::make(organizationResponse(), 200),
+        ListDatabaseClustersRequest::class => MockResponse::make([
+            'data' => [$cluster['data']],
+            'included' => [],
+            'links' => ['next' => null],
+        ], 200),
+        CreateDatabaseRestoreRequest::class => MockResponse::make(databaseClusterResponse([
+            'id' => 'db-456',
+            'attributes' => ['name' => 'my-restore'],
+        ]), 200),
+    ]);
+
+    $this->artisan('database-restore:create', [
+        'name' => 'my-restore',
+        '--snapshot' => 'snap-1',
         '--no-interaction' => true,
     ])->assertSuccessful();
+
+    MockClient::global()->assertSent(function ($request) {
+        return $request instanceof ListDatabaseClustersRequest
+            && $request->query()->get('include') === 'databases';
+    });
 });
 
 it('fails when neither snapshot nor point-in-time is given non-interactively', function () {