mirror of
https://github.com/flarum/core.git
synced 2025-08-07 00:47:00 +02:00
feat: add support for PgSQL (#3985)
* feat: add support for `PgSQL` * chore: generate dump * feat: query exception errors db driver hint * feat: allow defining supported databases * chore: review comments * feat: setting for pgsql preferred search config
This commit is contained in:
@@ -85,7 +85,11 @@ class ListTest extends TestCase
|
||||
])
|
||||
);
|
||||
|
||||
$data = json_decode($response->getBody()->getContents(), true)['data'];
|
||||
$body = $response->getBody()->getContents();
|
||||
|
||||
$this->assertEquals(200, $response->getStatusCode(), $body);
|
||||
|
||||
$data = json_decode($body, true)['data'];
|
||||
|
||||
// Order-independent comparison
|
||||
$this->assertEqualsCanonicalizing(['2', '3'], Arr::pluck($data, 'id'), 'IDs do not match');
|
||||
@@ -123,7 +127,9 @@ class ListTest extends TestCase
|
||||
])
|
||||
);
|
||||
|
||||
$data = json_decode($response->getBody()->getContents(), true)['data'];
|
||||
$data = json_decode($body = $response->getBody()->getContents(), true)['data'] ?? null;
|
||||
|
||||
$this->assertEquals(200, $response->getStatusCode(), $body);
|
||||
|
||||
// Order-independent comparison
|
||||
$this->assertEquals(['3'], Arr::pluck($data, 'id'), 'IDs do not match');
|
||||
|
@@ -85,7 +85,10 @@ class ListWithFulltextSearchTest extends TestCase
|
||||
])
|
||||
);
|
||||
|
||||
$data = json_decode($response->getBody()->getContents(), true);
|
||||
$data = json_decode($body = $response->getBody()->getContents(), true);
|
||||
|
||||
$this->assertEquals(200, $response->getStatusCode(), $body);
|
||||
|
||||
$ids = array_map(function ($row) {
|
||||
return $row['id'];
|
||||
}, $data['data']);
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
||||
namespace Flarum\Tests\integration\api\notifications;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Flarum\Discussion\Discussion;
|
||||
use Flarum\Notification\Notification;
|
||||
use Flarum\Post\Post;
|
||||
@@ -38,7 +39,7 @@ class UpdateTest extends TestCase
|
||||
['id' => 1, 'discussion_id' => 1, 'user_id' => 2, 'type' => 'comment', 'content' => 'Foo'],
|
||||
],
|
||||
Notification::class => [
|
||||
['id' => 1, 'user_id' => 2, 'from_user_id' => 1, 'type' => 'discussionRenamed', 'subject_id' => 1, 'read_at' => null],
|
||||
['id' => 1, 'user_id' => 2, 'from_user_id' => 1, 'type' => 'discussionRenamed', 'subject_id' => 1, 'read_at' => null, 'created_at' => Carbon::now()],
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
@@ -30,19 +30,20 @@ class DeleteTest extends TestCase
|
||||
|
||||
$this->prepareDatabase([
|
||||
User::class => [
|
||||
$this->normalUser(),
|
||||
['id' => 3, 'username' => 'acme', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1],
|
||||
['id' => 4, 'username' => 'acme2', 'email' => 'acme2@machine.local', 'is_email_confirmed' => 1],
|
||||
],
|
||||
Discussion::class => [
|
||||
['id' => 3, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 2, 'first_post_id' => 1, 'comment_count' => 5, 'last_post_number' => 5, 'last_post_id' => 10],
|
||||
['id' => 3, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 2, 'first_post_id' => 5, 'comment_count' => 5, 'last_post_number' => 5, 'last_post_id' => 10],
|
||||
],
|
||||
Post::class => [
|
||||
['id' => 5, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 1],
|
||||
['id' => 6, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 2],
|
||||
['id' => 7, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 3],
|
||||
['id' => 8, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 4],
|
||||
['id' => 9, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 5],
|
||||
['id' => 10, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 6],
|
||||
['id' => 5, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(2)->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 1],
|
||||
['id' => 6, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(3)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 2],
|
||||
['id' => 7, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(4)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 3],
|
||||
['id' => 8, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(5)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 4],
|
||||
['id' => 9, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(6)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 5],
|
||||
['id' => 10, 'discussion_id' => 3, 'created_at' => Carbon::createFromDate(1975, 5, 21)->addMinutes(7)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 6],
|
||||
],
|
||||
'discussion_user' => [
|
||||
['discussion_id' => 3, 'user_id' => 2, 'last_read_post_number' => 6],
|
||||
|
@@ -46,7 +46,7 @@ class GroupSearchTest extends TestCase
|
||||
{
|
||||
$response = $this->createRequest(['admin'], 1);
|
||||
|
||||
$this->assertEquals(200, $response->getStatusCode());
|
||||
$this->assertEquals(200, $response->getStatusCode(), $response->getBody()->getContents());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -89,7 +89,7 @@ class ListTest extends TestCase
|
||||
|
||||
$this->assertEquals(200, $response->getStatusCode());
|
||||
$data = json_decode($response->getBody()->getContents(), true)['data'];
|
||||
$this->assertEquals(['1', '2'], Arr::pluck($data, 'id'));
|
||||
$this->assertEqualsCanonicalizing(['1', '2'], Arr::pluck($data, 'id'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
||||
namespace Flarum\Tests\integration\extenders;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Flarum\Discussion\Discussion;
|
||||
use Flarum\Extend;
|
||||
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
|
||||
@@ -38,6 +39,7 @@ class ModelPrivateTest extends TestCase
|
||||
$discussion = Discussion::create([
|
||||
'title' => 'Some Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
|
||||
$this->assertNull($discussion->is_private);
|
||||
@@ -62,10 +64,12 @@ class ModelPrivateTest extends TestCase
|
||||
$privateDiscussion = Discussion::create([
|
||||
'title' => 'Private Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
$publicDiscussion = Discussion::create([
|
||||
'title' => 'Public Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
|
||||
$this->assertTrue($privateDiscussion->is_private);
|
||||
@@ -89,10 +93,12 @@ class ModelPrivateTest extends TestCase
|
||||
$privateDiscussion = Discussion::create([
|
||||
'title' => 'Private Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
$publicDiscussion = Discussion::create([
|
||||
'title' => 'Public Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
|
||||
$this->assertTrue($privateDiscussion->is_private);
|
||||
@@ -122,10 +128,12 @@ class ModelPrivateTest extends TestCase
|
||||
$privateDiscussion = Discussion::create([
|
||||
'title' => 'Private Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
$publicDiscussion = Discussion::create([
|
||||
'title' => 'Public Discussion',
|
||||
'user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
]);
|
||||
|
||||
$this->assertTrue($privateDiscussion->is_private);
|
||||
|
Reference in New Issue
Block a user