Skip to content

[11.x] revert collation #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 3, 2024
Merged

[11.x] revert collation #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
039281f
revert collation
rez1dent3 Feb 2, 2024
e2cab71
fix port mariadb
rez1dent3 Feb 2, 2024
cfcbe29
fix
rez1dent3 Feb 3, 2024
4442641
downgrade
rez1dent3 Feb 3, 2024
ac7083b
Revert "downgrade"
rez1dent3 Feb 3, 2024
ede2d3d
10.6 test
rez1dent3 Feb 3, 2024
c501729
10.7 test
rez1dent3 Feb 3, 2024
db9aa1f
10.8 test
rez1dent3 Feb 3, 2024
8c77a87
10.9 test
rez1dent3 Feb 3, 2024
5365fcd
10.10 test
rez1dent3 Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/phpunits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- 3306:3306

mariadb:
image: mariadb:10.5
image: mariadb:10.10 # https://github.com/laravel/framework/pull/48455
env:
MYSQL_ROOT_PASSWORD: wallet
MYSQL_DATABASE: wallet
Expand Down
12 changes: 2 additions & 10 deletions tests/Infra/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ final protected function getPackageProviders($app): array
$app['config']->set('wallet.transfer.model', Transfer::class);
$app['config']->set('wallet.wallet.model', Wallet::class);

//infra
$app['config']->set('database.mysql.collation', 'utf8mb4_unicode_ci');

return [WalletServiceProvider::class, TestServiceProvider::class];
}

Expand All @@ -66,13 +63,8 @@ final protected function getEnvironmentSetUp($app): void
$config->set('database.connections.testing.prefix', 'tests');
$config->set('database.connections.pgsql.prefix', 'tests');
$config->set('database.connections.mysql.prefix', 'tests');

/** @var array<string, mixed> $mysql */
$mysql = $config->get('database.connections.mysql');
$config->set('database.connections.mariadb', array_merge($mysql, [
'collation' => 'utf8mb4_unicode_ci',
'port' => 3307,
]));
$config->set('database.connections.mariadb.prefix', 'tests');
$config->set('database.connections.mariadb.port', 3307);

// new table name's
$config->set('wallet.transaction.table', 'transaction');
Expand Down