Merge pull request #882 from bavix/collation-revert

[11.x] revert collation
bavix · Feb 3, 2024 · a9ee3c1 · a9ee3c1
2 parents df4913c + 5365fcd
commit a9ee3c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml
@@ -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

diff --git a/tests/Infra/TestCase.php b/tests/Infra/TestCase.php
@@ -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];
     }
 
@@ -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');